mustache 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf94eeecd19f735037d7bbb26dec6b31fd744220
-  data.tar.gz: 1950b718fced739f53562898d3577a10ca88cdbf
+SHA256:
+  metadata.gz: e67a05eb517f6f5186b678d0ffe92a167d2e7908c7b738ad2d99d0c835c230a1
+  data.tar.gz: f011440519762ec422c3724be76ed103153d52144ec24b9eb45c133c1c74dc92
 SHA512:
-  metadata.gz: 2aa2853641590267b49b7264f8592fed44f3fa430ea10e60ae3ce8b58a5fadea3b532f256b70229a0fbd62835176ead87b8dff0d66ac73750af603c9739e6587
-  data.tar.gz: 31a31d089046ab7d11b6541a02b588d92c26a6b5879185203ddc4ffedd64a41cc6b0651b818066333ee9af4000754a8f1d3885b5647895390ebe3e62d65532ae
+  metadata.gz: c207b7321fb06b82c814dddc0c7857bf5aa3f2a3ab7058f269f15bf0545aa2b684f5624800d5779f05f4c98a7bed69ca26bb7e1f1e3a955c397adeac3d7ba6bf
+  data.tar.gz: 140774643b249d068b45f2d7a00af1b30faa651300ee8b26534e76f6da267dc63c3251bded724bd0c5fbe0506705b26322e6a99bde7375c40492b27ba8ac58f8

data/Rakefile

@@ -35,7 +35,7 @@ if command? :ronn
 
   desc "Build the manual"
   task "man:build" do
-    sh "ronn -br5 --organization=DEFUNKT --manual='Mustache Manual' man/*.ron"
+    sh "ronn -br5 --organization=DEFUNKT --manual='Mustache Manual' man/*.ronn"
   end
 end
 

data/lib/mustache.rb

@@ -190,7 +190,22 @@ class Mustache
   end
 
   # Override this to provide custom escaping.
+  # By default it uses `CGI.escapeHTML`.
   #
+  # @example Overriding #escape
+  #   class PersonView < Mustache
+  #     def escape(value)
+  #       my_html_escape_method(value.to_s)
+  #     end
+  #   end
+  #
+  # @param [Object] value Value to escape.
+  # @return [String] Escaped content.
+  def escape(value)
+    self.escapeHTML(value.to_s)
+  end
+  
+  # Override this to provide custom escaping.
   # Example:
   #
   #   class PersonView < Mustache
@@ -199,6 +214,11 @@ class Mustache
   #     end
   #   end
   #
+  # @deprecated Use {#escape} instead.
+  #
+  #   Note that {#escape} can receive any kind of object.
+  #   If your override logic is expecting a string, you will
+  #   have to call to_s on it yourself.
   # @param [String] str String to escape.
   #
   # @return [String] Escaped HTML.
@@ -244,7 +264,7 @@ class Mustache
     file_name = underscore(name)
     file_path = "#{view_path}/#{file_name}.rb"
 
-    return Mustache unless File.exists?(file_path)
+    return Mustache unless File.exist?(file_path)
 
     require file_path.chomp('.rb')
     rescued_const_get(name)

data/lib/mustache/context.rb

@@ -51,12 +51,12 @@ class Mustache
 
     # Allows customization of how Mustache escapes things.
     #
-    # @param [String] str String to escape.
+    # @param [Object] value Value to escape.
     #
-    # @return [String] Escaped HTML string.
+    # @return [String] Escaped string.
     #
-    def escapeHTML(str)
-      mustache_in_stack.escapeHTML(str)
+    def escape(value)
+      mustache_in_stack.escape(value)
     end
 
     # Adds a new object to the context's internal stack.

data/lib/mustache/generator.rb

@@ -133,7 +133,7 @@ class Mustache
       when Proc
         #{proc_handling}
       when Array, Enumerator, Mustache::Enumerable
-        v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join
+        v.map { |_| ctx.push(_); r = #{code}; ctx.pop; r }.join
       else
         ctx.push(v); r = #{code}; ctx.pop; r
       end
@@ -182,7 +182,7 @@ class Mustache
         if v.is_a?(Proc)
           v = #{@option_static_lambdas ? 'v.call' : 'Mustache::Template.new(v.call.to_s).render(ctx.dup)'}
         end
-        ctx.escapeHTML(v.to_s)
+        ctx.escape(v)
       compiled
     end
 

data/lib/mustache/parser.rb

@@ -323,12 +323,14 @@ EOF
 
     def scan_tag_close content, fetch, padding, pre_match_position
       section, pos, result = @sections.pop
+      if section.nil?
+        error "Closing unopened #{content.inspect}"
+      end
+
       raw = @scanner.pre_match[pos[3]...pre_match_position] + padding
       (@result = result).last << raw << [self.otag, self.ctag]
 
-      if section.nil?
-        error "Closing unopened #{content.inspect}"
-      elsif section != content
+      if section != content
         error "Unclosed section #{section.inspect}", pos
       end
     end

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/man/mustache.1.html

@@ -102,7 +102,7 @@ names: [ {name: chris}, {name: mark}, {name: scott} ]
 should work fine.</p>
 
 <p>After the frontmatter should come any valid Mustache template. See
-<a class="man-ref" href="mustache.5.ron.html">mustache<span class="s">(5)</span></a> for an overview of Mustache templates.</p>
+<a class="man-ref" href="mustache.5.ronn.html">mustache<span class="s">(5)</span></a> for an overview of Mustache templates.</p>
 
 <p>For example:</p>
 
@@ -198,7 +198,7 @@ data
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a class="man-ref" href="mustache.5.ron.html">mustache<span class="s">(5)</span></a>, <span class="man-ref">gem<span class="s">(1)</span></span>,
+<p><a class="man-ref" href="mustache.5.ronn.html">mustache<span class="s">(5)</span></a>, <span class="man-ref">gem<span class="s">(1)</span></span>,
 <a href="http://mustache.github.io/" data-bare-link="true">http://mustache.github.io/</a></p>
 
 

data/man/mustache.5.html

@@ -409,7 +409,7 @@ markup."</p>
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a class="man-ref" href="mustache.1.ron.html">mustache<span class="s">(1)</span></a>,
+<p><a class="man-ref" href="mustache.1.ronn.html">mustache<span class="s">(1)</span></a>,
 <a href="http://mustache.github.io/" data-bare-link="true">http://mustache.github.io/</a></p>
 
 

data/man/mustache.5.ron

@@ -310,7 +310,7 @@ markup."
 
 Custom delimiters may not contain whitespace or the equals sign.
 
-[ct]: http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html
+[ct]: http://goog-ctemplate.sourceforge.net/doc/howto.html
 
 
 ## COPYRIGHT

data/test/mustache_test.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require_relative 'helper'
+require 'json'
 
 class MustacheTest < Minitest::Test
   def test_instance_render
@@ -659,7 +660,7 @@ template
     assert_equal('[ 0 1 2 3 4 5 6 7 8 9 10 ]', MethodMissing.render)
   end
 
-  def test_custom_escaping
+  def test_custom_html_escaping
     view = Class.new(Mustache) do
       def escapeHTML(str)
         "pong"
@@ -670,6 +671,17 @@ template
     assert_equal 'nothing', Mustache.render("{{thing}}", :thing => "nothing")
   end
 
+  def test_custom_escaping
+    view = Class.new(Mustache) do
+      def escape(str)
+        JSON.dump(str)
+      end
+    end
+
+    assert_equal '{ "key": "a\"b" }', view.render('{ "key": {{thing}} }', :thing => 'a"b')
+    assert_equal 'nothing', Mustache.render("{{thing}}", :thing => "nothing")
+  end
+
   def test_implicit_iterator
     view = Mustache.new
     view.template = "{{#people}}* {{.}}\n{{/people}}"

data/test/parser_test.rb

@@ -94,4 +94,68 @@ EOF
 
     assert_equal expected, tokens
   end
+
+  def test_unclosed_section
+    lexer = Mustache::Parser.new
+    exception = assert_raises Mustache::Parser::SyntaxError do
+      lexer.compile("{{#list}}")
+    end
+
+    expected = <<-EOF
+Unclosed section "list"
+  Line 1
+    {{#list}}
+          ^
+EOF
+
+    assert_equal expected, exception.message
+  end
+
+  def test_closing_unopened
+    lexer = Mustache::Parser.new
+    exception = assert_raises Mustache::Parser::SyntaxError do
+      lexer.compile("{{/list}}")
+    end
+
+    expected = <<-EOF
+Closing unopened "list"
+  Line 1
+    {{/list}}
+          ^
+EOF
+
+    assert_equal expected, exception.message
+  end
+
+  def test_unclosed_tag
+    lexer = Mustache::Parser.new
+    exception = assert_raises Mustache::Parser::SyntaxError do
+      lexer.compile("{{list")
+    end
+
+    expected = <<-EOF
+Unclosed tag
+  Line 1
+    {{list
+         ^
+EOF
+
+    assert_equal expected, exception.message
+  end
+
+  def test_illegal_content
+    lexer = Mustache::Parser.new
+    exception = assert_raises Mustache::Parser::SyntaxError do
+      lexer.compile("{{")
+    end
+
+    expected = <<-EOF
+Illegal content in tag
+  Line 1
+    {{
+     ^
+EOF
+
+    assert_equal expected, exception.message
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustache
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2018-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Mustache is a framework-agnostic way to render logic-free views.