mustachejs-rails 0.7.1 → 0.7.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 261849b7cde04e47f0e4cdb9f618c1983119eb29
+  data.tar.gz: 9c8df312fa1c187a99ff193c4c4ede273eca347a
+SHA512:
+  metadata.gz: cd1c7cf447c12ebf8ec8bc0bb8850efd384bf7c5e25a61b9d55b2c2296301d6eb6a912a4c703e25c6f7912aaffe7052514be4cd8695bba794d3019855a96aa5e
+  data.tar.gz: 5c0919257f04c57544863c1353b456cff98f95c8fd5f5206b62b2d613e673a872ee97cf35195067db14ee66335a6baa561ba3f65486f3616291384769e7fcd26

data/lib/mustachejs/rails/version.rb

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

data/mustachejs-rails.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency "rake"
 end

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.1";
+  exports.version = "0.7.2";
   exports.tags = ["{{", "}}"];
 
   exports.Scanner = Scanner;
@@ -301,24 +299,6 @@ var Mustache;
     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].
-   */
-  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];
-    }
-
-    return [start, end];
-  }
-
   /**
    * Low-level function that compiles the given `tokens` into a function
    * that accepts three arguments: a Writer, a Context, and the template.
@@ -346,7 +326,7 @@ var Mustache;
 
         switch (token[0]) {
         case "#":
-          sectionText = template.slice.apply(template, sectionBounds(token));
+          sectionText = template.slice(token[3], token[5]);
           buffer += writer._section(token[1], context, sectionText, subRender(i, token[4], template));
           break;
         case "^":
@@ -373,55 +353,35 @@ var Mustache;
 
   /**
    * 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;
   }
 
@@ -430,12 +390,12 @@ var Mustache;
    * to a single token.
    */
   function squashTokens(tokens) {
-    var token, lastToken, squashedTokens = [];
+    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") {
+      if (token[0] === 'text' && lastToken && lastToken[0] === 'text') {
         lastToken[1] += token[1];
         lastToken[3] = token[3];
       } else {
@@ -448,10 +408,6 @@ var Mustache;
   }
 
   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]))
@@ -468,13 +424,19 @@ var Mustache;
     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.
@@ -492,7 +454,6 @@ var Mustache;
     }
 
     var start, type, value, chr;
-
     while (!scanner.eos()) {
       start = scanner.pos;
       value = scanner.scanUntil(tagRes[0]);
@@ -546,25 +507,48 @@ var Mustache;
 
       // Match the closing tag.
       if (!scanner.scan(tagRes[1])) {
-        throw new Error("Unclosed tag at " + scanner.pos);
+        throw new Error('Unclosed tag at ' + scanner.pos);
       }
 
-      tokens.push([type, value, start, scanner.pos]);
+      // Check section nesting.
+      if (type === '/') {
+        if (sections.length === 0) {
+          throw new Error('Unopened section "' + value + '" at ' + start);
+        }
 
-      if (type === "name" || type === "{" || type === "&") {
-        nonSpace = true;
+        var section = sections.pop();
+
+        if (section[1] !== value) {
+          throw new Error('Unclosed section "' + section[1] + '" at ' + start);
+        }
       }
 
-      // Set the tags for the next time around.
-      if (type === "=") {
+      var token = [type, value, start, scanner.pos];
+      tokens.push(token);
+
+      if (type === '#' || type === '^') {
+        sections.push(token);
+      } else if (type === "name" || type === "{" || type === "&") {
+        nonSpace = true;
+      } 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);
       }
     }
 
-    tokens = squashTokens(tokens);
+    // 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);
+    }
 
-    return nestTokens(tokens);
+    return nestTokens(squashTokens(tokens));
   };
 
   // The high-level clearCache, compile, compilePartial, and render functions

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mustachejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.2
 platform: ruby
 authors:
 - Simon COURTOIS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
-dependencies: []
+date: 2013-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides mustache.js for your Rails 3 application.
 email:
 - scourtois@cubyx.fr
@@ -30,32 +43,25 @@ files:
 - vendor/assets/javascripts/mustache.js
 homepage: http://github.com/simonc/mustachejs-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2278858652052863131
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2278858652052863131
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use mustache.js with Rails 3
 test_files: []