mustache 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2E0NDQ2MDc0ZDI0ZWM1NGU2N2M4MTdlMTAxOTkyY2JkZDYzOWE3Yw==
+    NTQ2NzA3NTY3ZTQ4MzNkNWY1MzU4MjBlZjgwZmNiZDg3NjA5OTU4NQ==
   data.tar.gz: !binary |-
-    NzFlMjg3YmFjNWY5NTY4MmQ2NmQ3OTkyNjgxYTQyYWEzY2VlN2Q0Mw==
+    MGYwNTg4YTNlMGIzMDFlM2RlZWRlYjgxOWVkYzVmMjBkYTY0NjJlMg==
 SHA512:
   metadata.gz: !binary |-
-    YTM2ZTgwMzEzOWY2MjFhY2FkMGQ5OWY5NWY3OWRhNjQ2YmUyNTc1ZDdhNGZl
-    MWU3OWQ4ZjE1ZmExZWY3Nzg5Y2E3N2ZkMmEyZWE0ZWZmYmQwNmM5YjMwOGQy
-    ZjA5MTUxMzkxMTZjMWFmNGY3YmY5YmMwOGY0ZGFlYTViOGE1ZjI=
+    ZDZkYjBjYmJlN2E3ZTg0ODliZDM0MTAwM2Q5YTQ4OTU4YmRhZDQwMzZjMWU2
+    ODk0MDY3NTliYjM2NGI1OGUzMzZiNDkzNzA4NjEzNWJhMGRhZGFiZmUwYjJj
+    ODYzNjY3MWU0MDg2NjUzMzdkYTcwZGZhOTk4NWQ1MWZhYzBlNGQ=
   data.tar.gz: !binary |-
-    NzAwNzI4YjUzNzM5MDY1OGQ5YzZjMGVlMDAxZjg0NWVmMmRjZjg5MWY5OGU5
-    OTI2YWY0NmVjZTEzZGNkNGMwYWQ3ZGIzNmVmOGNhYjY2MmYyYmFjYWM4MDkx
-    ZjQ3YjY5ODM2ZmUwNGVkZjQyODI0OWUyZGI1OGUwNzkxYjM0MmY=
+    NDA2ZDRiNjRlYTg3MjRkZjhmNWFjZDAyMjY3YzU1YzM0NTU4MWNlMzkzMmI0
+    MjAxMjAxOWYyNDdmYWE5MzEwODYzYzExZjBmM2VkN2E3YzdmODYxNGI2NTc3
+    N2U3ZGExOTcxMmE3MDBmMTdmMWI1YmUzNmE4YTFlMTdiMjQwNmM=

data/README.md

@@ -379,15 +379,15 @@ or IRC:
 * Home: <http://mustache.github.io>
 * Bugs: <https://github.com/mustache/mustache/issues>
 * List: <mustache@librelist.com>
-* Gems: <http://rubygems.org/gems/mustache>
+* Gems: <https://rubygems.org/gems/mustache>
 
-[1]: http://code.google.com/p/google-ctemplate/
+[1]: https://github.com/olafvdspek/ctemplate
 [2]: http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html
 [3]: http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html
 [4]: https://github.com/brynary/rack-bug/
 [5]: http://img.skitch.com/20091027-n8pxwwx8r61tc318a15q1n6m14.png
-[fk]: http://help.github.com/forking/
-[is]: https://github.com/defunkt/mustache/issues
+[fk]: https://help.github.com/forking/
+[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

data/bin/mustache

@@ -11,7 +11,7 @@ class Mustache
     # Return a structure describing the options.
     def self.parse_options(args)
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: mustache [-c] [-t] [-r library] FILE ..."
+        opts.banner = "Usage: mustache [-c] [-t] [-e] [-r library] FILE ..."
 
         opts.separator " "
 
@@ -42,6 +42,11 @@ class Mustache
           exit
         end
 
+        opts.on("-e", "--error",
+          "Raise an error on context misses.") do |e|
+          Mustache.raise_on_context_miss = true
+        end
+
         opts.on('-r', '--require LIB', 'Require a Ruby library before running.') do |lib|
           require lib
         end

data/lib/mustache/context.rb

@@ -97,7 +97,7 @@ class Mustache
     # Do we know about a particular key? In other words, will calling
     # `context[key]` give us a result that was set. Basically.
     def has_key?(key)
-      !!fetch(key, false)
+      fetch(key, false)
     rescue ContextMiss
       false
     end
@@ -114,7 +114,7 @@ class Mustache
         next if frame == self
 
         value = find(frame, name, :__missing)
-        return value if value != :__missing
+        return value if :__missing != value
       end
 
       if default == :__raise || mustache_in_stack.raise_on_context_miss?
@@ -138,8 +138,11 @@ class Mustache
     def find(obj, key, default = nil)
       return find_in_hash(obj.to_hash, key, default) if obj.respond_to?(:to_hash)
 
-      key = to_tag(key)
-      return default unless obj.respond_to?(key)
+      unless obj.respond_to?(key)
+        # no match for the key, but it may include a hyphen, so try again replacing hyphens with underscores.
+        key = key.to_s.tr('-', '_')
+        return default unless obj.respond_to?(key)
+      end
 
       meth = obj.method(key) rescue proc { obj.send(key) }
       meth.arity == 1 ? meth.to_proc : meth.call
@@ -152,18 +155,18 @@ class Mustache
 
     private
 
-
-    # If a class, we need to find tags (methods) per Parser::ALLOWED_CONTENT.
-    def to_tag key
-      key.to_s.include?('-') ? key.to_s.tr('-', '_') : key
-    end
-
     # Fetches a hash key if it exists, or returns the given default.
     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)
 
-      obj.fetch(key, default)
+      # 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
+      if :__missing != default && mustache_in_stack.raise_on_context_miss?
+        raise ContextMiss.new("Can't find #{key} in #{obj}")
+      else
+        obj.fetch(key, default)
+      end
     end
   end
 end

data/lib/mustache/generator.rb

@@ -113,7 +113,7 @@ class Mustache
         elsif v.is_a?(Proc)
           t = Mustache::Template.new(v.call(#{raw.inspect}).to_s)
           def t.tokens(src=@source)
-            p = Parser.new
+            p = Mustache::Parser.new
             p.otag, p.ctag = #{delims.inspect}
             p.compile(src)
           end

data/lib/mustache/parser.rb

@@ -121,7 +121,7 @@ EOF
         scan_tags || scan_text
       end
 
-      if !@sections.empty?
+      unless @sections.empty?
         # We have parsed the whole file, but there's still opened sections.
         type, pos, _ = @sections.pop
         error "Unclosed section #{type.inspect}", pos

data/lib/mustache/template.rb

@@ -110,9 +110,6 @@ class Mustache
     end
 
 
-    private
-
-
     # Simple recursive iterator for tokens
     def self.recursor(toks, section, &block)
       toks.map do |token|

data/lib/mustache/version.rb

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

data/test/fixtures/liberal.mustache

@@ -1 +1 @@
-{{first-name}} {{middle_name!}} {{lastName?}}
+{{first-name}} {{middle_name!}} {{lastName?}} {{street-address}}

data/test/fixtures/liberal.rb

@@ -14,6 +14,10 @@ class Liberal < Mustache
   def lastName?
     'sheurs'
   end
+
+  define_method :'street-address' do
+    '123 Somewhere St'
+  end
 end
 
 if $0 == __FILE__

data/test/mustache_test.rb

@@ -430,6 +430,29 @@ Benvolio is 15
     end
   end
 
+  def test_not_found_deep_in_context_raises_when_asked_to
+    instance = Mustache.new
+    instance.raise_on_context_miss = true
+
+    instance[:list] = { :item => { :value => 1234 } }
+
+    instance.template = '{{list.item.no_value}}'
+
+    assert_raises Mustache::ContextMiss do
+      instance.render
+    end
+  end
+
+  def test_found_in_nested_context_when_asked_to_raise
+    instance = Mustache.new
+    instance.raise_on_context_miss = true
+
+    instance[:item] = { :list => [ { :value => 1235, :deep_list => [{:x => 'y'}]}] }
+
+    instance.template = '{{#item.list}}{{#deep_list}}{{value}}{{/deep_list}}{{/item.list}}'
+    assert_equal '1235', instance.render
+  end
+
   def test_knows_when_its_been_compiled_when_set_with_string
     klass = Class.new(Mustache)
 
@@ -518,7 +541,7 @@ Benvolio is 15
 
   def test_liberal_tag_names_in_class
     assert_equal <<-end_liberal, Liberal.render
-kevin j sheurs
+kevin j sheurs 123 Somewhere St
 end_liberal
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustache
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mustache is a framework-agnostic way to render logic-free views.