mustachejs-rails 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 261849b7cde04e47f0e4cdb9f618c1983119eb29
-  data.tar.gz: 9c8df312fa1c187a99ff193c4c4ede273eca347a
+  metadata.gz: 30b027e628a3d7cb5eb041fb73b787e0a1f475fb
+  data.tar.gz: 066a7094d0c64d2c6ab7893b24015dbba11828e2
 SHA512:
-  metadata.gz: cd1c7cf447c12ebf8ec8bc0bb8850efd384bf7c5e25a61b9d55b2c2296301d6eb6a912a4c703e25c6f7912aaffe7052514be4cd8695bba794d3019855a96aa5e
-  data.tar.gz: 5c0919257f04c57544863c1353b456cff98f95c8fd5f5206b62b2d613e673a872ee97cf35195067db14ee66335a6baa561ba3f65486f3616291384769e7fcd26
+  metadata.gz: 6c8436eaf5e16de466152fa90e8a567cce981a49383d82d47233af25556541e98f481ae1f238fe9f8f4e3b496407f527b4455716dbe334cb791207434dd64b83
+  data.tar.gz: b5090be7f8eac1ea1627eee6542000cc5e8f9216cf9c039e2fd1d5589b7cec8851b0e7b8dcafc2c58fcef58e4d11ff2195d633acf581eeb376b54d80ac4c0b2b

data/lib/mustachejs/rails/version.rb

@@ -1,5 +1,5 @@
 module Mustachejs
   module Rails
-    VERSION = "0.7.2"
+    VERSION = "0.7.3"
   end
 end

data/vendor/assets/javascripts/mustache.js

@@ -7,23 +7,17 @@
 
 (function (root, factory) {
   if (typeof exports === "object" && exports) {
-    module.exports = factory; // CommonJS
-  } else if (typeof define === "function" && define.amd) {
-    define(factory); // AMD
+    factory(exports); // CommonJS
   } else {
-    root.Mustache = factory; // <script>
+    var mustache = {};
+    factory(mustache);
+    if (typeof define === "function" && define.amd) {
+      define(mustache); // AMD
+    } else {
+      root.Mustache = mustache; // <script>
+    }
   }
-}(this, (function () {
-
-  var exports = {};
-
-  exports.name = "mustache.js";
-  exports.version = "0.7.2";
-  exports.tags = ["{{", "}}"];
-
-  exports.Scanner = Scanner;
-  exports.Context = Context;
-  exports.Writer = Writer;
+}(this, function (mustache) {
 
   var whiteRe = /\s*/;
   var spaceRe = /\s+/;
@@ -34,19 +28,25 @@
 
   // 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);
+  var RegExp_test = RegExp.prototype.test;
+  function testRegExp(re, string) {
+    return RegExp_test.call(re, string);
   }
 
   function isWhitespace(string) {
-    return !testRe(nonSpaceRe, string);
+    return !testRegExp(nonSpaceRe, string);
   }
 
-  var isArray = Array.isArray || function (obj) {
-    return Object.prototype.toString.call(obj) === "[object Array]";
+  var Object_toString = Object.prototype.toString;
+  var isArray = Array.isArray || function (object) {
+    return Object_toString.call(object) === '[object Array]';
   };
 
-  function escapeRe(string) {
+  function isFunction(object) {
+    return typeof object === 'function';
+  }
+
+  function escapeRegExp(string) {
     return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
   }
 
@@ -65,10 +65,6 @@
     });
   }
 
-  // Export the escaping function so that the user may override it.
-  // See https://github.com/janl/mustache.js/issues/244
-  exports.escape = escapeHtml;
-
   function Scanner(string) {
     this.string = string;
     this.tail = string;
@@ -90,9 +86,10 @@
     var match = this.tail.match(re);
 
     if (match && match.index === 0) {
-      this.tail = this.tail.substring(match[0].length);
-      this.pos += match[0].length;
-      return match[0];
+      var string = match[0];
+      this.tail = this.tail.substring(string.length);
+      this.pos += string.length;
+      return string;
     }
 
     return "";
@@ -103,78 +100,68 @@
    * the skipped string, which is the entire tail if no match can be made.
    */
   Scanner.prototype.scanUntil = function (re) {
-    var match, pos = this.tail.search(re);
+    var index = this.tail.search(re), match;
 
-    switch (pos) {
+    switch (index) {
     case -1:
       match = this.tail;
-      this.pos += this.tail.length;
       this.tail = "";
       break;
     case 0:
       match = "";
       break;
     default:
-      match = this.tail.substring(0, pos);
-      this.tail = this.tail.substring(pos);
-      this.pos += pos;
+      match = this.tail.substring(0, index);
+      this.tail = this.tail.substring(index);
     }
 
+    this.pos += match.length;
+
     return match;
   };
 
   function Context(view, parent) {
-    this.view = view;
+    this.view = view == null ? {} : view;
     this.parent = parent;
-    this.clearCache();
+    this._cache = { '.': this.view };
   }
 
   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);
   };
 
   Context.prototype.lookup = function (name) {
-    var value = this._cache[name];
-
-    if (!value) {
-      if (name === ".") {
-        value = this.view;
-      } else {
-        var context = this;
-
-        while (context) {
-          if (name.indexOf(".") > 0) {
-            var names = name.split("."), i = 0;
+    var value;
+    if (name in this._cache) {
+      value = this._cache[name];
+    } else {
+      var context = this;
 
-            value = context.view;
+      while (context) {
+        if (name.indexOf('.') > 0) {
+          value = context.view;
 
-            while (value && i < names.length) {
-              value = value[names[i++]];
-            }
-          } else {
-            value = context.view[name];
+          var names = name.split('.'), i = 0;
+          while (value != null && i < names.length) {
+            value = value[names[i++]];
           }
+        } else {
+          value = context.view[name];
+        }
 
-          if (value != null) {
-            break;
-          }
+        if (value != null) break;
 
-          context = context.parent;
-        }
+        context = context.parent;
       }
 
       this._cache[name] = value;
     }
 
-    if (typeof value === "function") {
+    if (isFunction(value)) {
       value = value.call(this.view);
     }
 
@@ -194,7 +181,7 @@
     var fn = this._cache[template];
 
     if (!fn) {
-      var tokens = exports.parse(template, tags);
+      var tokens = mustache.parse(template, tags);
       fn = this._cache[template] = this.compileTokens(tokens, template);
     }
 
@@ -207,13 +194,19 @@
     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 (isFunction(partials)) {
           self._loadPartial = partials;
         } else {
           for (var name in partials) {
@@ -222,7 +215,7 @@
         }
       }
 
-      return fn(self, Context.make(view), template);
+      return renderTokens(tokens, self, Context.make(view), template);
     };
   };
 
@@ -230,125 +223,76 @@
     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);
-      };
-
-      var result = value.call(context.view, text, scopedRender);
-      return result != null ? result : "";
-    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 "";
-  };
+  /**
+   * 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 renderTokens(tokens, writer, context, template) {
+    var buffer = '';
 
-  Writer.prototype._partial = function (name, context) {
-    if (!(name in this._partialCache) && this._loadPartial) {
-      this.compilePartial(name, this._loadPartial(name));
+    // This function is used to render an artbitrary template
+    // in the current context by higher-order functions.
+    function subRender(template) {
+      return writer.render(template, context);
     }
 
-    var fn = this._partialCache[name];
-
-    return fn ? fn(context) : "";
-  };
+    var token, tokenValue, value;
+    for (var i = 0, len = tokens.length; i < len; ++i) {
+      token = tokens[i];
+      tokenValue = token[1];
 
-  Writer.prototype._name = function (name, context) {
-    var value = context.lookup(name);
+      switch (token[0]) {
+      case '#':
+        value = context.lookup(tokenValue);
 
-    if (typeof value === "function") {
-      value = value.call(context.view);
-    }
+        if (typeof value === 'object' || typeof value === 'string') {
+          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 (isFunction(value)) {
+          var text = template == null ? null : template.slice(token[3], token[5]);
+          value = value.call(context.view, text, subRender);
+          if (value != null) buffer += value;
+        } else if (value) {
+          buffer += renderTokens(token[4], writer, context, template);
+        }
 
-    return (value == null) ? "" : String(value);
-  };
+        break;
+      case '^':
+        value = context.lookup(tokenValue);
 
-  Writer.prototype._escaped = function (name, context) {
-    return exports.escape(this._name(name, context));
-  };
+        // 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);
+        }
 
-  /**
-   * 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);
-        };
+        break;
+      case '>':
+        value = writer.getPartial(tokenValue);
+        if (isFunction(value)) 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 += mustache.escape(value);
+        break;
+      case 'text':
+        buffer += tokenValue;
+        break;
       }
-
-      return subRenders[i];
     }
 
-    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(token[3], token[5]);
-          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;
-        }
-      }
-
-      return buffer;
-    };
+    return buffer;
   }
 
   /**
@@ -395,12 +339,14 @@
     var token, lastToken;
     for (var i = 0, len = tokens.length; i < len; ++i) {
       token = tokens[i];
-      if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
-        lastToken[1] += token[1];
-        lastToken[3] = token[3];
-      } else {
-        lastToken = token;
-        squashedTokens.push(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);
+        }
       }
     }
 
@@ -409,8 +355,8 @@
 
   function escapeTags(tags) {
     return [
-      new RegExp(escapeRe(tags[0]) + "\\s*"),
-      new RegExp("\\s*" + escapeRe(tags[1]))
+      new RegExp(escapeRegExp(tags[0]) + "\\s*"),
+      new RegExp("\\s*" + escapeRegExp(tags[1]))
     ];
   }
 
@@ -420,14 +366,12 @@
    * opening and closing tags used in the template (e.g. ["<%", "%>"]). Of
    * course, the default is to use mustaches (i.e. Mustache.tags).
    */
-  exports.parse = function (template, tags) {
+  function parseTemplate(template, tags) {
     template = template || '';
-    tags = tags || exports.tags;
+    tags = tags || mustache.tags;
 
     if (typeof tags === 'string') tags = tags.split(spaceRe);
-    if (tags.length !== 2) {
-      throw new Error('Invalid tags: ' + tags.join(', '));
-    }
+    if (tags.length !== 2) throw new Error('Invalid tags: ' + tags.join(', '));
 
     var tagRes = escapeTags(tags);
     var scanner = new Scanner(template);
@@ -443,7 +387,7 @@
     function stripSpace() {
       if (hasTag && !nonSpace) {
         while (spaces.length) {
-          tokens.splice(spaces.pop(), 1);
+          delete tokens[spaces.pop()];
         }
       } else {
         spaces = [];
@@ -453,11 +397,12 @@
       nonSpace = false;
     }
 
-    var start, type, value, chr;
+    var start, type, value, chr, token, openSection;
     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);
@@ -468,143 +413,139 @@
             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*' + escapeRegExp('}' + 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);
-      }
-
-      // Check section nesting.
-      if (type === '/') {
-        if (sections.length === 0) {
-          throw new Error('Unopened section "' + value + '" at ' + start);
-        }
-
-        var section = sections.pop();
-
-        if (section[1] !== value) {
-          throw new Error('Unclosed section "' + section[1] + '" at ' + start);
-        }
-      }
+      if (!scanner.scan(tagRes[1])) throw new Error('Unclosed tag at ' + scanner.pos);
 
-      var token = [type, value, start, scanner.pos];
+      token = [type, value, start, scanner.pos];
       tokens.push(token);
 
       if (type === '#' || type === '^') {
         sections.push(token);
-      } else if (type === "name" || type === "{" || type === "&") {
+      } else if (type === '/') {
+        // Check section nesting.
+        openSection = sections.pop();
+        if (!openSection) {
+          throw new Error('Unopened section "' + value + '" at ' + start);
+        }
+        if (openSection[1] !== value) {
+          throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
+        }
+      } else if (type === 'name' || type === '{' || type === '&') {
         nonSpace = true;
-      } else 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);
       }
     }
 
     // Make sure there are no open sections when we're done.
-    var section = sections.pop();
-    if (section) {
-      throw new Error('Unclosed section "' + section[1] + '" at ' + scanner.pos);
+    openSection = sections.pop();
+    if (openSection) {
+      throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
     }
 
     return nestTokens(squashTokens(tokens));
-  };
+  }
 
-  // The high-level clearCache, compile, compilePartial, and render functions
-  // use this default writer.
-  var _writer = new Writer();
+  mustache.name = "mustache.js";
+  mustache.version = "0.7.3";
+  mustache.tags = ["{{", "}}"];
+
+  mustache.Scanner = Scanner;
+  mustache.Context = Context;
+  mustache.Writer = Writer;
+
+  mustache.parse = parseTemplate;
+
+  // Export the escaping function so that the user may override it.
+  // See https://github.com/janl/mustache.js/issues/244
+  mustache.escape = escapeHtml;
+
+  // All Mustache.* functions use this writer.
+  var defaultWriter = new Writer();
 
   /**
    * Clears all cached templates and partials in the default writer.
    */
-  exports.clearCache = function () {
-    return _writer.clearCache();
+  mustache.clearCache = function () {
+    return defaultWriter.clearCache();
   };
 
   /**
    * Compiles the given `template` to a reusable function using the default
    * writer.
    */
-  exports.compile = function (template, tags) {
-    return _writer.compile(template, tags);
+  mustache.compile = function (template, tags) {
+    return defaultWriter.compile(template, tags);
   };
 
   /**
    * Compiles the partial with the given `name` and `template` to a reusable
    * function using the default writer.
    */
-  exports.compilePartial = function (name, template, tags) {
-    return _writer.compilePartial(name, template, tags);
+  mustache.compilePartial = function (name, template, tags) {
+    return defaultWriter.compilePartial(name, template, tags);
   };
 
   /**
    * Compiles the given array of tokens (the output of a parse) to a reusable
    * function using the default writer.
    */
-  exports.compileTokens = function (tokens, template) {
-    return _writer.compileTokens(tokens, template);
+  mustache.compileTokens = function (tokens, template) {
+    return defaultWriter.compileTokens(tokens, template);
   };
 
   /**
    * Renders the `template` with the given `view` and `partials` using the
    * default writer.
    */
-  exports.render = function (template, view, partials) {
-    return _writer.render(template, view, partials);
+  mustache.render = function (template, view, partials) {
+    return defaultWriter.render(template, view, partials);
   };
 
   // This is here for backwards compatibility with 0.4.x.
-  exports.to_html = function (template, view, partials, send) {
-    var result = exports.render(template, view, partials);
+  mustache.to_html = function (template, view, partials, send) {
+    var result = mustache.render(template, view, partials);
 
-    if (typeof send === "function") {
+    if (isFunction(send)) {
       send(result);
     } else {
       return result;
     }
   };
 
-  return exports;
-
-}())));
+}));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustachejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Simon COURTOIS