mustache-js-rails 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe70b48ee69c0c14080983551dd6aa7b952fd383
-  data.tar.gz: 768ecd0124ff9327f4e0b93f0feb75736ff17d87
+  metadata.gz: 79c7fb99b94ab2a8b73dda4fa42fdc59cbf16d34
+  data.tar.gz: 9c2d101179b78ecc1cd6af33d20f9838dccf1c26
 SHA512:
-  metadata.gz: 30fdf8b400ad236a6a8eb600458adfdc64140da14c69f432f97f7ec75e0f199d3df4c11127c7e3cfd0d902d6e5979b43d0d3c36786036d7775675097c0b4b2e2
-  data.tar.gz: 07d3755af7a32608cf07b77af1d1b10647eb5eceecb6e5b135e1c2fc9b4528b5556bbed09522c93ff80d5b05749730b79f16103bb6e7c98502bdb99e216ff2e6
+  metadata.gz: d2916426cb9edf9420f261434a08b198a40728d7703cc84604864fe40f8e9196d61250f37aead98ec2f7346a24d2213d915d1a513edcfc717209eda25ccffdbb
+  data.tar.gz: 755554a542c19da1c49c7f40ff12ed8b9021c12606c6f48ac8a25b15bd07fb0ac85c396f4974b32c3f2fbd7e459b30ca169139139e60d546473fc8085e2d088a

data/README.md

@@ -5,7 +5,7 @@ and [mustache jQuery integration](https://github.com/jonnyreeves/jquery-Mustache
 
 Integrated versions are:
 
-  * mustache.js - <b id="mustache-js-version">0.8.1</b>
+  * mustache.js - <b id="mustache-js-version">0.8.2</b>
   * jQuery mustache - <b id="jquery-mustache-js-version">0.2.8</b>
 
 ### Installation

data/lib/mustache-js-rails/version.rb

@@ -1,3 +1,3 @@
 module MustacheJsRails
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

data/vendor/assets/javascripts/mustache.js

@@ -5,32 +5,16 @@
 
 /*global define: false*/
 
-(function (root, factory) {
+(function (global, factory) {
   if (typeof exports === "object" && exports) {
     factory(exports); // CommonJS
+  } else if (typeof define === "function" && define.amd) {
+    define(['exports'], factory); // AMD
   } else {
-    var mustache = {};
-    factory(mustache);
-    if (typeof define === "function" && define.amd) {
-      define(mustache); // AMD
-    } else {
-      root.Mustache = mustache; // <script>
-    }
+    factory(global.Mustache = {}); // <script>
   }
 }(this, function (mustache) {
 
-  // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
-  // See https://github.com/janl/mustache.js/issues/189
-  var RegExp_test = RegExp.prototype.test;
-  function testRegExp(re, string) {
-    return RegExp_test.call(re, string);
-  }
-
-  var nonSpaceRe = /\S/;
-  function isWhitespace(string) {
-    return !testRegExp(nonSpaceRe, string);
-  }
-
   var Object_toString = Object.prototype.toString;
   var isArray = Array.isArray || function (object) {
     return Object_toString.call(object) === '[object Array]';
@@ -44,6 +28,18 @@
     return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
   }
 
+  // Workaround for https://issues.apache.org/jira/browse/COUCHDB-577
+  // See https://github.com/janl/mustache.js/issues/189
+  var RegExp_test = RegExp.prototype.test;
+  function testRegExp(re, string) {
+    return RegExp_test.call(re, string);
+  }
+
+  var nonSpaceRe = /\S/;
+  function isWhitespace(string) {
+    return !testRegExp(nonSpaceRe, string);
+  }
+
   var entityMap = {
     "&": "&amp;",
     "<": "&lt;",
@@ -59,17 +55,6 @@
     });
   }
 
-  function escapeTags(tags) {
-    if (!isArray(tags) || tags.length !== 2) {
-      throw new Error('Invalid tags: ' + tags);
-    }
-
-    return [
-      new RegExp(escapeRegExp(tags[0]) + "\\s*"),
-      new RegExp("\\s*" + escapeRegExp(tags[1]))
-    ];
-  }
-
   var whiteRe = /\s*/;
   var spaceRe = /\s+/;
   var equalsRe = /\s*=/;
@@ -99,15 +84,8 @@
    * which the closing tag for that section begins.
    */
   function parseTemplate(template, tags) {
-    tags = tags || mustache.tags;
-    template = template || '';
-
-    if (typeof tags === 'string') {
-      tags = tags.split(spaceRe);
-    }
-
-    var tagRes = escapeTags(tags);
-    var scanner = new Scanner(template);
+    if (!template)
+      return [];
 
     var sections = [];     // Stack to hold section tokens
     var tokens = [];       // Buffer to hold the tokens
@@ -119,9 +97,8 @@
     // if there was a {{#tag}} on it and otherwise only space.
     function stripSpace() {
       if (hasTag && !nonSpace) {
-        while (spaces.length) {
+        while (spaces.length)
           delete tokens[spaces.pop()];
-        }
       } else {
         spaces = [];
       }
@@ -130,14 +107,32 @@
       nonSpace = false;
     }
 
+    var openingTagRe, closingTagRe, closingCurlyRe;
+    function compileTags(tags) {
+      if (typeof tags === 'string')
+        tags = tags.split(spaceRe, 2);
+
+      if (!isArray(tags) || tags.length !== 2)
+        throw new Error('Invalid tags: ' + tags);
+
+      openingTagRe = new RegExp(escapeRegExp(tags[0]) + '\\s*');
+      closingTagRe = new RegExp('\\s*' + escapeRegExp(tags[1]));
+      closingCurlyRe = new RegExp('\\s*' + escapeRegExp('}' + tags[1]));
+    }
+
+    compileTags(tags || mustache.tags);
+
+    var scanner = new Scanner(template);
+
     var start, type, value, chr, token, openSection;
     while (!scanner.eos()) {
       start = scanner.pos;
 
       // Match any text between tags.
-      value = scanner.scanUntil(tagRes[0]);
+      value = scanner.scanUntil(openingTagRe);
+
       if (value) {
-        for (var i = 0, len = value.length; i < len; ++i) {
+        for (var i = 0, valueLength = value.length; i < valueLength; ++i) {
           chr = value.charAt(i);
 
           if (isWhitespace(chr)) {
@@ -146,18 +141,19 @@
             nonSpace = true;
           }
 
-          tokens.push(['text', chr, start, start + 1]);
+          tokens.push([ 'text', chr, start, start + 1 ]);
           start += 1;
 
           // Check for whitespace on the current line.
-          if (chr === '\n') {
+          if (chr === '\n')
             stripSpace();
-          }
         }
       }
 
       // Match the opening tag.
-      if (!scanner.scan(tagRes[0])) break;
+      if (!scanner.scan(openingTagRe))
+        break;
+
       hasTag = true;
 
       // Get the tag type.
@@ -168,20 +164,19 @@
       if (type === '=') {
         value = scanner.scanUntil(equalsRe);
         scanner.scan(equalsRe);
-        scanner.scanUntil(tagRes[1]);
+        scanner.scanUntil(closingTagRe);
       } else if (type === '{') {
-        value = scanner.scanUntil(new RegExp('\\s*' + escapeRegExp('}' + tags[1])));
+        value = scanner.scanUntil(closingCurlyRe);
         scanner.scan(curlyRe);
-        scanner.scanUntil(tagRes[1]);
+        scanner.scanUntil(closingTagRe);
         type = '&';
       } else {
-        value = scanner.scanUntil(tagRes[1]);
+        value = scanner.scanUntil(closingTagRe);
       }
 
       // Match the closing tag.
-      if (!scanner.scan(tagRes[1])) {
+      if (!scanner.scan(closingTagRe))
         throw new Error('Unclosed tag at ' + scanner.pos);
-      }
 
       token = [ type, value, start, scanner.pos ];
       tokens.push(token);
@@ -192,25 +187,24 @@
         // Check section nesting.
         openSection = sections.pop();
 
-        if (!openSection) {
+        if (!openSection)
           throw new Error('Unopened section "' + value + '" at ' + start);
-        }
-        if (openSection[1] !== value) {
+
+        if (openSection[1] !== value)
           throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
-        }
       } else if (type === 'name' || type === '{' || type === '&') {
         nonSpace = true;
       } else if (type === '=') {
         // Set the tags for the next time around.
-        tagRes = escapeTags(tags = value.split(spaceRe));
+        compileTags(value);
       }
     }
 
     // Make sure there are no open sections when we're done.
     openSection = sections.pop();
-    if (openSection) {
+
+    if (openSection)
       throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
-    }
 
     return nestTokens(squashTokens(tokens));
   }
@@ -223,7 +217,7 @@
     var squashedTokens = [];
 
     var token, lastToken;
-    for (var i = 0, len = tokens.length; i < len; ++i) {
+    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
       token = tokens[i];
 
       if (token) {
@@ -252,7 +246,7 @@
     var sections = [];
 
     var token, section;
-    for (var i = 0, len = tokens.length; i < len; ++i) {
+    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
       token = tokens[i];
 
       switch (token[0]) {
@@ -299,14 +293,15 @@
   Scanner.prototype.scan = function (re) {
     var match = this.tail.match(re);
 
-    if (match && match.index === 0) {
-      var string = match[0];
-      this.tail = this.tail.substring(string.length);
-      this.pos += string.length;
-      return string;
-    }
+    if (!match || match.index !== 0)
+      return '';
 
-    return "";
+    var string = match[0];
+
+    this.tail = this.tail.substring(string.length);
+    this.pos += string.length;
+
+    return string;
   };
 
   /**
@@ -357,35 +352,37 @@
    * up the context hierarchy if the value is absent in this context's view.
    */
   Context.prototype.lookup = function (name) {
+    var cache = this.cache;
+
     var value;
-    if (name in this.cache) {
-      value = this.cache[name];
+    if (name in cache) {
+      value = cache[name];
     } else {
-      var context = this;
+      var context = this, names, index;
 
       while (context) {
         if (name.indexOf('.') > 0) {
           value = context.view;
+          names = name.split('.');
+          index = 0;
 
-          var names = name.split('.'), i = 0;
-          while (value != null && i < names.length) {
-            value = value[names[i++]];
-          }
+          while (value != null && index < names.length)
+            value = value[names[index++]];
         } else {
           value = context.view[name];
         }
 
-        if (value != null) break;
+        if (value != null)
+          break;
 
         context = context.parent;
       }
 
-      this.cache[name] = value;
+      cache[name] = value;
     }
 
-    if (isFunction(value)) {
+    if (isFunction(value))
       value = value.call(this.view);
-    }
 
     return value;
   };
@@ -414,9 +411,8 @@
     var cache = this.cache;
     var tokens = cache[template];
 
-    if (tokens == null) {
+    if (tokens == null)
       tokens = cache[template] = parseTemplate(template, tags);
-    }
 
     return tokens;
   };
@@ -456,29 +452,31 @@
     }
 
     var token, value;
-    for (var i = 0, len = tokens.length; i < len; ++i) {
+    for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
       token = tokens[i];
 
       switch (token[0]) {
       case '#':
         value = context.lookup(token[1]);
-        if (!value) continue;
+
+        if (!value)
+          continue;
 
         if (isArray(value)) {
-          for (var j = 0, jlen = value.length; j < jlen; ++j) {
+          for (var j = 0, valueLength = value.length; j < valueLength; ++j) {
             buffer += this.renderTokens(token[4], context.push(value[j]), partials, originalTemplate);
           }
         } else if (typeof value === 'object' || typeof value === 'string') {
           buffer += this.renderTokens(token[4], context.push(value), partials, originalTemplate);
         } else if (isFunction(value)) {
-          if (typeof originalTemplate !== 'string') {
+          if (typeof originalTemplate !== 'string')
             throw new Error('Cannot use higher-order sections without the original template');
-          }
 
           // Extract the portion of the original template that the section contains.
           value = value.call(context.view, originalTemplate.slice(token[3], token[5]), subRender);
 
-          if (value != null) buffer += value;
+          if (value != null)
+            buffer += value;
         } else {
           buffer += this.renderTokens(token[4], context, partials, originalTemplate);
         }
@@ -489,23 +487,33 @@
 
         // 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)) {
+        if (!value || (isArray(value) && value.length === 0))
           buffer += this.renderTokens(token[4], context, partials, originalTemplate);
-        }
 
         break;
       case '>':
-        if (!partials) continue;
+        if (!partials)
+          continue;
+
         value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
-        if (value != null) buffer += this.renderTokens(this.parse(value), context, partials, value);
+
+        if (value != null)
+          buffer += this.renderTokens(this.parse(value), context, partials, value);
+
         break;
       case '&':
         value = context.lookup(token[1]);
-        if (value != null) buffer += value;
+
+        if (value != null)
+          buffer += value;
+
         break;
       case 'name':
         value = context.lookup(token[1]);
-        if (value != null) buffer += mustache.escape(value);
+
+        if (value != null)
+          buffer += mustache.escape(value);
+
         break;
       case 'text':
         buffer += token[1];

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mustache-js-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,6 +17,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,8 +27,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-description: "\n    mustache.js (https://github.com/janl/mustache.js) \n    and jQuery.mustache.js
-  (https://github.com/jonnyreeves/jquery-Mustache) \n    for Rails 3.1+ asset pipeline\n
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '5.0'
+description: "\n    mustache.js (https://github.com/janl/mustache.js)\n    and jQuery.mustache.js
+  (https://github.com/jonnyreeves/jquery-Mustache)\n    for Rails 3.1+ asset pipeline\n
   \ "
 email:
 - knapo@knapo.net