mustache 1.0.5 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf94eeecd19f735037d7bbb26dec6b31fd744220
-  data.tar.gz: 1950b718fced739f53562898d3577a10ca88cdbf
+SHA256:
+  metadata.gz: bfcec948b9e5fbd73d9c72e3ade21724d3fd73a1d2ee2ea58ab26bf7e1a341ba
+  data.tar.gz: 1a5d4d062ad29d4a4057a6489f6779d3e61bb7132ecf56fc1ab97a48bfcb926d
 SHA512:
-  metadata.gz: 2aa2853641590267b49b7264f8592fed44f3fa430ea10e60ae3ce8b58a5fadea3b532f256b70229a0fbd62835176ead87b8dff0d66ac73750af603c9739e6587
-  data.tar.gz: 31a31d089046ab7d11b6541a02b588d92c26a6b5879185203ddc4ffedd64a41cc6b0651b818066333ee9af4000754a8f1d3885b5647895390ebe3e62d65532ae
+  metadata.gz: afd9888e324611b31fb9a6ac809393b2c42261befce363ab691d68719edb2687dda2129ba64a12367bd0f39d31b1fda861b209345f2abfc06debf67aa0e3ab99
+  data.tar.gz: c225773518109b0eeeecaf89d39faaec30b951361b10c16944f4e016aec6597fc41e75237920dc8c44e00956a00edfcf1b72f2e914ea4dc3f8b296f2436977dc

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/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/settings.rb

@@ -2,6 +2,30 @@
 # view class, or a single Mustache instance.
 class Mustache
 
+  def initialize_settings
+    @template = nil
+    @template_path = nil
+    @template_extension = nil
+    @template_name = nil
+    @template_file = nil
+    @raise_on_context_miss = nil
+  end
+
+  def self.initialize_settings
+    @template = nil
+    @template_path = nil
+    @template_extension = nil
+    @template_name = nil
+    @template_file = nil
+    @raise_on_context_miss = nil
+  end
+
+  initialize_settings
+
+  def self.inherited(subclass)
+    subclass.initialize_settings
+  end
+
   #
   # Template Path
   #

data/lib/mustache/version.rb

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

data/lib/mustache.rb

@@ -74,10 +74,19 @@ require 'mustache/utils'
 #
 class Mustache
 
-  # Initialize a new mustache instance.
+  # Initialize a new Mustache instance.
+  #
   # @param [Hash] options An options hash
+  # @option options [String] template_path 
+  # @option options [String] template_extension
+  # @option options [String] template_file
+  # @option options [String] template
+  # @option options [String] view_namespace 
+  # @option options [String] view_path
   def initialize(options = {})
     @options = options
+    
+    initialize_settings
   end
 
   # Instantiates an instance of this class and calls `render` with
@@ -91,19 +100,18 @@ class Mustache
   # Parses our fancy pants template file and returns normal file with
   # all special {{tags}} and {{#sections}}replaced{{/sections}}.
   #
-  # Examples
-  #
-  #     @view.render("Hi {{thing}}!", :thing => :world)
+  # @example Render view
+  #   @view.render("Hi {{thing}}!", :thing => :world)
   #
-  #     View.template = "Hi {{thing}}!"
-  #     @view = View.new
-  #     @view.render(:thing => :world)
+  # @example Set view template and then render
+  #   View.template = "Hi {{thing}}!"
+  #   @view = View.new
+  #   @view.render(:thing => :world)
   #
   # @param [String,Hash] data A String template or a Hash context.
   #                           If a Hash is given, we'll try to figure
   #                           out the template from the class.
   # @param [Hash] ctx A Hash context if `data` is a String template.
-  #
   # @return [String] Returns a rendered version of a template.
   def render(data = template, ctx = {})
     case data
@@ -134,11 +142,11 @@ class Mustache
 
   # Context accessors.
   #
-  # Example:
-  #     view = Mustache.new
-  #     view[:name] = "Jon"
-  #     view.template = "Hi, {{name}}!"
-  #     view.render # => "Hi, Jon!"
+  # @example Context accessors
+  #   view = Mustache.new
+  #   view[:name] = "Jon"
+  #   view.template = "Hi, {{name}}!"
+  #   view.render # => "Hi, Jon!"
   def [](key)
     context[key.to_sym]
   end
@@ -190,17 +198,36 @@ 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
   #
-  # Example:
+  # @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 Overriding #escapeHTML
   #   class PersonView < Mustache
   #     def escapeHTML(str)
   #       my_html_escape_method(str)
   #     end
   #   end
   #
-  # @param [String] str String to escape.
+  # @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.
   def escapeHTML(str)
     CGI.escapeHTML(str)
@@ -217,7 +244,8 @@ class Mustache
 
   # When given a symbol or string representing a class, will try to produce an
   # appropriate view class.
-  # e.g.
+  #
+  # @example
   #   Mustache.view_namespace = Hurl::Views
   #   Mustache.view_class(:Partial) # => Hurl::Views::Partial
   def self.view_class(name)
@@ -244,7 +272,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)
@@ -263,7 +291,7 @@ class Mustache
     Mustache::Utils::String.new(underscored).classify
   end
 
-  #   TemplatePartial => template_partial
+  # TemplatePartial => template_partial
   # Template::Partial => template/partial
   # Takes a string but defaults to using the current class' name.
   def self.underscore(classified = name)

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}}"
@@ -820,6 +832,7 @@ template
   def test_instance_with_initialize_render
     klass = Class.new(Mustache) do
       def initialize(name)
+        super
         @name = name
       end
       attr_reader :name

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.1
 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: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mustache is a framework-agnostic way to render logic-free views.