mustache 1.0.3 → 1.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTQ2NzA3NTY3ZTQ4MzNkNWY1MzU4MjBlZjgwZmNiZDg3NjA5OTU4NQ==
-  data.tar.gz: !binary |-
-    MGYwNTg4YTNlMGIzMDFlM2RlZWRlYjgxOWVkYzVmMjBkYTY0NjJlMg==
+SHA1:
+  metadata.gz: bf94eeecd19f735037d7bbb26dec6b31fd744220
+  data.tar.gz: 1950b718fced739f53562898d3577a10ca88cdbf
 SHA512:
-  metadata.gz: !binary |-
-    ZDZkYjBjYmJlN2E3ZTg0ODliZDM0MTAwM2Q5YTQ4OTU4YmRhZDQwMzZjMWU2
-    ODk0MDY3NTliYjM2NGI1OGUzMzZiNDkzNzA4NjEzNWJhMGRhZGFiZmUwYjJj
-    ODYzNjY3MWU0MDg2NjUzMzdkYTcwZGZhOTk4NWQ1MWZhYzBlNGQ=
-  data.tar.gz: !binary |-
-    NDA2ZDRiNjRlYTg3MjRkZjhmNWFjZDAyMjY3YzU1YzM0NTU4MWNlMzkzMmI0
-    MjAxMjAxOWYyNDdmYWE5MzEwODYzYzExZjBmM2VkN2E3YzdmODYxNGI2NTc3
-    N2U3ZGExOTcxMmE3MDBmMTdmMWI1YmUzNmE4YTFlMTdiMjQwNmM=
+  metadata.gz: 2aa2853641590267b49b7264f8592fed44f3fa430ea10e60ae3ce8b58a5fadea3b532f256b70229a0fbd62835176ead87b8dff0d66ac73750af603c9739e6587
+  data.tar.gz: 31a31d089046ab7d11b6541a02b588d92c26a6b5879185203ddc4ffedd64a41cc6b0651b818066333ee9af4000754a8f1d3885b5647895390ebe3e62d65532ae

data/README.md

@@ -44,10 +44,12 @@ in my HTML, or putting JavaScript in my HTML.
 Install the gem locally with:
 
     $ gem install mustache
-    
-Or add it to your `gemspec`:
 
-    s.add_dependency "mustache", "~> 1.0"
+Or add it to your `Gemfile`:
+
+```ruby
+gem "mustache", "~> 1.0"
+```
 
 
 ## Usage
@@ -56,28 +58,30 @@ Quick example:
 
     >> require 'mustache'
     => true
-    >> Mustache.render("Hello {{planet}}", :planet => "World!")
+    >> Mustache.render("Hello {{planet}}", planet: "World!")
     => "Hello World!"
 
 We've got an `examples` folder but here's the canonical one:
 
-    class Simple < Mustache
-      def name
-        "Chris"
-      end
+```ruby
+class Simple < Mustache
+  def name
+    "Chris"
+  end
 
-      def value
-        10_000
-      end
+  def value
+    10_000
+  end
 
-      def taxed_value
-        value * 0.6
-      end
+  def taxed_value
+    value * 0.6
+  end
 
-      def in_ca
-        true
-      end
-    end
+  def in_ca
+    true
+  end
+end
+```
 
 We simply create a normal Ruby class and define methods. Some methods
 reference others, some return values, some return only booleans.
@@ -92,9 +96,9 @@ Now let's write the template:
 
 This template references our view methods. To bring it all together,
 here's the code to render actual HTML;
-
-    Simple.render
-
+```ruby
+Simple.render
+```
 Which returns the following:
 
     Hello Chris
@@ -114,7 +118,7 @@ the `mustache(5)` manpage or
 ## Escaping
 
 Mustache does escape all values when using the standard double
-Mustache syntax. Characters which will be escaped: `& \ " < >` (as 
+Mustache syntax. Characters which will be escaped: `& \ " < >` (as
 well as `'` in Ruby `>= 2.0`). To disable escaping, simply use triple
 mustaches like `{{{unescaped_variable}}}`.
 
@@ -136,11 +140,12 @@ Given this template (winner.mustache):
 
 We can fill in the values at will:
 
-    view = Winner.new
-    view[:name] = 'George'
-    view[:value] = 100
-    view.render
-
+```ruby
+view = Winner.new
+view[:name] = 'George'
+view[:value] = 100
+view.render
+```
 Which returns:
 
     Hello George
@@ -148,11 +153,10 @@ Which returns:
 
 We can re-use the same object, too:
 
-    view[:name] = 'Tony'
-    view.render
-    Hello Tony
-    You have just won 100 bucks!
-
+```ruby
+view[:name] = 'Tony'
+view.render # => Hello Tony\nYou have just won 100 bucks!
+```
 
 ## Templates
 
@@ -165,33 +169,38 @@ follows the classic Ruby naming convention.
 You can set the search path using `Mustache.template_path`. It can be set on a
 class by class basis:
 
-    class Simple < Mustache
-      self.template_path = File.dirname(__FILE__)
-      ... etc ...
-    end
-
+```ruby
+class Simple < Mustache
+  self.template_path = __dir__
+end
+```
 Now `Simple` will look for `simple.mustache` in the directory it resides
 in, no matter the cwd.
 
 If you want to just change what template is used you can set
 `Mustache.template_file` directly:
 
-    Simple.template_file = './blah.mustache'
-
+```ruby
+Simple.template_file = './blah.mustache'
+```
 Mustache also allows you to define the extension it'll use.
 
-    Simple.template_extension = 'xml'
-
+```ruby
+Simple.template_extension = 'xml'
+```
 Given all other defaults, the above line will cause Mustache to look
 for './blah.xml'
 
 Feel free to set the template directly:
 
-    Simple.template = 'Hi {{person}}!'
+```ruby
+Simple.template = 'Hi {{person}}!'
+```
 
 Or set a different template for a single instance:
-
-    Simple.new.template = 'Hi {{person}}!'
+```ruby
+Simple.new.template = 'Hi {{person}}!'
+```
 
 Whatever works.
 
@@ -211,46 +220,50 @@ you want to use in all your views? No problem.
 
 This is just Ruby, after all.
 
-    module ViewHelpers
-      def gravatar
-        gravatar_id = Digest::MD5.hexdigest(self[:email].to_s.strip.downcase)
-        gravatar_for_id(gravatar_id)
-      end
+```ruby
+module ViewHelpers
+  def gravatar
+    gravatar_id = Digest::MD5.hexdigest(self[:email].to_s.strip.downcase)
+    gravatar_for_id(gravatar_id)
+  end
 
-      def gravatar_for_id(gid, size = 30)
-        "#{gravatar_host}/avatar/#{gid}?s=#{size}"
-      end
+  def gravatar_for_id(gid, size = 30)
+    "#{gravatar_host}/avatar/#{gid}?s=#{size}"
+  end
 
-      def gravatar_host
-        @ssl ? 'https://secure.gravatar.com' : 'http://www.gravatar.com'
-      end
-    end
+  def gravatar_host
+    @ssl ? 'https://secure.gravatar.com' : 'http://www.gravatar.com'
+  end
+end
+```
 
 Then just include it:
 
-    class Simple < Mustache
-      include ViewHelpers
+```ruby
+class Simple < Mustache
+  include ViewHelpers
 
-      def name
-        "Chris"
-      end
+  def name
+    "Chris"
+  end
 
-      def value
-        10_000
-      end
+  def value
+    10_000
+  end
 
-      def taxed_value
-        value * 0.6
-      end
+  def taxed_value
+    value * 0.6
+  end
 
-      def in_ca
-        true
-      end
+  def in_ca
+    true
+  end
 
-      def users
-        User.all
-      end
-    end
+  def users
+    User.all
+  end
+end
+```
 
 Great, but what about that `@ssl` ivar in `gravatar_host`? There are
 many ways we can go about setting it.
@@ -259,19 +272,21 @@ Here's an example which illustrates a key feature of Mustache: you
 are free to use the `initialize` method just as you would in any
 normal class.
 
-    class Simple < Mustache
-      include ViewHelpers
-
-      def initialize(ssl = false)
-        @ssl = ssl
-      end
+```ruby
+class Simple < Mustache
+  include ViewHelpers
 
-      ... etc ...
-    end
+  def initialize(ssl = false)
+    @ssl = ssl
+  end
+end
+```
 
 Now:
 
-    Simple.new(request.ssl?).render
+```ruby
+Simple.new(request.ssl?).render
+```
 
 Finally, our template might look like this:
 
@@ -286,7 +301,7 @@ Finally, our template might look like this:
 
 ### Sinatra
 
-Sinatra integration is available with the 
+Sinatra integration is available with the
 [mustache-sinatra gem](https://github.com/mustache/mustache-sinatra).
 
 An example Sinatra application is also provided:
@@ -305,13 +320,17 @@ contained in a hash set using `set :mustache, hash`.
 Mustache also provides a `Rack::Bug` panel.
 First you have to install the `rack-bug-mustache_panel` gem, then in your `config.ru` add  the following code:
 
-    require 'rack/bug/panels/mustache_panel'
-    use Rack::Bug::MustachePanel
+```ruby
+require 'rack/bug/panels/mustache_panel'
+use Rack::Bug::MustachePanel
+```
 
 Using Rails? Add this to your initializer or environment file:
 
-    require 'rack/bug/panels/mustache_panel'
-    config.middleware.use "Rack::Bug::MustachePanel"
+```ruby
+require 'rack/bug/panels/mustache_panel'
+config.middleware.use "Rack::Bug::MustachePanel"
+```
 
 ![Rack::Bug][5]
 
@@ -390,6 +409,6 @@ or IRC:
 [is]: https://github.com/mustache/mustache/issues
 [irc]: irc://irc.freenode.net/#{
 [vim]: https://github.com/mustache/vim-mustache-handlebars
-[emacs]: https://github.com/mustache/vim-mustache-handlebars
+[emacs]: https://github.com/mustache/emacs
 [tmbundle]: https://github.com/defunkt/Mustache.tmbundle
 [diff]: https://gist.github.com/defunkt/345490

data/lib/mustache.rb

@@ -74,6 +74,12 @@ require 'mustache/utils'
 #
 class Mustache
 
+  # Initialize a new mustache instance.
+  # @param [Hash] options An options hash
+  def initialize(options = {})
+    @options = options
+  end
+
   # Instantiates an instance of this class and calls `render` with
   # the passed args.
   #
@@ -266,13 +272,16 @@ class Mustache
     Mustache::Utils::String.new(classified).underscore(view_namespace)
   end
 
-  # @param [Template,String] obj Turns `obj` into a template
-  def self.templateify(obj)
-    obj.is_a?(Template) ? obj : Template.new(obj)
+  # @param [Template,String] obj      Turns `obj` into a template
+  # @param [Hash]            options  Options for template creation
+  def self.templateify(obj, options = {})
+    obj.is_a?(Template) ? obj : Template.new(obj, options)
   end
 
   def templateify(obj)
-    self.class.templateify(obj)
+    opts = {:partial_resolver => self.method(:partial)}
+    opts.merge!(@options) if @options.is_a?(Hash)
+    self.class.templateify(obj, opts)
   end
 
   # Return the value of the configuration setting on the superclass, or return

data/lib/mustache/context.rb

@@ -159,6 +159,7 @@ class Mustache
     def find_in_hash(obj, key, default)
       return obj[key]      if obj.has_key?(key)
       return obj[key.to_s] if obj.has_key?(key.to_s)
+      return obj[key]      if obj.respond_to?(:default_proc) && obj.default_proc && obj[key]
 
       # If default is :__missing then we are from #fetch which is hunting through the stack
       # If default is nil then we are reducing dot notation

data/lib/mustache/generator.rb

@@ -27,9 +27,10 @@ class Mustache
   #   $ mustache --compile test.mustache
   #   "Hi #{CGI.escapeHTML(ctx[:thing].to_s)}!\n"
   class Generator
-    # Options are unused for now but may become useful in the future.
+    # Options can be used to manipulate the resulting ruby code string behavior.
     def initialize(options = {})
       @options = options
+      @option_static_lambdas = options[:static_lambdas] == true
     end
 
     # Given an array of tokens, returns an interpolatable Ruby string.
@@ -104,13 +105,14 @@ class Mustache
       # string we can use.
       code = compile(content)
 
-      # Compile the Ruby for this section now that we know what's
-      # inside the section.
-      ev(<<-compiled)
-      if v = #{compile!(name)}
-        if v == true
-          #{code}
-        elsif v.is_a?(Proc)
+      # Lambda handling - default handling is to dynamically interpret
+      # the returned lambda result as mustache source
+      proc_handling = if @option_static_lambdas
+        <<-compiled
+          v.call(lambda {|v| #{code}}.call(v)).to_s
+        compiled
+      else
+        <<-compiled
           t = Mustache::Template.new(v.call(#{raw.inspect}).to_s)
           def t.tokens(src=@source)
             p = Mustache::Parser.new
@@ -118,12 +120,22 @@ class Mustache
             p.compile(src)
           end
           t.render(ctx.dup)
-        else
-          # Shortcut when passed non-array
-          v = [v] unless v.is_a?(Array) || v.is_a?(Mustache::Enumerable) || defined?(Enumerator) && v.is_a?(Enumerator)
+        compiled
+      end
 
-          v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join
-        end
+      # Compile the Ruby for this section now that we know what's
+      # inside the section.
+      ev(<<-compiled)
+      case v = #{compile!(name)}
+      when NilClass, FalseClass
+      when TrueClass
+        #{code}
+      when Proc
+        #{proc_handling}
+      when Array, Enumerator, Mustache::Enumerable
+        v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join
+      else
+        ctx.push(v); r = #{code}; ctx.pop; r
       end
       compiled
     end
@@ -157,7 +169,7 @@ class Mustache
       ev(<<-compiled)
         v = #{compile!(name)}
         if v.is_a?(Proc)
-          v = Mustache::Template.new(v.call.to_s).render(ctx.dup)
+          v = #{@option_static_lambdas ? 'v.call' : 'Mustache::Template.new(v.call.to_s).render(ctx.dup)'}
         end
         v.to_s
       compiled
@@ -168,7 +180,7 @@ class Mustache
       ev(<<-compiled)
         v = #{compile!(name)}
         if v.is_a?(Proc)
-          v = Mustache::Template.new(v.call.to_s).render(ctx.dup)
+          v = #{@option_static_lambdas ? 'v.call' : 'Mustache::Template.new(v.call.to_s).render(ctx.dup)'}
         end
         ctx.escapeHTML(v.to_s)
       compiled
@@ -180,11 +192,15 @@ class Mustache
       names = names.map { |n| n.to_sym }
 
       initial, *rest = names
-      <<-compiled
-        #{rest.inspect}.reduce(ctx[#{initial.inspect}]) { |value, key|
-          value && ctx.find(value, key)
-        }
-      compiled
+      if rest.any?
+        <<-compiled
+          #{rest.inspect}.reduce(ctx[#{initial.inspect}]) { |value, key| value && ctx.find(value, key) }
+        compiled
+      else
+        <<-compiled
+          ctx[#{initial.inspect}]
+        compiled
+      end
     end
 
     # An interpolation-friendly version of a string, for use within a

data/lib/mustache/parser.rb

@@ -84,22 +84,35 @@ EOF
     # the rest only allow ALLOWED_CONTENT.
     ANY_CONTENT = [ '!', '=' ].map(&:freeze)
 
-    attr_writer :otag, :ctag
+    attr_reader :otag, :ctag
 
     # Accepts an options hash which does nothing but may be used in
     # the future.
     def initialize(options = {})
-      @options = {}
+      @options = options
+      @option_inline_partials_at_compile_time = options[:inline_partials_at_compile_time]
+      if @option_inline_partials_at_compile_time
+        @partial_resolver = options[:partial_resolver]
+        raise ArgumentError.new "Missing or invalid partial_resolver" unless @partial_resolver.respond_to? :call
+      end
+
+      # Initialize default tags
+      self.otag ||= '{{'
+      self.ctag ||= '}}'
     end
 
     # The opening tag delimiter. This may be changed at runtime.
-    def otag
-      @otag ||= '{{'
+    def otag=(value)
+      regex = regexp value
+      @otag_regex     = /([ \t]*)?#{regex}/
+      @otag_not_regex = /(^[ \t]*)?#{regex}/
+      @otag = value
     end
 
     # The closing tag delimiter. This too may be changed at runtime.
-    def ctag
-      @ctag ||= '}}'
+    def ctag=(value)
+      @ctag_regex = regexp value
+      @ctag = value
     end
 
     # Given a string template, returns an array of tokens.
@@ -134,9 +147,9 @@ EOF
     private
 
 
-    def content_tags type, current_ctag
+    def content_tags type, current_ctag_regex
       if ANY_CONTENT.include?(type)
-        r = /\s*#{regexp(type)}?#{regexp(current_ctag)}/
+        r = /\s*#{regexp(type)}?#{current_ctag_regex}/
         scan_until_exclusive(r)
       else
         @scanner.scan(ALLOWED_CONTENT)
@@ -147,8 +160,8 @@ EOF
       send("scan_tag_#{type}", content, fetch, padding, pre_match_position)
     end
 
-    def find_closing_tag scanner, current_ctag
-      error "Unclosed tag" unless scanner.scan(regexp(current_ctag))
+    def find_closing_tag scanner, current_ctag_regex
+      error "Unclosed tag" unless scanner.scan(current_ctag_regex)
     end
 
     # Find {{mustaches}} and add them to the @result array.
@@ -158,7 +171,7 @@ EOF
       pre_match_position = @scanner.pos
       last_index = @result.length
 
-      return unless @scanner.scan(/([ \t]*)?#{Regexp.escape(otag)}/)
+      return unless @scanner.scan @otag_regex
       padding = @scanner[1] || ''
 
       # Don't touch the preceding whitespace unless we're matching the start
@@ -171,13 +184,13 @@ EOF
 
       # Since {{= rewrites ctag, we store the ctag which should be used
       # when parsing this specific tag.
-      current_ctag = self.ctag
+      current_ctag_regex = @ctag_regex
       type = @scanner.scan(self.class.valid_types)
       @scanner.skip(/\s*/)
 
       # ANY_CONTENT tags allow any character inside of them, while
       # other tags (such as variables) are more strict.
-      content = content_tags(type, current_ctag)
+      content = content_tags(type, current_ctag_regex)
 
       # We found {{ but we can't figure out what's going on inside.
       error "Illegal content in tag" if content.empty?
@@ -196,7 +209,7 @@ EOF
       @scanner.skip(/\s+/)
       @scanner.skip(regexp(type)) if type
 
-      find_closing_tag(@scanner, current_ctag)
+      find_closing_tag(@scanner, current_ctag_regex)
 
       # If this tag was the only non-whitespace content on this line, strip
       # the remaining whitespace.  If not, but we've been hanging on to padding
@@ -218,7 +231,7 @@ EOF
 
     # Try to find static text, e.g. raw HTML with no {{mustaches}}.
     def scan_text
-      text = scan_until_exclusive(/(^[ \t]*)?#{Regexp.escape(otag)}/)
+      text = scan_until_exclusive @otag_not_regex
 
       if text.nil?
         # Couldn't find any otag, which means the rest is just static text.
@@ -263,7 +276,7 @@ EOF
     # Used to quickly convert a string into a regular expression
     # usable by the string scanner.
     def regexp(thing)
-      /#{Regexp.escape(thing)}/
+      Regexp.new Regexp.escape(thing) if thing
     end
 
     # Raises a SyntaxError. The message should be the name of the
@@ -334,7 +347,13 @@ EOF
 
 
     def scan_tag_open_partial content, fetch, padding, pre_match_position
-      @result << [:mustache, :partial, content, offset, padding]
+      @result << if @option_inline_partials_at_compile_time
+        partial = @partial_resolver.call content
+        partial.gsub!(/^/, padding) unless padding.empty?
+        self.class.new(@options).compile partial
+      else
+        [:mustache, :partial, content, offset, padding]
+      end
     end
     alias_method :'scan_tag_<', :scan_tag_open_partial
     alias_method :'scan_tag_>', :scan_tag_open_partial

data/lib/mustache/template.rb

@@ -18,9 +18,10 @@ class Mustache
     attr_reader :source
 
     # Expects a Mustache template as a string along with a template
-    # path, which it uses to find partials.
-    def initialize(source)
+    # path, which it uses to find partials. Options may be passed.
+    def initialize(source, options = {})
       @source = source
+      @options = options
     end
 
     # Renders the `@source` Mustache template using the given
@@ -46,7 +47,7 @@ class Mustache
     # Does the dirty work of transforming a Mustache template into an
     # interpolation-friendly Ruby string.
     def compile(src = @source)
-      Generator.new.compile(tokens(src))
+      Generator.new(@options).compile(tokens(src))
     end
     alias_method :to_s, :compile
 
@@ -55,7 +56,7 @@ class Mustache
     # @return [Array] Array of tokens.
     #
     def tokens(src = @source)
-      Parser.new.compile(src)
+      Parser.new(@options).compile(src)
     end
 
     # Returns an array of tags.

data/lib/mustache/version.rb

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

data/man/mustache.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "MUSTACHE" "1" "February 2015" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "1" "November 2016" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \- Mustache processor
@@ -75,7 +75,7 @@ $ cat template\.mustache
   Hi {{name}}!
 {{/names}}
 
-$ cat data\.yml template\.mustache | mustache
+$ mustache data\.yml template\.mustache
 Hi chris!
 Hi mark!
 Hi scott!
@@ -106,7 +106,7 @@ name: scott
 $ cat template\.mustache
 Hi {{name}}!
 
-$ cat data\.yml template\.mustache | mustache
+$ mustache data\.yml template\.mustache
 Hi chris!
 Hi mark!
 Hi scott!

data/man/mustache.1.html

@@ -123,7 +123,7 @@ $ cat template.mustache
   Hi {{name}}!
 {{/names}}
 
-$ cat data.yml template.mustache | mustache
+$ mustache data.yml template.mustache
 Hi chris!
 Hi mark!
 Hi scott!
@@ -146,7 +146,7 @@ name: scott
 $ cat template.mustache
 Hi {{name}}!
 
-$ cat data.yml template.mustache | mustache
+$ mustache data.yml template.mustache
 Hi chris!
 Hi mark!
 Hi scott!
@@ -204,7 +204,7 @@ data
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>February 2015</li>
+    <li class='tc'>November 2016</li>
     <li class='tr'>mustache(1)</li>
   </ol>
 

data/man/mustache.1.ron

@@ -48,7 +48,7 @@ Now let's combine them.
       Hi {{name}}!
     {{/names}}
 
-    $ cat data.yml template.mustache | mustache
+    $ mustache data.yml template.mustache
     Hi chris!
     Hi mark!
     Hi scott!
@@ -70,7 +70,7 @@ For example:
     $ cat template.mustache
     Hi {{name}}!
 
-    $ cat data.yml template.mustache | mustache
+    $ mustache data.yml template.mustache
     Hi chris!
     Hi mark!
     Hi scott!

data/man/mustache.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "MUSTACHE" "5" "February 2015" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "5" "November 2016" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \- Logic\-less templates\.

data/man/mustache.5.html

@@ -415,7 +415,7 @@ markup."</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>February 2015</li>
+    <li class='tc'>November 2016</li>
     <li class='tr'>mustache(5)</li>
   </ol>
 

data/test/helper.rb

@@ -1,7 +1,9 @@
-require 'minitest/autorun'
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/test/'
+end
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'minitest/autorun'
 
 Dir[File.dirname(__FILE__) + '/fixtures/*.rb'].each do |f|
   require f

data/test/mustache_test.rb

@@ -362,7 +362,7 @@ data
       end
 
       def each *args, &block
-        @people.each *args, &block
+        @people.each(*args, &block)
       end
     end
 
@@ -506,6 +506,24 @@ Benvolio is 15
     assert_equal 1, view.calls
   end
 
+  def test_sections_returning_lambdas_get_called_dynamically_with_text
+    view = Mustache.new
+    view.template       = '{{name}}'
+    view[:name]         = lambda { '{{dynamic_name}}' }
+    view[:dynamic_name] = 'Chris'
+
+    assert_equal "Chris", view.render.chomp
+  end
+
+  def test_sections_returning_lambdas_get_not_called_dynamically_with_text_if_static
+    view = Mustache.new :static_lambdas => true
+    view.template       = '{{name}}'
+    view[:name]         = lambda { '{{dynamic_name}}' }
+    view[:dynamic_name] = 'Chris'
+
+    assert_equal "{{dynamic_name}}", view.render.chomp
+  end
+
   def test_sections_which_refer_to_unary_method_call_them_as_proc
     kls = Class.new(Mustache) do
       def unary_method(arg)
@@ -706,6 +724,23 @@ text
     end
   end
 
+  def test_hash_default_proc
+    template = <<template
+{{greetings.Peter}}
+{{greetings.Paul}}
+{{greetings.Mary}}
+template
+    data = {
+      'greetings' => Hash.new { |hash, key| hash[key] = "Hello, #{key}!" }
+    }
+
+    assert_equal <<expected, Mustache.render(template, data)
+Hello, Peter!
+Hello, Paul!
+Hello, Mary!
+expected
+  end
+
   def test_array_of_arrays
     template = <<template
 {{#items}}
@@ -780,7 +815,17 @@ template
     template = '%%{{title}}%%'
 
     assert_equal '%%title%%', Mustache.render(template, hashlike)
-
   end
 
+  def test_instance_with_initialize_render
+    klass = Class.new(Mustache) do
+      def initialize(name)
+        @name = name
+      end
+      attr_reader :name
+    end
+
+    klass.template = "Hi {{name}}!"
+    assert_equal "Hi Dougal!", klass.new("Dougal").render
+  end
 end

data/test/partial_test.rb

@@ -20,6 +20,19 @@ end_partial
     assert_equal "Again, success!", view.render
   end
 
+  def test_partial_inlining
+    view = Mustache.new :inline_partials_at_compile_time => true
+    view.template = '{{> test/fixtures/inner_partial}}'
+    view[:title] = 'success'
+
+    # Test the rendered result first
+    assert_equal "Again, success!", view.render
+
+    # Now the template should be compiled.
+    # There should be no :partial instruction as the partial has been in-lined.
+    assert_equal false, view.template.tokens.flatten.include?(:partial)
+  end
+
   def test_view_partial_inherits_context
     klass = Class.new(TemplatePartial)
     view = klass.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustache
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -11,127 +11,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2017-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   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'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: ! 'Inspired by ctemplate, Mustache is a framework-agnostic way to render
-
+description: |
+  Inspired by ctemplate, Mustache is a framework-agnostic way to render
   logic-free views.
 
-
   As ctemplates says, "It emphasizes separating logic from presentation:
-
   it is impossible to embed application logic in this template
-
   language.
 
-
   Think of Mustache as a replacement for your views. Instead of views
-
   consisting of ERB or HAML with random helpers and arbitrary logic,
-
   your views are broken into two parts: a Ruby class and an HTML
-
   template.
-
-'
 email: rokusu@gmail.com
 executables:
 - mustache
@@ -219,17 +210,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Mustache is a framework-agnostic way to render logic-free views.