Rework project structure

Closes #14

Author: underyx

flask_redis.py renamed to flask_redis/__init__.py

@@ -21,7 +21,7 @@
     download_url='https://github.com/underyx/flask-redis/releases',
     description='Redis Extension for Flask Applications',
     long_description=README + '\n\n' + HISTORY,
-    py_modules=['flask_redis'],
+    packages=['flask_redis'],
     package_data={'': ['LICENSE']},
     zip_safe=False,
     install_requires=[

setup.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-"""Tests for Flask-Redis."""
+"""Integration tests for Flask-Redis."""
 
 import flask
 from flask_redis import FlaskRedis
@@ -14,19 +13,19 @@ def app():
 
 
 def test_constructor(app):
-    '''Test that a constructor with app instance will initialize the
-    connection'''
+    """Test that a constructor with app instance will initialize the
+    connection"""
     redis = FlaskRedis(app)
     assert redis._redis_client is not None
     assert hasattr(redis._redis_client, 'connection_pool')
 
 
 def test_init_app(app):
-    '''Test that a constructor without app instance will not initialize the
+    """Test that a constructor without app instance will not initialize the
     connection.
 
     After FlaskRedis.init_app(app) is called, the connection will be
-    initialized.'''
+    initialized."""
     redis = FlaskRedis()
     assert redis._redis_client is None
     redis.init_app(app)
@@ -35,7 +34,7 @@ def test_init_app(app):
 
 
 def test_custom_prefix(app):
-    '''Test that config prefixes enable distinct connections'''
+    """Test that config prefixes enable distinct connections"""
     app.config['DBA_URL'] = 'redis://localhost:6379/1'
     app.config['DBB_URL'] = 'redis://localhost:6379/2'
     redis_a = FlaskRedis(app, config_prefix='DBA')
@@ -45,8 +44,8 @@ def test_custom_prefix(app):
 
 
 def test_strict_parameter(app):
-    '''Test that initializing with the strict parameter set to True will use
-    StrictRedis, and that False will keep using the old Redis class.'''
+    """Test that initializing with the strict parameter set to True will use
+    StrictRedis, and that False will keep using the old Redis class."""
 
     redis = FlaskRedis(app, strict=True)
     assert redis._redis_client is not None
@@ -58,8 +57,8 @@ def test_strict_parameter(app):
 
 
 def test_custom_provider(app):
-    '''Test that FlaskRedis can be instructed to use a different Redis client,
-    like StrictRedis'''
+    """Test that FlaskRedis can be instructed to use a different Redis client,
+    like StrictRedis"""
     class FakeProvider(object):
 
         @classmethod

test/__init__.py

@@ -0,0 +1,11 @@
+from flask_redis import FlaskRedis
+
+
+def test_constructor_app(mocker):
+    """Test that the constructor passes the app to FlaskRedis.init_app"""
+    mocker.patch.object(FlaskRedis, 'init_app', autospec=True)
+    app_stub = mocker.stub(name='app_stub')
+
+    FlaskRedis(app_stub)
+
+    FlaskRedis.init_app.assert_called_once_with(mocker.ANY, app_stub)

test/integration/__init__.py

@@ -1,8 +1,9 @@
 [tox]
 envlist =
   static_analysis,
-  py27-flask{09,011}-redis{26,210},
-  py{34,35}-flask011-redis{26,210}
+  py{27,34,35}-unit_tests,
+  py27-flask{09,011}-redis{26,210}-integration_tests,
+  py{34,35}-flask011-redis{26,210}-integration_tests
 
 [tox:travis]
 2.7 = py27
@@ -21,10 +22,13 @@ passenv =
   TRAVIS_JOB_ID
   TRAVIS_BRANCH
 deps =
-  flask09: Flask>=0.9,<0.10
-  flask011: Flask>=0.11,<0.12
-  redis26: redis>=2.6,<2.7
-  redis210: redis>=2.10,<2.11
+  integration_tests-flask09: Flask>=0.9,<0.10
+  integration_tests-flask011: Flask>=0.11,<0.12
+  integration_tests-redis26: redis>=2.6,<2.7
+  integration_tests-redis210: redis>=2.10,<2.11
   pytest
-  pytest-cov
-commands = py.test --cov-report term-missing --cov=flask_redis flask_redis.py test_flask_redis.py
+  unit_tests: pytest-cov
+  unit_tests: pytest-mock
+commands =
+  integration_tests: py.test test/integration
+  unit_tests: py.test --cov-report term-missing --cov=flask_redis test/unit