mustache-js-rails 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3a389059cbfd17f2caddb9e1225a24307ad604c79827d332d611ed0b28341b
-  data.tar.gz: 78ebf3e7d410e4d2f264814db50dd37e19ea1329b5e43d3df442b2156abd880d
+  metadata.gz: 8e571a562cb620ea6b136e61db57909e64d8d720934d8eb6aa4a2138955b74e3
+  data.tar.gz: 70bcc946012dea4a264c343797f9ce6b7c30052ba7670ed3f0dd3903575a945f
 SHA512:
-  metadata.gz: 0c819e72f01a9029f71217d90c4c0172cd55557da81e0e84a870147cbe9acb4d34806f0a4694f2afd19f98c7837e1c889f8b3aee79a0c9c67769749e06fd8d0e
-  data.tar.gz: 581f85c21a646b0bd3b2b4862a3db0094a61271d891d98e1180ac5feada6033ff40bb34b8f757fa66942995c75aedf4a404b9f40bca7cc083188fc8d6e55dbff
+  metadata.gz: 0a4c07e01ba65011acfa8ff2cd366da459a97250212abe4a9f721b57f6ce0d8c5931944e541af7a285c9067076f0fc4e52093a4b286118ca28bfbb7fe0f93b13
+  data.tar.gz: 21d41e2e0bfa9869f1b746a8a50f32a0e49f1cfed987787b2667385bc1e9a66c8eaf190f04c761e7efa9877c942174ae7514eda7d16f1035a4760115172012f6

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">3.0.1</b>
+  * mustache.js - <b id="mustache-js-version">3.1.0</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 = "3.0.1"
+  VERSION = "3.1.0"
 end

data/vendor/assets/javascripts/mustache.js

@@ -49,7 +49,7 @@
    * Safe way of detecting whether or not the given thing is a primitive and
    * whether it has the given property
    */
-  function primitiveHasOwnProperty (primitive, propName) {  
+  function primitiveHasOwnProperty (primitive, propName) {
     return (
       primitive != null
       && typeof primitive !== 'object'
@@ -114,16 +114,22 @@
    * Tokens that are the root node of a subtree contain two more elements: 1) an
    * array of tokens in the subtree and 2) the index in the original template at
    * which the closing tag for that section begins.
+   *
+   * Tokens for partials also contain two more elements: 1) a string value of
+   * indendation prior to that tag and 2) the index of that tag on that line -
+   * eg a value of 2 indicates the partial is the third tag on this line.
    */
   function parseTemplate (template, tags) {
     if (!template)
       return [];
-
+    var lineHasNonSpace = false;
     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?
+    var indentation = '';  // Tracks indentation for tags that use it
+    var tagIndex = 0;      // Stores a count of number of tags encountered on a line
 
     // Strips all whitespace tokens array for the current line
     // if there was a {{#tag}} on it and otherwise only space.
@@ -169,16 +175,23 @@
 
           if (isWhitespace(chr)) {
             spaces.push(tokens.length);
+            indentation += chr;
           } else {
             nonSpace = true;
+            lineHasNonSpace = true;
+            indentation += ' ';
           }
 
           tokens.push([ 'text', chr, start, start + 1 ]);
           start += 1;
 
           // Check for whitespace on the current line.
-          if (chr === '\n')
+          if (chr === '\n') {
             stripSpace();
+            indentation = '';
+            tagIndex = 0;
+            lineHasNonSpace = false;
+          }
         }
       }
 
@@ -210,7 +223,12 @@
       if (!scanner.scan(closingTagRe))
         throw new Error('Unclosed tag at ' + scanner.pos);
 
-      token = [ type, value, start, scanner.pos ];
+      if (type == '>') {
+        token = [ type, value, start, scanner.pos, indentation, tagIndex, lineHasNonSpace ];
+      } else {
+        token = [ type, value, start, scanner.pos ];
+      }
+      tagIndex++;
       tokens.push(token);
 
       if (type === '#' || type === '^') {
@@ -232,6 +250,8 @@
       }
     }
 
+    stripSpace();
+
     // Make sure there are no open sections when we're done.
     openSection = sections.pop();
 
@@ -418,7 +438,7 @@
           while (intermediateValue != null && index < names.length) {
             if (index === names.length - 1)
               lookupHit = (
-                hasProperty(intermediateValue, names[index]) 
+                hasProperty(intermediateValue, names[index])
                 || primitiveHasOwnProperty(intermediateValue, names[index])
               );
 
@@ -592,12 +612,31 @@
       return this.renderTokens(token[4], context, partials, originalTemplate);
   };
 
+  Writer.prototype.indentPartial = function indentPartial (partial, indentation, lineHasNonSpace) {
+    var filteredIndentation = indentation.replace(/[^ \t]/g, '');
+    var partialByNl = partial.split('\n');
+    for (var i = 0; i < partialByNl.length; i++) {
+      if (partialByNl[i].length && (i > 0 || !lineHasNonSpace)) {
+        partialByNl[i] = filteredIndentation + partialByNl[i];
+      }
+    }
+    return partialByNl.join('\n');
+  };
+
   Writer.prototype.renderPartial = function renderPartial (token, context, partials, tags) {
     if (!partials) return;
 
     var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
-    if (value != null)
-      return this.renderTokens(this.parse(value, tags), context, partials, value);
+    if (value != null) {
+      var lineHasNonSpace = token[6];
+      var tagIndex = token[5];
+      var indentation = token[4];
+      var indentedValue = value;
+      if (tagIndex == 0 && indentation) {
+        indentedValue = this.indentPartial(value, indentation, lineHasNonSpace);
+      }
+      return this.renderTokens(this.parse(indentedValue, tags), context, partials, indentedValue);
+    }
   };
 
   Writer.prototype.unescapedValue = function unescapedValue (token, context) {
@@ -617,7 +656,7 @@
   };
 
   mustache.name = 'mustache.js';
-  mustache.version = '3.0.1';
+  mustache.version = '3.1.0';
   mustache.tags = [ '{{', '}}' ];
 
   // All high-level mustache.* functions use this writer.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mustache-js-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,12 +24,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
-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
-  \ "
+        version: '10.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
+description: 
 email:
 - knapo@knapo.net
 executables: []
@@ -40,9 +46,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- MIT-LICENSE
+- LICENSE
 - README.md
-- Rakefile
 - lib/mustache-js-rails.rb
 - lib/mustache-js-rails/engine.rb
 - lib/mustache-js-rails/version.rb
@@ -51,7 +56,9 @@ files:
 homepage: https://github.com/knapo/mustache-js-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/knapo/mustache-js-rails
+  source_code_uri: https://github.com/knapo/mustache-js-rails
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -60,16 +67,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mustache-js-rails
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: mustache.js and jQuery.mustache.js for Rails 3.1+ asset pipeline
+summary: jQuery Colorbox integration for Rails 3.1+ asset pipeline
 test_files: []

data/Rakefile

@@ -1,32 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-task :update do
-  Dir['*.gem'].each{ |f| FileUtils.rm(f) }
-
-	js_dir  = 'vendor/assets/javascripts'
-	css_dir = 'vendor/assets/stylesheets'
-	img_dir = 'vendor/assets/images'
-	[js_dir, css_dir, img_dir].each do |dir|
-		FileUtils.rm_r(dir)
-		FileUtils.mkdir(dir)
-		FileUtils.touch(File.join(dir, '.gitkeep'))
-	end
-
-	puts 'Updating source files...'
-	`git submodule update --recursive --remote`
-
-	puts 'Copying source js files...'
-  FileUtils.cp('mustache.js/mustache.js', js_dir)
-  FileUtils.cp('jquery.mustache.js/jquery.mustache.js', js_dir)
-
-  puts 'Updating version...'
-  mustache_js_version = File.read('mustache.js/mustache.js.nuspec').match(/<version>([\.\d]+)<\/version>/)[1]
-  jquery_mustache_js_version = File.read('jquery.mustache.js/jquery.mustache.js').match(/jQuery Mustache - v([\.\d]+)/)[1]
-  puts "Current mustache.js version is: #{mustache_js_version}"
-  puts "Current jquery.mustache.js version is: #{jquery_mustache_js_version}"
-  readme = File.read('README.md')
-  readme = readme.gsub(/(?<=<b id="mustache-js-version">)[\d\.]+(?=<\/b>)/, mustache_js_version)
-  readme = readme.gsub(/(?<=<b id="jquery-mustache-js-version">)[\d\.]+(?=<\/b>)/, jquery_mustache_js_version)
-  File.open('README.md','w') { |f| f.write(readme) }
-end