Browse Source

Static files are active in the WSGI app now, not just the server.

pull/1638/head
Armin Ronacher 15 years ago
parent
commit
ca520fb7e4
  1. 10
      flask.py
  2. 9
      tests/flask_tests.py
  3. 1
      tests/static/index.html

10
flask.py

@ -16,7 +16,8 @@ from threading import local
from contextlib import contextmanager
from jinja2 import Environment, PackageLoader
from werkzeug import Request as RequestBase, Response as ResponseBase, \
LocalStack, LocalProxy, create_environ, cached_property
LocalStack, LocalProxy, create_environ, cached_property, \
SharedDataMiddleware
from werkzeug.routing import Map, Rule
from werkzeug.exceptions import HTTPException, InternalServerError
from werkzeug.contrib.securecookie import SecureCookie
@ -241,6 +242,9 @@ class Flask(object):
if self.static_path is not None:
self.url_map.add(Rule(self.static_path + '/<filename>',
build_only=True, endpoint='static'))
self.wsgi_app = SharedDataMiddleware(self.wsgi_app, {
self.static_path: (self.package_name, 'static')
})
#: the Jinja2 environment. It is created from the
#: :attr:`jinja_options` and the loader that is returned
@ -286,10 +290,6 @@ class Flask(object):
from werkzeug import run_simple
if 'debug' in options:
self.debug = options.pop('debug')
if self.static_path is not None:
options['static_files'] = {
self.static_path: (self.package_name, 'static')
}
options.setdefault('use_reloader', self.debug)
options.setdefault('use_debugger', self.debug)
return run_simple(host, port, self, **options)

9
tests/flask_tests.py

@ -143,6 +143,15 @@ class BasicFunctionality(unittest.TestCase):
with app.test_request_context():
assert flask.url_for('hello', name='test x') == '/hello/test%20x'
def test_static_files(self):
app = flask.Flask(__name__)
rv = app.test_client().get('/static/index.html')
assert rv.status_code == 200
assert rv.data.strip() == '<h1>Hello World!</h1>'
with app.test_request_context():
assert flask.url_for('static', filename='index.html') \
== '/static/index.html'
class Templating(unittest.TestCase):

1
tests/static/index.html

@ -0,0 +1 @@
<h1>Hello World!</h1>
Loading…
Cancel
Save