assets

.gitignore

@@ -6,3 +6,4 @@
 config.py
 config.sls
 realms/static/vendor
+realms/static/assets/*

bower.json

@@ -11,6 +11,6 @@
         "components-font-awesome": "~3.2.1",
         "showdown": "~0.3.1",
         "keymaster": "madrobby/keymaster",
-        "ace": "~1.0.0"
+        "ace": "~1.1.0"
     }
 }

realms/__init__.py

@@ -224,33 +224,25 @@ for status_code in httplib.responses:
     if status_code >= 400:
         app.register_error_handler(status_code, error_handler)
 
-assets = Environment()
+from realms.lib.assets import assets, register
 assets.init_app(app)
+assets.app = app
 
+app.jinja_env.globals['bundles'] = assets
 
-js = Bundle(
+register(
-    Bundle('vendor/jquery/jquery.js',
+    'vendor/jquery/jquery.js',
     'vendor/components-underscore/underscore.js',
     'vendor/components-bootstrap/js/bootstrap.js',
     'vendor/handlebars/handlebars.js',
     'vendor/showdown/src/showdown.js',
+    'vendor/marked/lib/marked.js',
     'vendor/showdown/src/extensions/table.js',
     'js/wmd.js',
-           filters='closure_js'),
+    'js/html-sanitizer-minified.js',  # don't minify
-    'js/html-sanitizer-minified.js',
     'vendor/highlightjs/highlight.pack.js',
-    Bundle('js/main.js', filters='closure_js'),
+    'js/main.js'
-    output='packed-common.js')
+)
-assets.register('js_common', js)
-
-js = Bundle('js/ace/ace.js',
-            'js/ace/mode-markdown.js',
-            'vendor/keymaster/keymaster.js',
-            'js/dillinger.js',
-            filters='closure_js', output='packed-editor.js')
-
-assets.register('js_editor', js)
-
 
 @app.before_request
 def check_subdomain():

realms/lib/assets.py

@@ -0,0 +1,10 @@
+from flask.ext.assets import Bundle, Environment
+
+assets = Environment()
+
+
+def register(*files):
+    assets.debug = True
+    filters = 'uglifyjs'
+    output = 'assets/%(version)s.js'
+    assets.add(Bundle(*files, filters=filters, output=output))

realms/modules/wiki/assets.py

@@ -0,0 +1,8 @@
+from realms.lib.assets import register
+
+register(
+    'js/ace/ace.js',
+    'js/ace/mode-markdown.js',
+    'vendor/keymaster/keymaster.js',
+    'js/dillinger.js'
+)

realms/static/js/dillinger.js

@@ -13,14 +13,9 @@ $(function(){
         , autoInterval
         , profile =
         {
-            theme: 'ace/theme/idle_fingers'
+            theme: 'ace/theme/idle_fingers', currentMd: '', autosave: {
-            , currentMd: ''
+            enabled: true, interval: 3000 // might be too aggressive; don't want to block UI for large saves.
-            , autosave:
+        }, current_filename: $pagename.val()
-        {
-            enabled: true
-            , interval: 3000 // might be too aggressive; don't want to block UI for large saves.
-        }
-            , current_filename : $pagename.val()
         };
 
     // Feature detect ish
@@ -64,7 +59,12 @@ $(function(){
     function hasLocalStorage() {
         // http://mathiasbynens.be/notes/localstorage-pattern
         var storage;
-        try{ if(localStorage.getItem) {storage = localStorage} }catch(e){}
+        try {
+            if (localStorage.getItem) {
+                storage = localStorage
+            }
+        } catch (e) {
+        }
         return storage;
     }
 
@@ -111,7 +111,9 @@ $(function(){
      * @param {String}  The property to test
      * @return {Boolean}
      */
-    function prefixed(prop){ return testPropsAll(prop, 'pfx') }
+    function prefixed(prop) {
+        return testPropsAll(prop, 'pfx')
+    }
 
     /**
      * A generic CSS / DOM property test; if a browser supports
@@ -157,15 +159,11 @@ $(function(){
      *
      * @return {String}
      */
-    function normalizeTransitionEnd()
+    function normalizeTransitionEnd() {
-    {
 
         var transEndEventNames =
         {
-            'WebkitTransition' : 'webkitTransitionEnd'
+            'WebkitTransition': 'webkitTransitionEnd', 'MozTransition': 'transitionend', 'OTransition': 'oTransitionEnd', 'msTransition': 'msTransitionEnd' // maybe?
-            , 'MozTransition'    : 'transitionend'
-            , 'OTransition'      : 'oTransitionEnd'
-            , 'msTransition'     : 'msTransitionEnd' // maybe?
             , 'transition': 'transitionend'
         };
 
@@ -173,7 +171,6 @@ $(function(){
     }
 
 
-
     /**
      * Get current filename from contenteditable field.
      *
@@ -238,7 +235,9 @@ $(function(){
      */
     function init() {
 
-        if( !hasLocalStorage() ) { sadPanda() }
+        if (!hasLocalStorage()) {
+            sadPanda()
+        }
         else {
 
             // Attach to jQuery support object for later use.
@@ -345,7 +344,8 @@ $(function(){
         // Let's turn off autosave
         profile.autosave.enabled = false
             // Delete the property altogether --> need ; for JSHint bug.
-        ; delete localStorage.profile;
+        ;
+        delete localStorage.profile;
         // Now reload the page to start fresh
         window.location.reload();
     }
@@ -353,7 +353,9 @@ $(function(){
     function changeTheme(e) {
         // check for same theme
         var $target = $(e.target);
-        if( $target.attr('data-value') === profile.theme) { return; }
+        if ($target.attr('data-value') === profile.theme) {
+            return;
+        }
         else {
             // add/remove class
             $theme.find('li > a.selected').removeClass('selected');
@@ -386,7 +388,6 @@ $(function(){
 
         var unmd = editor.getSession().getValue()
             , md = MDR.convert(unmd, true);
-
         $preview
             .html('') // unnecessary?
             .html(md);

realms/static/js/main.js

@@ -5,7 +5,7 @@ hljs.initHighlightingOnLoad();
 MDR = {
     doc: null,
     callback: WMD.convert,
-    sanitize: null, // Override
+    sanitize: true, // Override
     convert: function(md, sanitize){
         if (this.sanitize !== null) {
             sanitize = this.sanitize;
@@ -14,7 +14,13 @@ MDR = {
         var html = this.doc.html;
         if (sanitize) {
             // Causes some problems with inline styles
-            html = html_sanitize(html);
+            html = html_sanitize(html, function(url) {
+                if(/^https?:\/\//.test(url)) {
+                    return url
+                }
+            }, function(id){
+                return id;
+            });
         }
         html = this.hook(html);
         return html;

realms/static/js/wmd.js

@@ -51,7 +51,8 @@ function gsub(str, re, fn, /*optional*/newstr) {
         return gsub(remaining, re, fn, newstr);
     }
     return newstr + str;
-}
+};
+
 WMD.showdown = new Showdown.converter({extensions: ['table']});
 WMD.processor = WMD.showdown.makeHtml;
 

realms/templates/layout.html

@@ -97,9 +97,11 @@
       </div>
     </div>
 
-    {% assets "js_common" %}
+    {% for bundle in bundles %}
+      {% assets bundle %}
         <script type="text/javascript" src="{{ ASSET_URL }}"></script>
       {% endassets %}
+    {% endfor %}
     {% block js %}{% endblock %}
   </body>
 </html>

realms/templates/wiki/edit.html

@@ -1,14 +1,10 @@
 {% extends 'layout.html' %}
 {% block js %}
-    {% assets "js_editor" %}
-        <script type="text/javascript" src="{{ ASSET_URL }}"></script>
-    {% endassets %}
         <script>
         $(function(){
             $("#start-togetherjs").click(function(){
                 $(this).prop('disabled', true).html("Loading");
             });
-            MDR.sanitize = false;
         });
         TogetherJSConfig_toolName = "Collaboration";
         TogetherJSConfig_suppressJoinConfirmation = true;

srv/salt/realms/init.sls

@@ -18,18 +18,27 @@ bower:
     - require:
       - pkg.installed: common-pkgs
 
-realms-repo:
+uglify-js:
-  git.latest:
+  npm.installed:
-    - unless: test -e /vagrant
+    - user: root
-    - name: git@github.com:scragg0x/realms.git
+    - require:
-    - target: /home/deploy
+      - pkg.installed: common-pkgs
-    - rev: master
-    - user: deploy
-    - identity: /home/deploy/.ssh/id_rsa
 
-/home/deploy/virtualenvs/realms:
+create_virtualenv:
   virtualenv.managed:
+    - name: /home/deploy/virtualenvs/realms
     - requirements: /home/deploy/realms/requirements.txt
     - cwd: /home/deploy/realms
-    - user: deploy
+    - user: root
 
+vagrant_ownership:
+  cmd.run:
+    - name: chown -R vagrant.vagrant /home/deploy
+    - onlyif: test -d /vagrant
+    - user: root
+
+deploy_ownership:
+  cmd.run:
+    - name: chown -R vagrant.vagrant /home/deploy
+    - unless: test -d /vagrant
+    - user: root

srv/salt/supervisor/init.sls

@@ -1,10 +1,3 @@
 /etc/supervisor/conf.d/realms.conf:
   file.managed:
     - source: salt://supervisor/supervisord.conf
-
-supervisor-run:
-  cmd.run:
-    - unless: test -e /tmp/supervisord.pid
-    - name: /usr/local/bin/supervisord
-    - require:
-      - file.managed: /etc/supervisor/conf.d/realms.conf

srv/salt/supervisor/supervisord.conf

@@ -1,2 +1,3 @@
 [program:realms]
-command=/home/deploy/virtualenvs/realms/bin/python /home/deploy/realms/manage.py server
+user=deploy
+command=/home/deploy/realms/virtualenvs/realms/bin/python /home/deploy/realms/manage.py server