moving everything around

Author: bashwork

speleo.service/service/assets.py

@@ -1,6 +1,14 @@
+import os
+import os.path
 import logging
 from webassets import Environment, Bundle
 
+class Assets(object):
+
+    def __init__(self, assets):
+        self.javascripts = assets['javascript'].urls()
+        self.stylesheets = assets['stylesheet'].urls()
+
 def get_assets(options):
     ''' A helper to build the assets for the service
 
@@ -21,23 +29,37 @@ def get_assets(options):
     # stylesheet bundle
     # ------------------------------------------------------------ 
     stylesheet = Bundle('css/*.css',
-        filters='cssutils', output='asset/speleo.css')
+        filters='cssutils', output='cache/speleo.css')
     environment.register('stylesheet', stylesheet)
 
+    # ------------------------------------------------------------ 
+    # template bundle
+    # ------------------------------------------------------------ 
+    template = Bundle('tmpl/*.tmpl',
+        filters='jst', output='cache/speleo.jst.js', debug=False)
+    environment.config['jst_compiler'] = '_.template'
+    
     # ------------------------------------------------------------ 
     # javascript bundle
     # ------------------------------------------------------------ 
-    javascript = Bundle('js/lib/*.js', 'js/*.js',
-        filters='closure_js', output='asset/speleo.js')
+    javascript = Bundle(
+        Bundle('js/lib/core/jquery.js', 'js/lib/core/underscore.js'),
+        template, # needs underscore
+        Bundle('js/lib/ace/ace.js', 'js/lib/ace/mode-javascript.js'),
+        Bundle('js/lib/*.js', 'js/speleo.js'),
+        filters='closure_js', output='cache/speleo.js')
     environment.register('javascript', javascript)
-    
+
     # ------------------------------------------------------------ 
-    # template bundle
+    # output cache
     # ------------------------------------------------------------ 
-    template = Bundle('tmpl/*.tmpl',
-        filters='jst', output='asset/speleo.jst.js')
-    environment.register('template', template)
-    environment.config['jst_compiler'] = '_.template'
+    if not os.path.exists(os.path.join('./static', 'cache')):
+        os.mkdir(os.path.join('./static', 'cache'))
+
+    # ------------------------------------------------------------ 
+    # initialized
+    # ------------------------------------------------------------ 
+    return Assets(environment)
 
 # ------------------------------------------------------------ 
 # exports
@@ -51,7 +73,6 @@ def get_assets(options):
     class Options(object):
         debug = True
 
-    environment = get_assets(Options())
-    print "Compiled stylesheets: ", environment['stylesheet'].urls()
-    print "Compiled javascripts: ", environment['javascript'].urls()
-    print "Compiled templates: ",   environment['template'].urls()
+    assets = get_assets(Options())
+    print "Compiled stylesheets: ", assets.stylesheets
+    print "Compiled javascripts: ", assets.javascripts

speleo.service/service/handlers/common.py

@@ -3,6 +3,10 @@
 
 class BaseHandler(tornado.web.RequestHandler):
 
+    @property
+    def assets(self):
+        return self.application.assets
+
     @property
     def security(self):
         return self.application.security

speleo.service/static/js/lib/jquery.js renamed to speleo.service/static/js/lib/core/jquery.js

@@ -85,7 +85,7 @@ var AnalyzeAppView = Backbone.View.extend({
   queryFiltersEl: $('#analyze-filters'),
   queryTokenizersEl: $('#analyze-tokenizers'),
   queryResultsEl: $('#analyze-results'),
-  optionsTemplate: _.template($('#options-template').html()),
+  optionsTemplate: speleo.template['analyze.options'],
 
   events: {
     'click #analyze-submit': 'executeQueryButton',

speleo.service/static/js/lib/underscore.js renamed to speleo.service/static/js/lib/core/underscore.js

@@ -200,7 +200,7 @@ var LineChartBlockView = Backbone.View.extend({
 
 var TableBlockView = Backbone.View.extend({
   tagName: 'li',
-  template: _.template($('#block-table-template').html()),
+  template: speleo.template['blockboard.table'],
   events: {
     'click .block-close': 'remove'
   },

speleo.service/static/js/speleo.analyze.js

@@ -36,7 +36,7 @@ var BlockCollection = Backbone.Collection.extend({
 var BlockView = Backbone.View.extend({
 
   tagName: 'li',
-  template: _.template($('#block-template').html()),
+  template: speleo.template['blockboard.block'],
   events: {
     'click .block-close': 'remove'
   },

speleo.service/static/js/speleo.blocks.charts.js

@@ -26,17 +26,13 @@ var EventCollection = Backbone.Collection.extend({
   model: Event
 });
 
-window.JST = {
-  '#event-template': _.template($('#event-template').html())
-};
-
 
 // ------------------------------------------------------------
 // views
 // ------------------------------------------------------------
 var DashEventView = Backbone.View.extend({
   tagName: 'li',
-  template: window.JST['#event-template'],
+  template: speleo.template['dashboard.event'],
 
   events: {
     'mouseover': 'gainfocus',

speleo.service/static/js/speleo.blocks.js

@@ -69,16 +69,6 @@
     </div>
 {% end %}
 
-{% block templates %}
-    <script type="text/template" id="options-template">
-      <% _.each(values, function(value) { %>
-         <option value='<%= value %>'><%= value %></option>
-      <% }); %>
-    </script>
-{% end %}
-
 {% block extra-tail %}
-    <script src="/static/js/lib/google-prettify.js"></script> 
-    <script src="/static/js/lib/elasticsearch.js"></script> 
     <script src="/static/js/speleo.analyze.js"></script> 
 {% end %}