Permalink
Browse files

Merge branch 'release/0.8' into stable

  • Loading branch information...
miracle2k committed Nov 23, 2012
2 parents 185b475 + c12fabd commit e776af7d9103388501916a6c32b72adb9206428c
Showing with 378 additions and 110 deletions.
  1. +1 −1 .gitignore
  2. +9 −0 CHANGES
  3. +1 −1 docs/conf.py
  4. +24 −3 docs/index.rst
  5. +1 −0 requirements-dev.pip
  6. +207 −75 src/flask_assets.py
  7. +0 −1 tests/helpers.py
  8. +1 −1 tests/test_config.py
  9. +35 −7 tests/test_env.py
  10. +27 −0 tests/test_filters.py
  11. +37 −16 tests/test_integration.py
  12. +30 −5 tests/test_script.py
  13. +5 −0 tox.ini
View
@@ -3,7 +3,7 @@
*.un~
/.tox
-/BRANCH_TODO
+/LOCAL_TODO*
# IDEs
/flask-assets.wpr
View
@@ -1,3 +1,12 @@
+0.8 (2012-11-23)
+ This release is compatible with webassets 0.8.
+
+ - Flask-Script's ``build`` command now has ``--parse-templates`` option.
+ - ``Environment`` class now has ``from_yaml`` and ``from_module``
+ shortcuts (Sean Lynch).
+ - Jinja2 filter uses the Flask template environment.
+ - Fixed PySscss filter.
+
0.7 (2012-04-11)
This release is compatible with webassets 0.7.
View
@@ -23,7 +23,7 @@
# make sure we are documenting the local version with autodoc
sys.path.insert(0, os.path.abspath('../src'))
-from flaskext import assets as flaskassets
+from flask.ext import assets as flaskassets
# -- General configuration -----------------------------------------------------
View
@@ -144,6 +144,27 @@ configuration. The following two statements are equivalent:
For a list of available settings, see the full
:ref:`webassets documentation <webassets:environment-configuration>`.
+Babel Configuration
+~~~~~~~~~~~~~~~~~~~
+
+If you use `Babel`_ for internationalization, then you will need to
+add the extension to your babel configuration file
+as ``webassets.ext.jinja2.AssetsExtension``
+
+Otherwise, babel will not extract strings from any templates that
+include an ``assets`` tag.
+
+Here is an example ``babel.cfg``:
+
+.. code-block:: python
+
+ [python: **.py]
+ [jinja2: **.html]
+ extensions=jinja2.ext.autoescape,jinja2.ext.with_,webassets.ext.jinja2.AssetsExtension
+
+
+.. _Babel: http://babel.edgewall.org/
+
Management Command
------------------
@@ -153,12 +174,12 @@ as ``flaskext.assets.ManageAssets``:
.. code-block:: python
- from flaskext.assets import ManageAssets
+ from flask.ext.assets import ManageAssets
manager = Manager(app)
manager.add_command("assets", ManageAssets(assets_env))
-You can explicitly pass the ``assets_env`` when adding the comm`and as above.
-Alternatively, ``ManageAssets`` will import the ``current_app` from Flask and
+You can explicitly pass the ``assets_env`` when adding the command as above.
+Alternatively, ``ManageAssets`` will import the ``current_app`` from Flask and
use the ``jinja_env``.
The command allows you to do things like rebuilding bundles from the
View
@@ -2,3 +2,4 @@ nose
Flask
Flask-Script
webassets
+PyYAML
Oops, something went wrong.

0 comments on commit e776af7

Please sign in to comment.