diff --git a/.gitignore b/.gitignore index 793d4be..543c829 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *.pyc build .idea/ +dist +*.egg-info diff --git a/eveigb/models.py b/eveigb/models.py new file mode 100644 index 0000000..0f02227 --- /dev/null +++ b/eveigb/models.py @@ -0,0 +1 @@ +from django.db import models \ No newline at end of file diff --git a/eveigb/tests.py b/eveigb/tests.py index 501deb7..f383eec 100644 --- a/eveigb/tests.py +++ b/eveigb/tests.py @@ -1,16 +1,52 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - from django.test import TestCase +from mock import Mock + +from .middleware import IGBMiddleware -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) +class IGBMiddlewareTest(TestCase): + """ Test the IGB Middleware """ + + def setUp(self): + self.im = IGBMiddleware() + + def request_factory(self, meta=None): + rq = Mock(path="/") + rq.method = 'GET' + if meta: + rq.META = meta + return rq + + def test_invalid_browser_igb(self): + request = self.request_factory({ + 'HTTP_USER_AGENT': 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405' + }) + self.im.process_request(request) + self.assertEqual(request.is_igb, False) + self.assertEqual(request.is_igb_trusted, False) + + def test_invalid_browser_igb_fake_trust(self): + request = self.request_factory({ + 'HTTP_USER_AGENT': 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405', + 'HTTP_EVE_TRUSTED': 'Yes', + }) + self.im.process_request(request) + self.assertEqual(request.is_igb, False) + self.assertEqual(request.is_igb_trusted, False) + + def test_valid_igb_no_trust(self): + request = self.request_factory({ + 'HTTP_USER_AGENT': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.27 Safari/532.0 EVE-IGB', + }) + self.im.process_request(request) + self.assertEqual(request.is_igb, True) + self.assertEqual(request.is_igb_trusted, False) + + def test_valid_igb_trust(self): + request = self.request_factory({ + 'HTTP_USER_AGENT': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.27 Safari/532.0 EVE-IGB', + 'HTTP_EVE_TRUSTED': 'Yes', + }) + self.im.process_request(request) + self.assertEqual(request.is_igb, True) + self.assertEqual(request.is_igb_trusted, True) \ No newline at end of file diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..0fc36a3 --- /dev/null +++ b/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_project.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9bda797 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +django>=1.4 +mock \ No newline at end of file diff --git a/setup.py b/setup.py index b41b38f..020eb6e 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup +from pip.req import parse_requirements from eveigb import str_version - + setup(name="django-eveigb", version=str_version, description="Django library/application for making use of EVE's In-Game Browser", @@ -11,4 +12,5 @@ setup(name="django-eveigb", url="https://github.com/nikdoof/django-eveigb", keywords="eveonline django igb", packages=['eveigb'], + install_requires=['Django>=1.4'], ) diff --git a/test_project/__init__.py b/test_project/__init__.py new file mode 100644 index 0000000..87eaf32 --- /dev/null +++ b/test_project/__init__.py @@ -0,0 +1 @@ +__author__ = 'nikdoof' diff --git a/test_project/settings.py b/test_project/settings.py new file mode 100644 index 0000000..e30142b --- /dev/null +++ b/test_project/settings.py @@ -0,0 +1,157 @@ +# Django settings for test_project project. + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@example.com'), +) + +MANAGERS = ADMINS + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'test.db3', # Or path to database file if using sqlite3. + # The following settings are not used with sqlite3: + 'USER': '', + 'PASSWORD': '', + 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. + 'PORT': '', # Set to empty string for default. + } +} + +# Hosts/domain names that are valid for this site; required if DEBUG is False +# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts +ALLOWED_HOSTS = [] + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# In a Windows environment this must be set to your system time zone. +TIME_ZONE = 'America/Chicago' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en-us' + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale. +USE_L10N = True + +# If you set this to False, Django will not use timezone-aware datetimes. +USE_TZ = True + +# Absolute filesystem path to the directory that will hold user-uploaded files. +# Example: "/var/www/example.com/media/" +MEDIA_ROOT = '' + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash. +# Examples: "http://example.com/media/", "http://media.example.com/" +MEDIA_URL = '' + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/var/www/example.com/static/" +STATIC_ROOT = '' + +# URL prefix for static files. +# Example: "http://example.com/static/", "http://static.example.com/" +STATIC_URL = '/static/' + +# Additional locations of static files +STATICFILES_DIRS = ( + # Put strings here, like "/home/html/static" or "C:/www/django/static". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +# List of finder classes that know how to find static files in +# various locations. +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +# 'django.contrib.staticfiles.finders.DefaultStorageFinder', +) + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '29)2ec_!4fy$mb0c+u7sz5-q84@tjp(b!atfh-3v@0^c9c=do*' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +# 'django.template.loaders.eggs.Loader', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + # Uncomment the next line for simple clickjacking protection: + # 'django.middleware.clickjacking.XFrameOptionsMiddleware', +) + +ROOT_URLCONF = 'urls' + +# Python dotted path to the WSGI application used by Django's runserver. +WSGI_APPLICATION = 'test_project.wsgi.application' + +TEMPLATE_DIRS = ( + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + # Uncomment the next line to enable the admin: + # 'django.contrib.admin', + # Uncomment the next line to enable admin documentation: + # 'django.contrib.admindocs', + 'eveigb', +) + +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error when DEBUG=False. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + } +} diff --git a/test_project/urls.py b/test_project/urls.py new file mode 100644 index 0000000..cc4356b --- /dev/null +++ b/test_project/urls.py @@ -0,0 +1,17 @@ +from django.conf.urls import patterns, include, url + +# Uncomment the next two lines to enable the admin: +# from django.contrib import admin +# admin.autodiscover() + +urlpatterns = patterns('', + # Examples: + # url(r'^$', 'test_project.views.home', name='home'), + # url(r'^test_project/', include('test_project.foo.urls')), + + # Uncomment the admin/doc line below to enable admin documentation: + # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + + # Uncomment the next line to enable the admin: + # url(r'^admin/', include(admin.site.urls)), +) diff --git a/test_project/wsgi.py b/test_project/wsgi.py new file mode 100644 index 0000000..43ff066 --- /dev/null +++ b/test_project/wsgi.py @@ -0,0 +1,32 @@ +""" +WSGI config for test_project project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os + +# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks +# if running multiple sites in the same mod_wsgi process. To fix this, use +# mod_wsgi daemon mode with each site in its own daemon process, or use +# os.environ["DJANGO_SETTINGS_MODULE"] = "test_project.settings" +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_project.settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/wercker.yml b/wercker.yml new file mode 100644 index 0000000..7930d46 --- /dev/null +++ b/wercker.yml @@ -0,0 +1,14 @@ +box: wercker/python +# Build definition +build: + # The steps that will be executed on build + steps: + # A step that executes `pip install` command + - pip-install + + # A custom script step, name value is used in the UI + # and the code value contains the command that get executed + - script: + name: run unit tests + code: | + python manage.py test -v2 eveigb \ No newline at end of file