Merge branch 'master' into new-modules

Author: mitsuhiko

CHANGES

@@ -33,6 +33,8 @@ Bugfix release, release date to be announced.
 - Jinja2 template loading syntax now allows "./" in front of
   a template load path.  Previously this caused issues with
   module setups.
+- Fixed an issue where the subdomain setting for modules was
+  ignored for the static folder.
 
 Version 0.6
 -----------

docs/patterns/fabric.rst

@@ -50,7 +50,7 @@ virtual environment::
         # figure out the release name and version
         dist = local('python setup.py --fullname').strip()
         # upload the source tarball to the temporary folder on the server
-        put('sdist/%s.tar.gz' % dist, '/tmp/yourapplication.tar.gz')
+        put('dist/%s.tar.gz' % dist, '/tmp/yourapplication.tar.gz')
         # create a place where we can unzip the tarball, then enter
         # that directory and unzip it
         run('mkdir yourapplication')

docs/patterns/flashing.rst

@@ -14,7 +14,7 @@ template that does this.
 Simple Flashing
 ---------------
 
-So here a full example::
+So here is a full example::
 
     from flask import flash, redirect, url_for, render_template
 

docs/patterns/viewdecorators.rst

@@ -120,7 +120,9 @@ As you can see, if no template name is provided it will use the endpoint
 of the URL map with dots converted to slashes + ``'.html'``.  Otherwise
 the provided template name is used.  When the decorated function returns,
 the dictionary returned is passed to the template rendering function.  If
-`None` is returned, an empty dictionary is assumed.
+`None` is returned, an empty dictionary is assumed, if something else than
+a dictionary is returned we return it from the function unchanged.  That
+way you can still use the redirect function or return simple strings.
 
 Here the code for that decorator::
 
@@ -138,6 +140,8 @@ Here the code for that decorator::
                 ctx = f(*args, **kwargs)
                 if ctx is None:
                     ctx = {}
+                elif not isinstance(ctx, dict):
+                    return ctx
                 return render_template(template_name, **ctx)
             return decorated_function
         return decorator

docs/signals.rst

@@ -55,7 +55,7 @@ to the template::
     @contextmanager
     def captured_templates(app):
         recorded = []
-        def record(template, context):
+        def record(sender, template, context):
             recorded.append((template, context))
         template_rendered.connect(record, app)
         try:
@@ -87,7 +87,7 @@ its own which simplifies the example above::
 
     def captured_templates(app):
         recorded = []
-        def record(template, context):
+        def record(sender, template, context):
             recorded.append((template, context))
         return template_rendered.connected_to(record, app)
 
@@ -155,7 +155,7 @@ With Blinker 1.1 you can also easily subscribe to signals by using the new
     from flask import template_rendered
 
     @template_rendered.connect_via(app)
-    def when_template_rendered(template, context):
+    def when_template_rendered(sender, template, context):
         print 'Template %s is rendered with %s' % (template.name, context)
 
 Core Signals

docs/testing.rst

@@ -43,7 +43,7 @@ In order to test that, we add a second module (
     class FlaskrTestCase(unittest.TestCase):
 
         def setUp(self):
-            self.db_fd, self.app.config['DATABASE'] = tempfile.mkstemp()
+            self.db_fd, flaskr.app.config['DATABASE'] = tempfile.mkstemp()
             self.app = flaskr.app.test_client()
             flaskr.init_db()
 

flask/module.py

@@ -42,7 +42,8 @@ def _register(state):
             path = state.url_prefix + path
         state.app.add_url_rule(path + '/<path:filename>',
                                endpoint='%s.static' % module.name,
-                               view_func=module.send_static_file)
+                               view_func=module.send_static_file,
+                               subdomain=module.subdomain)
     return _register
 
 

tests/flask_tests.py

@@ -248,7 +248,13 @@ def index():
             flask.session['test'] = 42
             flask.session.permanent = permanent
             return ''
-        rv = app.test_client().get('/')
+
+        @app.route('/test')
+        def test():
+            return unicode(flask.session.permanent)
+
+        client = app.test_client()
+        rv = client.get('/')
         assert 'set-cookie' in rv.headers
         match = re.search(r'\bexpires=([^;]+)', rv.headers['set-cookie'])
         expires = parse_date(match.group())
@@ -257,6 +263,9 @@ def index():
         assert expires.month == expected.month
         assert expires.day == expected.day
 
+        rv = client.get('/test')
+        assert rv.data == 'True'
+
         permanent = False
         rv = app.test_client().get('/')
         assert 'set-cookie' in rv.headers
@@ -1102,6 +1111,15 @@ def test_index():
         rv = c.get('/', 'http://test.localhost/')
         assert rv.data == 'test index'
 
+    def test_module_static_path_subdomain(self):
+        app = flask.Flask(__name__)
+        app.config['SERVER_NAME'] = 'example.com'
+        from subdomaintestmodule import mod
+        app.register_module(mod)
+        c = app.test_client()
+        rv = c.get('/static/hello.txt', 'http://foo.example.com/')
+        assert rv.data.strip() == 'Hello Subdomain'
+
     def test_subdomain_matching(self):
         app = flask.Flask(__name__)
         app.config['SERVER_NAME'] = 'localhost'

tests/subdomaintestmodule/__init__.py

@@ -0,0 +1,4 @@
+from flask import Module
+
+
+mod = Module(__name__, 'foo', subdomain='foo')

tests/subdomaintestmodule/static/hello.txt

@@ -0,0 +1 @@
+Hello Subdomain