mustache 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a9a22c993556413f34a18b5f74023dbf1dfbdd92
-  data.tar.gz: 28b5ac5ef50228c3bc860762c6a70e546022dd3d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2MzZDViZWQ0ODY5NmZhYzc2NjdmZThkNWYzOWUxMjg1NDMzOWUwMw==
+  data.tar.gz: !binary |-
+    ZTY0MmE3MmU4M2RkM2RmNjg5N2Q5ZjBiNWRlZTZiN2UxY2ZhM2U0Zg==
 SHA512:
-  metadata.gz: 0dcaecf69cf26d4a540f5e47d862b5bb318114e74f9885a03f180c510ed5fcff53d91ba56d8a97bd6b45fa8e1272c761230f9fb71c76fca8dd3332a0e1a8e900
-  data.tar.gz: b1bb13fd0e318e55aa037616b86629a00fa3a2b54b350b93d4df738d9de816e9e145804da3519c145c49c2db142a5ff748b24c661d7133565da0ad3683d4c946
+  metadata.gz: !binary |-
+    YjYyMTdmOTgwMTQ3NGE3MjU1MGI3Nzg4Yzg2Mjk1YTJhY2UzNDZhNjVlMDBi
+    MmZiYTJjYzZmOTA4ZmEyN2VhNDAyNjA5ZmZkM2I4YWUyMGI5ZDQ5ZWVhMWRh
+    ODk3YTk0NDBhYzZkOGYyZDlhMjA1ODA2NWJmYmFlNjA3MTE2YzQ=
+  data.tar.gz: !binary |-
+    MGM4M2U2NDI4ZjRkZTU4ZTIzOTQwZjQ4MmMzZmE4NDczNDI4NTY2YzE3ZmNk
+    NDIzMWJlOWE5NDVmMzUwYWU0MjRiM2VjMTVhODllMTdhNGVkZjAwMTQ2NzAy
+    OWIwMGE2YWY3MjA4ZGIzZmZlZDZkNWI0YjJlMzc1NWEzZGY3NjY=

data/README.md

@@ -1,5 +1,7 @@
 # Mustache
 
+[![Join the chat at https://gitter.im/mustache/mustache](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mustache/mustache?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Inspired by [ctemplate][1] and [et][2], Mustache is a
 framework-agnostic way to render logic-free views.
 
@@ -283,10 +285,8 @@ Finally, our template might look like this:
 
 ### Sinatra
 
-Mustache provides Sinatra integration. Please see
-`lib/mustache/sinatra.rb` or
-<https://github.com/mustache/mustache/blob/master/lib/mustache/sinatra.rb>
-for complete documentation.
+Sinatra integration is available with the 
+[mustache-sinatra gem](https://github.com/mustache/mustache-sinatra).
 
 An example Sinatra application is also provided:
 <https://github.com/defunkt/mustache-sinatra-example>
@@ -388,4 +388,4 @@ You can also find us in #{ on [irc.freenode.net][irc].
 [vim]: https://github.com/mustache/vim-mustache-handlebars
 [emacs]: https://github.com/mustache/vim-mustache-handlebars
 [tmbundle]: https://github.com/defunkt/Mustache.tmbundle
-[diff]: https://gist.github.com/defunkt/345490
+[diff]: https://gist.github.com/defunkt/345490

data/bin/mustache

@@ -49,7 +49,7 @@ class Mustache
         opts.separator "Common Options:"
 
         opts.on("-v", "--version", "Print the version") do |v|
-          puts "Mustache v#{Mustache::Version}"
+          puts "Mustache v#{Mustache::VERSION}"
           exit
         end
 

data/lib/mustache.rb

@@ -2,6 +2,7 @@ require 'mustache/enumerable'
 require 'mustache/template'
 require 'mustache/context'
 require 'mustache/settings'
+require 'mustache/utils'
 
 # Mustache is the base class from which your Mustache subclasses
 # should inherit (though it can be used on its own).
@@ -165,14 +166,21 @@ class Mustache
   #
   # Call `render` if you need to process it.
   def self.partial(name)
-    File.read("#{template_path}/#{name}.#{template_extension}")
+    self.new.partial(name)
   end
 
   # Override this in your subclass if you want to do fun things like
   # reading templates from a database. It will be rendered by the
   # context, so all you need to do is return a string.
   def partial(name)
-    self.class.partial(name)
+    path = "#{template_path}/#{name}.#{template_extension}"
+
+    begin
+      File.read(path)
+    rescue
+      raise if raise_on_context_miss?
+      ""
+    end
   end
 
   # Override this to provide custom escaping.
@@ -246,12 +254,7 @@ class Mustache
   # template_partial => TemplatePartial
   # template/partial => Template::Partial
   def self.classify(underscored)
-    underscored.split('/').map do |namespace|
-      namespace.split(/[-_]/).map do |part|
-        part[0] = part.chars.first.upcase
-        part
-      end.join
-    end.join('::')
+    Mustache::Utils::String.new(underscored).classify
   end
 
   #   TemplatePartial => template_partial
@@ -260,12 +263,7 @@ class Mustache
   def self.underscore(classified = name)
     classified = superclass.name if classified.to_s.empty?
 
-    string = classified.dup.split("#{view_namespace}::").last
-
-    string.split('::').map do |part|
-      part[0] = part[0].downcase
-      part.gsub(/[A-Z]/) { |s| "_" << s.downcase }
-    end.join('/')
+    Mustache::Utils::String.new(classified).underscore(view_namespace)
   end
 
   # @param [Template,String] obj Turns `obj` into a template

data/lib/mustache/context.rb

@@ -41,7 +41,7 @@ class Mustache
     # @return [Mustache] First Mustache in the stack.
     #
     def mustache_in_stack
-      @stack.find { |frame| frame.is_a?(Mustache) }
+      @mustache_in_stack ||= @stack.find { |frame| frame.is_a?(Mustache) }
     end
 
     # Allows customization of how Mustache escapes things.
@@ -62,6 +62,7 @@ class Mustache
     #
     def push(new_obj)
       @stack.unshift(new_obj)
+      @mustache_in_stack = nil
       self
     end
 
@@ -72,6 +73,7 @@ class Mustache
     #
     def pop
       @stack.shift
+      @mustache_in_stack = nil
       self
     end
 
@@ -129,7 +131,7 @@ class Mustache
     # @return [Object] The value of key in object if it is found, and default otherwise.
     #
     def find(obj, key, default = nil)
-      return find_in_hash(obj, key, default) if obj.respond_to?(:to_hash)
+      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)
@@ -138,6 +140,10 @@ class Mustache
       meth.arity == 1 ? meth.to_proc : meth.call
     end
 
+    def current
+      @stack.first
+    end
+
 
     private
 
@@ -147,7 +153,8 @@ class Mustache
       key.to_s.include?('-') ? key.to_s.tr('-', '_') : key
     end
 
-    def find_in_hash obj, key, default
+    # 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)
 

data/lib/mustache/generator.rb

@@ -175,7 +175,7 @@ class Mustache
     end
 
     def on_fetch(names)
-      return "ctx[:to_s]" if names.empty?
+      return "ctx.current" if names.empty?
 
       names = names.map { |n| n.to_sym }
 

data/lib/mustache/parser.rb

@@ -84,7 +84,6 @@ EOF
     # the rest only allow ALLOWED_CONTENT.
     ANY_CONTENT = [ '!', '=' ].map(&:freeze)
 
-    attr_reader :scanner, :result
     attr_writer :otag, :ctag
 
     # Accepts an options hash which does nothing but may be used in
@@ -124,7 +123,7 @@ EOF
 
       if !@sections.empty?
         # We have parsed the whole file, but there's still opened sections.
-        type, pos, result = @sections.pop
+        type, pos, _ = @sections.pop
         error "Unclosed section #{type.inspect}", pos
       end
 
@@ -135,6 +134,23 @@ EOF
     private
 
 
+    def content_tags type, current_ctag
+      if ANY_CONTENT.include?(type)
+        r = /\s*#{regexp(type)}?#{regexp(current_ctag)}/
+        scan_until_exclusive(r)
+      else
+        @scanner.scan(ALLOWED_CONTENT)
+      end
+    end
+
+    def dispatch_based_on_type type, content, fetch, padding, pre_match_position
+      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))
+    end
+
     # Find {{mustaches}} and add them to the @result array.
     def scan_tags
       # Scan until we hit an opening delimiter.
@@ -161,12 +177,7 @@ EOF
 
       # ANY_CONTENT tags allow any character inside of them, while
       # other tags (such as variables) are more strict.
-      content = if ANY_CONTENT.include?(type)
-        r = /\s*#{regexp(type)}?#{regexp(current_ctag)}/
-        scan_until_exclusive(r)
-      else
-        @scanner.scan(ALLOWED_CONTENT)
-      end
+      content = content_tags(type, current_ctag)
 
       # We found {{ but we can't figure out what's going on inside.
       error "Illegal content in tag" if content.empty?
@@ -174,14 +185,7 @@ EOF
       fetch = [:mustache, :fetch, content.split('.')]
       prev = @result
 
-      # Based on the sigil, do what needs to be done.
-      if type
-        # Method#call proves much faster than using send
-        method("scan_tag_#{type}").
-          call(content, fetch, padding, pre_match_position)
-      else
-        @result << [:mustache, :etag, fetch, offset]
-      end
+      dispatch_based_on_type(type, content, fetch, padding, pre_match_position)
 
       # The closing } in unescaped tags is just a hack for
       # aesthetics.
@@ -192,10 +196,7 @@ EOF
       @scanner.skip(/\s+/)
       @scanner.skip(regexp(type)) if type
 
-      # Try to find the closing tag.
-      unless close = @scanner.scan(regexp(current_ctag))
-        error "Unclosed tag"
-      end
+      find_closing_tag(@scanner, current_ctag)
 
       # 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
@@ -282,6 +283,13 @@ EOF
     #
 
 
+    # This function handles the cases where the scanned tag does not have
+    # a type.
+    def scan_tag_ content, fetch, padding, pre_match_position
+      @result << [:mustache, :etag, fetch, offset]
+    end
+
+
     def scan_tag_block content, fetch, padding, pre_match_position
       block = [:multi]
       @result << [:mustache, :section, fetch, offset, block]

data/lib/mustache/utils.rb

@@ -0,0 +1,31 @@
+class Mustache
+  module Utils
+    class String
+      def initialize string
+        @string = string
+      end
+
+      def classify
+        @string.split('/').map do |namespace|
+          namespace.split(/[-_]/).map do |part|
+            part[0] = part.chars.first.upcase
+            part
+          end.join
+        end.join('::')
+      end
+
+      def underscore(view_namespace)
+        @string
+          .dup
+          .split("#{view_namespace}::")
+          .last
+          .split('::')
+          .map do |part|
+            part[0] = part[0].downcase
+            part.gsub(/[A-Z]/) { |s| "_" << s.downcase }
+          end
+          .join('/')
+      end
+    end
+  end
+end

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/mustache_test.rb

@@ -278,14 +278,19 @@ data
   RailsEnv production
 </VirtualHost>
 data
-    old_path, Mustache.template_path = Mustache.template_path, File.dirname(__FILE__) + "/fixtures"
-    old_extension, Mustache.template_extension = Mustache.template_extension, "conf"
+    old_path = Mustache.template_path
+    old_extension = Mustache.template_extension
 
-    assert_equal expected, Mustache.render(:passenger, :stage => 'production',
-                                                       :server => 'example.com',
-                                                       :deploy_to => '/var/www/example.com' )
-
-    Mustache.template_path, Mustache.template_extension = old_path, old_extension
+    begin
+      Mustache.template_path = File.dirname(__FILE__) + "/fixtures"
+      Mustache.template_extension = "conf"
+
+      assert_equal expected, Mustache.render(:passenger, :stage => 'production',
+                                                         :server => 'example.com',
+                                                         :deploy_to => '/var/www/example.com')
+    ensure
+      Mustache.template_path, Mustache.template_extension = old_path, old_extension
+    end
   end
 
   def test_doesnt_execute_what_it_doesnt_need_to
@@ -739,4 +744,20 @@ FROM
   DUMMY1
 template
   end
+
+  def test_cast_to_hash_in_context
+    hashlike = Object.new
+    def hashlike.title
+      'title'
+    end
+    def hashlike.to_hash
+      { title: 'title' }
+    end
+
+    template = '%%{{title}}%%'
+
+    assert_equal '%%title%%', Mustache.render(template, hashlike)
+
+  end
+
 end

data/test/spec_test.rb

@@ -59,7 +59,7 @@ Dir[spec_files].each do |file|
 
   test_suite.class_eval do
     spec['tests'].each do |test|
-      define_method :"test - #{test['name']}" do
+      define_method :"test_spec - #{test['name']}" do
         setup_partials(test)
         assert_mustache_spec(test)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mustache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -11,90 +11,113 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-02-23 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: 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
@@ -113,6 +136,7 @@ files:
 - lib/mustache/parser.rb
 - lib/mustache/settings.rb
 - lib/mustache/template.rb
+- lib/mustache/utils.rb
 - lib/mustache/version.rb
 - man/mustache.1
 - man/mustache.1.html
@@ -181,19 +205,18 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mustache is a framework-agnostic way to render logic-free views.
 test_files: []
-has_rdoc: