Merge branch 'release/0.7' into stable

miracle2k · miracle2k · commit 185b4758d993 · 2012-04-11T17:44:14.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: python
+python:
+  - 2.6
+install: pip install tox
+# List envs explicitly to skip PyPy
+script: tox -e py25_flask08,py26_flask08,py27_flask08
+notifications:
+  email:
+    - michael@elsdoerfer.com
+branches:
+  only:
+    - master
+
+
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,14 @@
+0.7 (2012-04-11)
+    This release is compatible with webassets 0.7.
+
+    - Now officially requires at least Flask 0.8, so it can use the new
+      extension import system, but using the compatibility module, older
+      Flask versions should work fine as well:
+      http://flask.pocoo.org/docs/extensions/
+    - Support Python 2.5.
+    - Allow customizing the backend of ``ManageAssets`` command.
+    - Due to webassets 0.7, the cssrewrite filter now works with Blueprints.
+
 0.6.2 (2011-10-12)
     - Fixed Blueprint/Module resolving in output path.
 
diff --git a/TODO b/TODO
@@ -5,3 +5,6 @@ attempting something like g.assets_env.register().
 
 Using loaders is currently somewhat verbose, it'd be more micro-framework-like
 if we  could say "assets_env.load('yaml', ...)".
+
+Now that we officially require Flask 0.8, and are no longer testing
+older versions, remove the support code for those older versions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -1,7 +1,7 @@
 Flask-Assets
 ============
 
-.. module:: flaskext.assets
+.. module:: flask_assets
 
 Flask-Assets helps you to integrate `webassets`_ into your `Flask`_
 application.
@@ -31,7 +31,7 @@ registering your assets with it in the form of so called *bundles*.
 .. code-block:: python
 
     from flask import Flask
-    from flaskext.assets import Environment, Bundle
+    from flask.ext.assets import Environment, Bundle
 
     app = Flask(__name__)
     assets = Environment(app)
@@ -59,7 +59,7 @@ rather than passing a fixed application object:
 .. code-block:: python
 
     app = Flask(__name__)
-    assets = flaskext.assets.Environment()
+    assets = flask.ext.assets.Environment()
     assets.init_app(app)
 
 
diff --git a/example/app.py b/example/app.py
@@ -4,7 +4,7 @@
 sys.path.insert(0, path.join(path.dirname(__file__), '../src'))
 
 from flask import Flask, render_template, url_for
-from flaskext.assets import Environment, Bundle
+from flask.ext.assets import Environment, Bundle
 
 app = Flask(__name__)
 
diff --git a/setup.py b/setup.py
@@ -8,46 +8,47 @@
 merging, minifying and compiling CSS and Javascript files.
 """
 
-from setuptools import setup, find_packages
+from __future__ import with_statement
+from setuptools import setup
 
 # Figure out the version; this could be done by importing the
 # module, though that requires dependencies to be already installed,
 # which may not be the case when processing a pip requirements
-# file, for example.a
-import os, re
-here = os.path.dirname(os.path.abspath(__file__))
-version_re = re.compile(
-    r'__version__ = (\(.*?\))')
-fp = open(os.path.join(here, 'src/flaskext', 'assets.py'))
-version = None
-for line in fp:
-    match = version_re.search(line)
-    if match:
-        version = eval(match.group(1))
-        break
-else:
-    raise Exception("cannot find version")
-fp.close()
+# file, for example.
+def parse_version(asignee):
+    import os, re
+    here = os.path.dirname(os.path.abspath(__file__))
+    version_re = re.compile(
+        r'__version__ = (\(.*?\))')
+    with open(os.path.join(here, 'src', 'flask_assets.py')) as fp:
+        for line in fp:
+            match = version_re.search(line)
+            if match:
+                version = eval(match.group(1))
+                return ".".join(map(str, version))
+        else:
+            raise Exception("cannot find version")
+version = parse_version('__version__')
+webassets_version = parse_version('__webassets_version__')
 
 
 setup(
     name='Flask-Assets',
-    version=".".join(map(str, version)),
+    version=version,
     url='http://github.com/miracle2k/flask-assets',
     license='BSD',
     author='Michael Elsdoerfer',
     author_email='michael@elsdoerfer.com',
     description='Asset management for Flask, to compress and merge ' \
         'CSS and Javascript files.',
     long_description=__doc__,
-    packages=find_packages('src'),
+    py_modules=['flask_assets'],
     package_dir={'': 'src'},
-    namespace_packages=['flaskext'],
     zip_safe=False,
     platforms='any',
     install_requires=[
-        'Flask>=0.6',
-        'webassets==0.6',
+        'Flask>=0.8',
+        'webassets==%s' % webassets_version,
     ],
     classifiers=[
         'Environment :: Web Environment',
@@ -63,4 +64,4 @@
         'nose',
         'flask-script'
     ],
-)
+)
diff --git a/src/flask_assets.py b/src/flask_assets.py
@@ -1,15 +1,20 @@
 from __future__ import with_statement
 from os import path
 from flask import _request_ctx_stack, url_for
-from webassets import Bundle
-from webassets.env import BaseEnvironment, ConfigStorage
+from webassets.env import BaseEnvironment, ConfigStorage, env_options
+
 
+__version__ = (0, 7)
+__webassets_version__ = (0, 7) # webassets core compatibility. used in setup.py
 
-__version__ = (0, 6, 2)
 
 __all__ = ('Environment', 'Bundle',)
 
 
+# We want to expose this here.
+from webassets import Bundle
+
+
 class FlaskConfigStorage(ConfigStorage):
     """Uses the config object of a Flask app as the backend: either the app
     instance bound to the extension directly, or the current Flasp app on
@@ -25,15 +30,12 @@ class FlaskConfigStorage(ConfigStorage):
     allow global across-app defaults.
     """
 
-    _mapping = [
-        'debug', 'cache', 'updater', 'auto_create', 'expire', 'directory', 'url',]
-
     def __init__(self, *a, **kw):
         self._defaults = {}
         ConfigStorage.__init__(self, *a, **kw)
 
     def _transform_key(self, key):
-        if key.lower() in self._mapping:
+        if key.lower() in env_options:
             return "ASSETS_%s" % key.upper()
         else:
             return key.upper()
@@ -51,6 +53,10 @@ def __contains__(self, key):
         return self._transform_key(key) in self.env._app.config
 
     def __getitem__(self, key):
+        value = self._get_deprecated(key)
+        if value:
+            return value
+
         # First try the current app's config
         public_key = self._transform_key(key)
         if self.env._app:
@@ -70,7 +76,8 @@ def __getitem__(self, key):
         raise KeyError()
 
     def __setitem__(self, key, value):
-        self.env._app.config[self._transform_key(key)] = value
+        if not self._set_deprecated(key, value):
+            self.env._app.config[self._transform_key(key)] = value
 
     def __delitem__(self, key):
         del self.env._app.config[self._transform_key(key)]
@@ -206,6 +213,7 @@ def init_app(self, app):
     pass
 else:
     import argparse
+    from webassets.script import GenericArgparseImplementation
 
     class CatchAllParser(object):
         def parse_known_args(self, app_args):
@@ -215,8 +223,9 @@ class ManageAssets(script.Command):
         """Manage assets."""
         capture_all_args = True
 
-        def __init__(self, assets_env=None):
+        def __init__(self, assets_env=None, impl=GenericArgparseImplementation):
             self.env = assets_env
+            self.implementation = impl
 
         def create_parser(self, prog):
             return CatchAllParser()
@@ -231,7 +240,14 @@ def run(self, args):
                 from flask import current_app
                 self.env = current_app.jinja_env.assets_environment
 
-            from webassets import script
-            return script.main(args, env=self.env)
+            # Determine 'prog' - something like for example
+            # "./manage.py assets", to be shown in the help string.
+            # While we don't know the command name we are registered with
+            # in Flask-Assets, we are lucky to be able to rely on the
+            # name being in argv[1].
+            import sys, os.path
+            prog = '%s %s' % (os.path.basename(sys.argv[0]), sys.argv[1])
+
+            return self.implementation(self.env, prog=prog).main(args)
 
     __all__ = __all__ + ('ManageAssets',)
diff --git a/src/flaskext/__init__.py b/src/flaskext/__init__.py
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -6,7 +6,7 @@
 except ImportError:
     FLASK_VERSION = '0.6'
 from webassets.test import TempEnvironmentHelper as BaseTempEnvironmentHelper
-from flaskext.assets import Environment
+from flask.ext.assets import Environment
 
 try:
     from flask import Blueprint
@@ -23,7 +23,7 @@
 
 class TempEnvironmentHelper(BaseTempEnvironmentHelper):
 
-    def _create_environment(self):
+    def _create_environment(self, **kwargs):
         if FLASK_VERSION < '0.7':
             # Older Flask versions do not support the
             # static_folder argument, which we need to use
@@ -32,6 +32,21 @@ def _create_environment(self):
             raise SkipTest()
 
         if not hasattr(self, 'app'):
-            self.app = Flask(__name__, static_folder=self.tempdir)
+            self.app = Flask(__name__, static_folder=self.tempdir, **kwargs)
         self.env = Environment(self.app)
         return self.env
+
+
+
+try:
+    from test.test_support import check_warnings
+except ImportError:
+    # Python < 2.6
+    import contextlib
+
+    @contextlib.contextmanager
+    def check_warnings(*filters, **kwargs):
+        # We cannot reasonably support this, we'd have to copy to much code.
+        # (or write our own). Since this is only testing warnings output,
+        # we might slide by ignoring it.
+        yield
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -2,10 +2,13 @@
 """
 
 from __future__ import with_statement
+from helpers import check_warnings
 
 from nose.tools import assert_raises
 from flask import Flask
-from flaskext.assets import Environment
+from flask.ext.assets import Environment
+from webassets.exceptions import ImminentDeprecationWarning
+
 try:
     from webassets.updater import BaseUpdater
 except ImportError:
@@ -110,3 +113,48 @@ def test_key_error(self):
             # The get() helper, on the other hand, simply returns None
             assert self.env.config.get('YADDAYADDA') == None
 
+
+
+class TestVersionSystemDeprecations(object):
+    """With the introduction of the ``Environment.version`` system,
+    some functionality has been deprecated.
+    """
+
+    def setup(self):
+        app = Flask(__name__)
+        self.env = Environment(app)
+
+    def test_expire_option(self):
+        # Assigning to the expire option raises a deprecation warning
+        with check_warnings(("", ImminentDeprecationWarning)) as w:
+            self.env.expire = True
+        with check_warnings(("", ImminentDeprecationWarning)):
+            self.env.config['expire'] = True
+            # Reading the expire option raises a warning also.
+        with check_warnings(("", ImminentDeprecationWarning)):
+            x = self.env.expire
+        with check_warnings(("", ImminentDeprecationWarning)):
+            x = self.env.config['expire']
+
+    def test_expire_option_passthrough(self):
+        """While "expire" no longer exists, we attempt to provide an
+        emulation."""
+        with check_warnings(("", ImminentDeprecationWarning)):
+            # Read
+            self.env.url_expire = True
+            assert self.env.expire == 'querystring'
+            # Write
+            self.env.expire = False
+            assert self.env.url_expire == False
+            self.env.expire = 'querystring'
+            assert self.env.url_expire == True
+            # "filename" needs to be migrated manually
+            assert_raises(DeprecationWarning, setattr, self.env, 'expire', 'filename')
+
+    def test_updater_option_passthrough(self):
+        """Certain values of the "updater" option have been replaced with
+        auto_build."""
+        with check_warnings(("", ImminentDeprecationWarning)):
+            self.env.auto_build = True
+            self.env.updater = False
+            assert self.env.auto_build == False
diff --git a/tests/test_env.py b/tests/test_env.py
@@ -1,6 +1,6 @@
 from nose.tools import assert_raises
 from flask import Flask
-from flaskext.assets import Environment
+from flask.ext.assets import Environment
 
 
 class TestEnv:
diff --git a/tests/test_integration.py b/tests/test_integration.py
diff --git a/tests/test_script.py b/tests/test_script.py
diff --git a/tox.ini b/tox.ini
