Add webassets and Flask-Assets

.gitignore

@@ -5,3 +5,5 @@
 *sass-cache*/
 *.css.map
 TODO.md
+beancount_web/static/gen/
+*.webassets-cache*/

beancount_web/application.py

@@ -5,10 +5,14 @@
 from datetime import date, datetime
 
 from flask import Flask, render_template, url_for, request, redirect, abort, Markup
+from flask.ext.assets import Environment, Bundle
 
 app = Flask(__name__)
 app.entry_filters = {}
 
+assets = Environment()
+assets.init_app(app)
+
 @app.route('/account/<name>/')
 def account_with_journal(name=None):
     return account(account_name=name, with_journal=True)

beancount_web/templates/_layout.html

@@ -150,17 +150,22 @@ <h1 id="site-name">{{ title }}</h1>
         </div>
     </div>
 
-    <script src="{{ url_for('static', filename='vendor/jquery-js/jquery-2.1.4.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/chartist-js/chartist.min.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/chartist-js/chartist-plugin-legend.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/chartist-js/chartist-plugin-tooltip.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/moment-js/moment.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/jquery-treemap-js/jquery-treemap.js') }}"></script>
-    <script src="{{ url_for('static', filename='vendor/ace-js/ace.js') }}"></script>
-    <script src="{{ url_for('static', filename='javascript/helpers.js') }}"></script>
-    <script src="{{ url_for('static', filename='javascript/editor.js') }}"></script>
-    <script src="{{ url_for('static', filename='javascript/charts.js') }}"></script>
-    <script src="{{ url_for('static', filename='javascript/main.js') }}"></script>
+    {% assets
+            filters="rjsmin",
+            output="gen/packed.js",
+            "vendor/jquery-js/jquery-2.1.4.js",
+            "vendor/chartist-js/chartist.min.js",
+            "vendor/chartist-js/chartist-plugin-legend.js",
+            "vendor/chartist-js/chartist-plugin-tooltip.js",
+            "vendor/moment-js/moment.js",
+            "vendor/jquery-treemap-js/jquery-treemap.js",
+            "javascript/helpers.js",
+            "javascript/editor.js",
+            "javascript/charts.js",
+            "javascript/main.js" %}
+        <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+    {% endassets %}
+
     {% block javascript %}{% endblock %}
 </body>
 </html>

beancount_web/templates/context.html

@@ -2,7 +2,11 @@
 {% set active_page = 'context' %}
 
 {% block title %}Context{% endblock %}
-{% block javascript %}<script src="{{ url_for('static', filename='javascript/editor.js') }}"></script>{% endblock %}
+
+{% block javascript %}
+    <script src="{{ url_for('static', filename='vendor/ace-js/ace.js') }}"></script>
+    <script src="{{ url_for('static', filename='javascript/editor.js') }}"></script>
+{% endblock %}
 
 {% block content %}
     <h1>Context: <pre>{{ context.hash }}</pre></h1>

beancount_web/templates/source.html

@@ -2,7 +2,11 @@
 {% set active_page = 'source' %}
 
 {% block title %}Source{% endblock %}
-{% block javascript %}<script src="{{ url_for('static', filename='javascript/editor.js') }}"></script>{% endblock %}
+
+{% block javascript %}
+    <script src="{{ url_for('static', filename='vendor/ace-js/ace.js') }}"></script>
+    <script src="{{ url_for('static', filename='javascript/editor.js') }}"></script>
+{% endblock %}
 
 {% block content %}
     <h1>Source</h1>

requirements.txt

@@ -1,9 +1,11 @@
 -e hg+https://bitbucket.org/blais/beancount#egg=beancount
 Flask==0.10.1
+Flask-Assets==0.11
 itsdangerous==0.24
 Jinja2==2.8
 livereload==2.4.0
 MarkupSafe==0.23
 six==1.10.0
 tornado==4.3
+webassets==0.11.1
 Werkzeug==0.11.2

setup.py

@@ -16,6 +16,7 @@
       install_requires=[
             'beancount',
             'Flask==0.10.1',
+            'Flask-Assets==0.11',
             'livereload'
       ],
       include_package_data=True,