smt_rails 0.2.4 → 0.2.5

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/lib/smt_rails/tilt.rb

@@ -1,6 +1,38 @@
 require 'tilt'
+require 'execjs'
+require 'pathname'
 
 module SmtRails
+  class MustacheCompile
+    class << self
+      def compile(source, options = {})
+        context.eval("Mustache.compile(#{source.inspect})")
+      end
+
+      def compilePartial(name, source, options = {})
+        context.eval("Mustache.compilePartial(#{name.inspect}, #{source.inspect})")
+      end
+
+      private
+
+      def context
+        @context ||= ExecJS.compile(source)
+      end
+
+      def source
+        @source ||= path.read
+      end
+
+      def path
+        @path ||= assets_path.join('javascripts', 'mustache.js')
+      end
+
+      def assets_path
+        @assets_path ||= Pathname(__FILE__).dirname.join('..', '..', 'vendor', 'assets')
+      end
+    end
+  end
+
   class Tilt < Tilt::Template
     def self.default_mime_type
       'application/javascript'
@@ -15,24 +47,20 @@ module SmtRails
     def evaluate(scope, locals, &block)
       template_key = path_to_key scope
       <<-MustacheTemplate
-  (function() { 
+  (function() {
   #{namespace} || (#{namespace} = {});
-  #{namespace}Partials || (#{namespace}Partials = {});
-  
+  #{namespace}Cache || (#{namespace}Cache = {});
+  #{namespace}Cache[#{template_key.inspect}] = Mustache.compile(#{data.inspect});
+  Mustache.compilePartial(#{template_key.inspect}, #{data.inspect});
+
   #{namespace}[#{template_key.inspect}] = function(object) {
-    var template = #{data.inspect};
-    if (object == null){
-      return template;
-    } else {
-      return Mustache.render(template, object, #{SmtRails.template_namespace}Partials);
-    }
+    if (!object){ object = {}; }
+    return #{SmtRails.template_namespace}Cache[#{template_key.inspect}](object);
   };
-  
-  #{namespace}Partials[#{template_key.inspect}] = #{namespace}[#{template_key.inspect}]();
   }).call(this);
       MustacheTemplate
     end
-    
+
     def path_to_key(scope)
       path = scope.logical_path.to_s.split('/')
       path.last.gsub!(/^_/, '')

data/lib/smt_rails/version.rb

@@ -1,3 +1,3 @@
 module SmtRails
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/smt_rails.gemspec

@@ -7,12 +7,10 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Shared mustache templates for rails 3}
   gem.summary       = %q{Shared mustache templates for rails 3}
   gem.homepage      = "https://github.com/railsware/smt_rails"
-  
+
   gem.extra_rdoc_files  = [ "LICENSE", "README.md" ]
   gem.rdoc_options      = ["--charset=UTF-8"]
 
-  #gem.add_development_dependency "jasmine",         ">= 1.0.0"
-  
   gem.add_runtime_dependency "rails",           ">= 3.1.0"
   gem.add_runtime_dependency "tilt",            ">= 1.3.3"
   gem.add_runtime_dependency "sprockets",       ">= 2.0.3"

data/vendor/assets/javascripts/mustache.js

@@ -5,22 +5,20 @@
 
 /*global define: false*/
 
-var Mustache;
-
-(function (exports) {
-  if (typeof module !== "undefined" && module.exports) {
-    module.exports = exports; // CommonJS
-  } else if (typeof define === "function") {
-    define(exports); // AMD
+(function (root, factory) {
+  if (typeof exports === "object" && exports) {
+    module.exports = factory; // CommonJS
+  } else if (typeof define === "function" && define.amd) {
+    define(factory); // AMD
   } else {
-    Mustache = exports; // <script>
+    root.Mustache = factory; // <script>
   }
-}((function () {
+}(this, (function () {
 
   var exports = {};
 
   exports.name = "mustache.js";
-  exports.version = "0.7.0";
+  exports.version = "0.7.2";
   exports.tags = ["{{", "}}"];
 
   exports.Scanner = Scanner;
@@ -34,10 +32,13 @@ var Mustache;
   var curlyRe = /\s*\}/;
   var tagRe = /#|\^|\/|>|\{|&|=|!/;
 
+  var _test = RegExp.prototype.test;
+  var _toString = Object.prototype.toString;
+
   // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
   // See https://github.com/janl/mustache.js/issues/189
   function testRe(re, string) {
-    return RegExp.prototype.test.call(re, string);
+    return _test.call(re, string);
   }
 
   function isWhitespace(string) {
@@ -45,7 +46,7 @@ var Mustache;
   }
 
   var isArray = Array.isArray || function (obj) {
-    return Object.prototype.toString.call(obj) === "[object Array]";
+    return _toString.call(obj) === '[object Array]';
   };
 
   function escapeRe(string) {
@@ -128,17 +129,13 @@ var Mustache;
   function Context(view, parent) {
     this.view = view;
     this.parent = parent;
-    this.clearCache();
+    this._cache = {};
   }
 
   Context.make = function (view) {
     return (view instanceof Context) ? view : new Context(view);
   };
 
-  Context.prototype.clearCache = function () {
-    this._cache = {};
-  };
-
   Context.prototype.push = function (view) {
     return new Context(view, this);
   };
@@ -147,17 +144,15 @@ var Mustache;
     var value = this._cache[name];
 
     if (!value) {
-      if (name === ".") {
+      if (name == '.') {
         value = this.view;
       } else {
         var context = this;
 
         while (context) {
-          if (name.indexOf(".") > 0) {
-            var names = name.split("."), i = 0;
-
+          if (name.indexOf('.') > 0) {
             value = context.view;
-
+            var names = name.split('.'), i = 0;
             while (value && i < names.length) {
               value = value[names[i++]];
             }
@@ -165,9 +160,7 @@ var Mustache;
             value = context.view[name];
           }
 
-          if (value != null) {
-            break;
-          }
+          if (value != null) break;
 
           context = context.parent;
         }
@@ -176,9 +169,7 @@ var Mustache;
       this._cache[name] = value;
     }
 
-    if (typeof value === "function") {
-      value = value.call(this.view);
-    }
+    if (typeof value === 'function') value = value.call(this.view);
 
     return value;
   };
@@ -209,13 +200,19 @@ var Mustache;
     return fn;
   };
 
+  Writer.prototype.getPartial = function (name) {
+    if (!(name in this._partialCache) && this._loadPartial) {
+      this.compilePartial(name, this._loadPartial(name));
+    }
+
+    return this._partialCache[name];
+  };
+
   Writer.prototype.compileTokens = function (tokens, template) {
-    var fn = compileTokens(tokens);
     var self = this;
-
     return function (view, partials) {
       if (partials) {
-        if (typeof partials === "function") {
+        if (typeof partials === 'function') {
           self._loadPartial = partials;
         } else {
           for (var name in partials) {
@@ -224,7 +221,7 @@ var Mustache;
         }
       }
 
-      return fn(self, Context.make(view), template);
+      return renderTokens(tokens, self, Context.make(view), template);
     };
   };
 
@@ -232,195 +229,105 @@ var Mustache;
     return this.compile(template)(view, partials);
   };
 
-  Writer.prototype._section = function (name, context, text, callback) {
-    var value = context.lookup(name);
-
-    switch (typeof value) {
-    case "object":
-      if (isArray(value)) {
-        var buffer = "";
-
-        for (var i = 0, len = value.length; i < len; ++i) {
-          buffer += callback(this, context.push(value[i]));
-        }
-
-        return buffer;
-      }
-
-      return value ? callback(this, context.push(value)) : "";
-    case "function":
-      var self = this;
-      var scopedRender = function (template) {
-        return self.render(template, context);
-      };
-
-      return value.call(context.view, text, scopedRender) || "";
-    default:
-      if (value) {
-        return callback(this, context);
-      }
-    }
-
-    return "";
-  };
-
-  Writer.prototype._inverted = function (name, context, callback) {
-    var value = context.lookup(name);
-
-    // Use JavaScript's definition of falsy. Include empty arrays.
-    // See https://github.com/janl/mustache.js/issues/186
-    if (!value || (isArray(value) && value.length === 0)) {
-      return callback(this, context);
-    }
-
-    return "";
-  };
-
-  Writer.prototype._partial = function (name, context) {
-    if (!(name in this._partialCache) && this._loadPartial) {
-      this.compilePartial(name, this._loadPartial(name));
-    }
-
-    var fn = this._partialCache[name];
-
-    return fn ? fn(context) : "";
-  };
-
-  Writer.prototype._name = function (name, context) {
-    var value = context.lookup(name);
-
-    if (typeof value === "function") {
-      value = value.call(context.view);
-    }
-
-    return (value == null) ? "" : String(value);
-  };
-
-  Writer.prototype._escaped = function (name, context) {
-    return exports.escape(this._name(name, context));
-  };
-
   /**
-   * Calculates the bounds of the section represented by the given `token` in
-   * the original template by drilling down into nested sections to find the
-   * last token that is part of that section. Returns an array of [start, end].
+   * Low-level function that renders the given `tokens` using the given `writer`
+   * and `context`. The `template` string is only needed for templates that use
+   * higher-order sections to extract the portion of the original template that
+   * was contained in that section.
    */
-  function sectionBounds(token) {
-    var start = token[3];
-    var end = start;
-
-    var tokens;
-    while ((tokens = token[4]) && tokens.length) {
-      token = tokens[tokens.length - 1];
-      end = token[3];
-    }
+  function renderTokens(tokens, writer, context, template) {
+    var buffer = '';
 
-    return [start, end];
-  }
+    var token, tokenValue, value;
+    for (var i = 0, len = tokens.length; i < len; ++i) {
+      token = tokens[i];
+      tokenValue = token[1];
 
-  /**
-   * Low-level function that compiles the given `tokens` into a function
-   * that accepts three arguments: a Writer, a Context, and the template.
-   */
-  function compileTokens(tokens) {
-    var subRenders = {};
-
-    function subRender(i, tokens, template) {
-      if (!subRenders[i]) {
-        var fn = compileTokens(tokens);
-        subRenders[i] = function (writer, context) {
-          return fn(writer, context, template);
-        };
-      }
+      switch (token[0]) {
+      case '#':
+        value = context.lookup(tokenValue);
 
-      return subRenders[i];
-    }
+        if (typeof value === 'object') {
+          if (isArray(value)) {
+            for (var j = 0, jlen = value.length; j < jlen; ++j) {
+              buffer += renderTokens(token[4], writer, context.push(value[j]), template);
+            }
+          } else if (value) {
+            buffer += renderTokens(token[4], writer, context.push(value), template);
+          }
+        } else if (typeof value === 'function') {
+          var text = template == null ? null : template.slice(token[3], token[5]);
+          value = value.call(context.view, text, function (template) {
+            return writer.render(template, context);
+          });
+          if (value != null) buffer += value;
+        } else if (value) {
+          buffer += renderTokens(token[4], writer, context, template);
+        }
 
-    return function (writer, context, template) {
-      var buffer = "";
-      var token, sectionText;
-
-      for (var i = 0, len = tokens.length; i < len; ++i) {
-        token = tokens[i];
-
-        switch (token[0]) {
-        case "#":
-          sectionText = template.slice.apply(template, sectionBounds(token));
-          buffer += writer._section(token[1], context, sectionText, subRender(i, token[4], template));
-          break;
-        case "^":
-          buffer += writer._inverted(token[1], context, subRender(i, token[4], template));
-          break;
-        case ">":
-          buffer += writer._partial(token[1], context);
-          break;
-        case "&":
-          buffer += writer._name(token[1], context);
-          break;
-        case "name":
-          buffer += writer._escaped(token[1], context);
-          break;
-        case "text":
-          buffer += token[1];
-          break;
+        break;
+      case '^':
+        value = context.lookup(tokenValue);
+
+        // Use JavaScript's definition of falsy. Include empty arrays.
+        // See https://github.com/janl/mustache.js/issues/186
+        if (!value || (isArray(value) && value.length === 0)) {
+          buffer += renderTokens(token[4], writer, context, template);
         }
+
+        break;
+      case '>':
+        value = writer.getPartial(tokenValue);
+        if (typeof value === 'function') buffer += value(context);
+        break;
+      case '&':
+        value = context.lookup(tokenValue);
+        if (value != null) buffer += value;
+        break;
+      case 'name':
+        value = context.lookup(tokenValue);
+        if (value != null) buffer += exports.escape(value);
+        break;
+      case 'text':
+        buffer += tokenValue;
+        break;
       }
+    }
 
-      return buffer;
-    };
+    return buffer;
   }
 
   /**
    * Forms the given array of `tokens` into a nested tree structure where
-   * tokens that represent a section have a fifth item: an array that contains
-   * all tokens in that section.
+   * tokens that represent a section have two additional items: 1) an array of
+   * all tokens that appear in that section and 2) the index in the original
+   * template that represents the end of that section.
    */
   function nestTokens(tokens) {
     var tree = [];
     var collector = tree;
     var sections = [];
-    var token, section;
 
-    for (var i = 0; i < tokens.length; ++i) {
+    var token;
+    for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
-
       switch (token[0]) {
-      case "#":
-      case "^":
-        token[4] = [];
+      case '#':
+      case '^':
         sections.push(token);
         collector.push(token);
-        collector = token[4];
+        collector = token[4] = [];
         break;
-      case "/":
-        if (sections.length === 0) {
-          throw new Error("Unopened section: " + token[1]);
-        }
-
-        section = sections.pop();
-
-        if (section[1] !== token[1]) {
-          throw new Error("Unclosed section: " + section[1]);
-        }
-
-        if (sections.length > 0) {
-          collector = sections[sections.length - 1][4];
-        } else {
-          collector = tree;
-        }
+      case '/':
+        var section = sections.pop();
+        section[5] = token[2];
+        collector = sections.length > 0 ? sections[sections.length - 1][4] : tree;
         break;
       default:
         collector.push(token);
       }
     }
 
-    // Make sure there were no open sections when we're done.
-    section = sections.pop();
-
-    if (section) {
-      throw new Error("Unclosed section: " + section[1]);
-    }
-
     return tree;
   }
 
@@ -429,26 +336,26 @@ var Mustache;
    * to a single token.
    */
   function squashTokens(tokens) {
-    var token, lastToken;
+    var squashedTokens = [];
 
-    for (var i = 0; i < tokens.length; ++i) {
+    var token, lastToken;
+    for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
-
-      if (lastToken && lastToken[0] === "text" && token[0] === "text") {
-        lastToken[1] += token[1];
-        lastToken[3] = token[3];
-        tokens.splice(i--, 1); // Remove this token from the array.
-      } else {
-        lastToken = token;
+      if (token) {
+        if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
+          lastToken[1] += token[1];
+          lastToken[3] = token[3];
+        } else {
+          lastToken = token;
+          squashedTokens.push(token);
+        }
       }
     }
+
+    return squashedTokens;
   }
 
   function escapeTags(tags) {
-    if (tags.length !== 2) {
-      throw new Error("Invalid tags: " + tags.join(" "));
-    }
-
     return [
       new RegExp(escapeRe(tags[0]) + "\\s*"),
       new RegExp("\\s*" + escapeRe(tags[1]))
@@ -462,22 +369,27 @@ var Mustache;
    * course, the default is to use mustaches (i.e. Mustache.tags).
    */
   exports.parse = function (template, tags) {
+    template = template || '';
     tags = tags || exports.tags;
 
+    if (typeof tags === 'string') tags = tags.split(spaceRe);
+    if (tags.length !== 2) throw new Error('Invalid tags: ' + tags.join(', '));
+
     var tagRes = escapeTags(tags);
     var scanner = new Scanner(template);
 
-    var tokens = [],      // Buffer to hold the tokens
-        spaces = [],      // Indices of whitespace tokens on the current line
-        hasTag = false,   // Is there a {{tag}} on the current line?
-        nonSpace = false; // Is there a non-space char on the current line?
+    var sections = [];     // Stack to hold section tokens
+    var tokens = [];       // Buffer to hold the tokens
+    var spaces = [];       // Indices of whitespace tokens on the current line
+    var hasTag = false;    // Is there a {{tag}} on the current line?
+    var nonSpace = false;  // Is there a non-space char on the current line?
 
     // Strips all whitespace tokens array for the current line
     // if there was a {{#tag}} on it and otherwise only space.
     function stripSpace() {
       if (hasTag && !nonSpace) {
         while (spaces.length) {
-          tokens.splice(spaces.pop(), 1);
+          delete tokens[spaces.pop()];
         }
       } else {
         spaces = [];
@@ -487,12 +399,12 @@ var Mustache;
       nonSpace = false;
     }
 
-    var start, type, value, chr;
-
+    var start, type, value, chr, token;
     while (!scanner.eos()) {
       start = scanner.pos;
-      value = scanner.scanUntil(tagRes[0]);
 
+      // Match any text between tags.
+      value = scanner.scanUntil(tagRes[0]);
       if (value) {
         for (var i = 0, len = value.length; i < len; ++i) {
           chr = value.charAt(i);
@@ -503,68 +415,69 @@ var Mustache;
             nonSpace = true;
           }
 
-          tokens.push(["text", chr, start, start + 1]);
+          tokens.push(['text', chr, start, start + 1]);
           start += 1;
 
-          if (chr === "\n") {
-            stripSpace(); // Check for whitespace on the current line.
-          }
+          // Check for whitespace on the current line.
+          if (chr == '\n') stripSpace();
         }
       }
 
-      start = scanner.pos;
-
       // Match the opening tag.
-      if (!scanner.scan(tagRes[0])) {
-        break;
-      }
-
+      if (!scanner.scan(tagRes[0])) break;
       hasTag = true;
-      type = scanner.scan(tagRe) || "name";
 
-      // Skip any whitespace between tag and value.
+      // Get the tag type.
+      type = scanner.scan(tagRe) || 'name';
       scanner.scan(whiteRe);
 
-      // Extract the tag value.
-      if (type === "=") {
+      // Get the tag value.
+      if (type === '=') {
         value = scanner.scanUntil(eqRe);
         scanner.scan(eqRe);
         scanner.scanUntil(tagRes[1]);
-      } else if (type === "{") {
-        var closeRe = new RegExp("\\s*" + escapeRe("}" + tags[1]));
-        value = scanner.scanUntil(closeRe);
+      } else if (type === '{') {
+        value = scanner.scanUntil(new RegExp('\\s*' + escapeRe('}' + tags[1])));
         scanner.scan(curlyRe);
         scanner.scanUntil(tagRes[1]);
-        type = "&";
+        type = '&';
       } else {
         value = scanner.scanUntil(tagRes[1]);
       }
 
       // Match the closing tag.
-      if (!scanner.scan(tagRes[1])) {
-        throw new Error("Unclosed tag at " + scanner.pos);
-      }
+      if (!scanner.scan(tagRes[1])) throw new Error('Unclosed tag at ' + scanner.pos);
 
-      tokens.push([type, value, start, scanner.pos]);
+      token = [type, value, start, scanner.pos];
+      tokens.push(token);
 
-      if (type === "name" || type === "{" || type === "&") {
+      if (type === '#' || type === '^') {
+        sections.push(token);
+      } else if (type === '/') {
+        // Check section nesting.
+        if (sections.length === 0) throw new Error('Unopened section "' + value + '" at ' + start);
+        var openSection = sections.pop();
+        if (openSection[1] !== value) throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
+      } else if (type === 'name' || type === '{' || type === '&') {
         nonSpace = true;
-      }
-
-      // Set the tags for the next time around.
-      if (type === "=") {
+      } else if (type === '=') {
+        // Set the tags for the next time around.
         tags = value.split(spaceRe);
+        if (tags.length !== 2) throw new Error('Invalid tags at ' + start + ': ' + tags.join(', '));
         tagRes = escapeTags(tags);
       }
     }
 
-    squashTokens(tokens);
+    // Make sure there are no open sections when we're done.
+    var openSection = sections.pop();
+    if (openSection) throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
+
+    tokens = squashTokens(tokens);
 
     return nestTokens(tokens);
   };
 
-  // The high-level clearCache, compile, compilePartial, and render functions
-  // use this default writer.
+  // All Mustache.* functions use this writer.
   var _writer = new Writer();
 
   /**
@@ -619,4 +532,4 @@ var Mustache;
 
   return exports;
 
-}())));
+}())));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smt_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,52 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70257902094220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257902094220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70257902093340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257902093340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70257902130980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257902130980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70257902130440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70257902130440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.99.4
 description: Shared mustache templates for rails 3
 email:
 - contacts@railsware.com
@@ -66,6 +86,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -90,24 +111,24 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 1538246288557208580
+      hash: -290175364099614496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 1538246288557208580
+      hash: -290175364099614496
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Shared mustache templates for rails 3