mustache 0.99.6 → 0.99.7

data/bin/mustache

@@ -64,14 +64,6 @@ class Mustache
       opts.parse!(args)
     end
 
-    def self.yaml_is_array?(yaml)
-        yaml.is_a? Array and yaml.length == 1 and yaml[0].is_a? Array
-    end
-
-    def self.yaml_is_object?(yaml)
-        yaml.is_a? Array and yaml.length == 1 and yaml[0].is_a? Hash
-    end
-
     # Does the dirty work of reading files from the command line then
     # processing them. The meat of this script, if you will.
     def self.process_files(input_files)
@@ -79,7 +71,7 @@ class Mustache
 
       yaml = nil
       begin
-        yaml = RUBY_VERSION >= '1.9.3' ? YAML.load_stream(doc) : YAML.each_document(doc)
+        yaml = YAML.load_stream(doc)
       rescue
         puts "Unable to parse yaml!"
       end
@@ -89,13 +81,7 @@ class Mustache
       else
         template = input_files.skip.file.read
 
-        if self.yaml_is_array?(yaml)
-          puts Mustache.render(template, yaml[0].reduce({}) {|hash, currentHash| hash.merge(currentHash)})
-        elsif self.yaml_is_object?(yaml)
-          puts Mustache.render(template, yaml[0])
-        else
-          puts Mustache.render(template, yaml)
-        end
+        puts Mustache.render template, yaml.compact.reduce(&:merge)
       end
     end
   end

data/lib/mustache.rb

@@ -107,14 +107,15 @@ class Mustache
   #
   # Returns a rendered String version of a template
   def render(data = template, ctx = {})
-    if data.is_a? Hash
+    tpl = case data
+    when Hash
       ctx = data
-      tpl = templateify(template)
-    elsif data.is_a? Symbol
+      templateify(template)
+    when Symbol
       self.template_name = data
-      tpl = templateify(template)
+      templateify(template)
     else
-      tpl = templateify(data)
+      templateify(data)
     end
 
     return tpl.render(context) if ctx == {}
@@ -231,7 +232,7 @@ class Mustache
   # Returns the constant if found
   # Returns nil if nothing is found
   def self.const_get!(name)
-    name.split('::').inject(Object) do |klass, cname|
+    name.split('::').reduce(Object) do |klass, cname|
       klass.const_get(cname)
     end
   rescue NameError

data/lib/mustache/context.rb

@@ -119,27 +119,20 @@ class Mustache
     #
     # Returns the value of key in obj if it is found and default otherwise.
     def find(obj, key, default = nil)
-      hash = obj.respond_to?(:to_hash)
-
-      if !hash
+      if !obj.respond_to?(:to_hash)
         # If a class, we need to find tags (methods) per Parser::ALLOWED_CONTENT.
-        if key.to_s.include?('-')
-          key = key.to_s.gsub('-', '_')
-        end
+        key = key.to_s.tr('-', '_') if key.to_s.include?('-')
 
         if obj.respond_to?(key)
           meth = obj.method(key) rescue proc { obj.send(key) }
-          if meth.arity == 1
-            meth.to_proc
-          else
-            meth[]
-          end
+
+          meth.arity == 1 ? meth.to_proc : meth[]
         else
           default
         end
-      elsif hash && obj.has_key?(key)
+      elsif obj.has_key?(key)
         obj[key]
-      elsif hash && obj.has_key?(key.to_s)
+      elsif obj.has_key?(key.to_s)
         obj[key.to_s]
       else
         obj[key] || default

data/lib/mustache/generator.rb

@@ -171,20 +171,16 @@ class Mustache
     end
 
     def on_fetch(names)
+      return "ctx[:to_s]" if names.empty?
+
       names = names.map { |n| n.to_sym }
 
-      if names.length == 0
-        "ctx[:to_s]"
-      elsif names.length == 1
-        "ctx[#{names.first.to_sym.inspect}]"
-      else
-        initial, *rest = names
-        <<-compiled
-          #{rest.inspect}.inject(ctx[#{initial.inspect}]) { |value, key|
-            value && ctx.find(value, key)
-          }
-        compiled
-      end
+      initial, *rest = names
+      <<-compiled
+        #{rest.inspect}.reduce(ctx[#{initial.inspect}]) { |value, key|
+          value && ctx.find(value, key)
+        }
+      compiled
     end
 
     # An interpolation-friendly version of a string, for use within a

data/lib/mustache/parser.rb

@@ -45,7 +45,7 @@ EOF
     end
 
     # The sigil types which are valid after an opening `{{`
-    VALID_TYPES = [ '#', '^', '/', '=', '!', '<', '>', '&', '{' ]
+    VALID_TYPES = [ '#', '^', '/', '=', '!', '<', '>', '&', '{' ].map &:freeze
 
     def self.valid_types
       @valid_types ||= Regexp.new(VALID_TYPES.map { |t| Regexp.escape(t) }.join('|') )
@@ -75,14 +75,14 @@ EOF
     # After these types of tags, all whitespace until the end of the line will
     # be skipped if they are the first (and only) non-whitespace content on
     # the line.
-    SKIP_WHITESPACE = [ '#', '^', '/', '<', '>', '=', '!' ]
+    SKIP_WHITESPACE = [ '#', '^', '/', '<', '>', '=', '!' ].map &:freeze
 
     # The content allowed in a tag name.
     ALLOWED_CONTENT = /(\w|[?!\/.-])*/
 
     # These types of tags allow any content,
     # the rest only allow ALLOWED_CONTENT.
-    ANY_CONTENT = [ '!', '=' ]
+    ANY_CONTENT = [ '!', '=' ].map &:freeze
 
     attr_reader :scanner, :result
     attr_writer :otag, :ctag
@@ -157,11 +157,11 @@ EOF
 
       # ANY_CONTENT tags allow any character inside of them, while
       # other tags (such as variables) are more strict.
-      if ANY_CONTENT.include?(type)
+      content = if ANY_CONTENT.include?(type)
         r = /\s*#{regexp(type)}?#{regexp(current_ctag)}/
-        content = scan_until_exclusive(r)
+        scan_until_exclusive(r)
       else
-        content = @scanner.scan(ALLOWED_CONTENT)
+        @scanner.scan(ALLOWED_CONTENT)
       end
 
       # We found {{ but we can't figure out what's going on inside.

data/lib/mustache/template.rb

@@ -59,6 +59,7 @@ class Mustache
     def self.recursor(toks, section, &block)
       toks.map do |token|
         next unless token.is_a? Array
+
         if token[0] == :mustache
           new_token, new_section, result, stop = yield(token, section)
           [ result ] + ( stop ? [] : recursor(new_token, new_section, &block))
@@ -74,7 +75,7 @@ class Mustache
       Template.recursor(tokens, []) do |token, section|
         if [:etag, :utag].include?(token[1])
           [ new_token=nil, new_section=nil, result=((section + [token[2][2][0]]).join('.')), stop=true ]
-        elsif [:section, :inverted_section].include?(token[1]) 
+        elsif [:section, :inverted_section].include?(token[1])
           [ new_token=token[4], new_section=(section + [token[2][2][0]]), result=nil, stop=false ]
         else
           [ new_token=token, new_section=section, result=nil, stop=false ]

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.99.6'
+  Version = VERSION = '0.99.7'
 end

data/lib/rack/bug/panels/mustache_panel.rb

@@ -65,7 +65,7 @@ module Rack
 
       # The string used for our tab in Rack::Bug's navigation bar
       def heading
-        "{{%.2fms}}" % self.class.times.values.inject(0.0) do |sum, obj|
+        "{{%.2fms}}" % self.class.times.values.reduce(0.0) do |sum, obj|
           sum + obj
         end
       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 2014" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "1" "October 2014" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \- Mustache processor

data/man/mustache.1.html

@@ -204,7 +204,7 @@ data
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>February 2014</li>
+    <li class='tc'>October 2014</li>
     <li class='tr'>mustache(1)</li>
   </ol>
 

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" "April 2014" "DEFUNKT" "Mustache Manual"
+.TH "MUSTACHE" "5" "October 2014" "DEFUNKT" "Mustache Manual"
 .
 .SH "NAME"
 \fBmustache\fR \- Logic\-less templates\.
@@ -126,7 +126,7 @@ Output:
 .IP "" 0
 .
 .SS "Sections"
-Sections render blocks of text one or more times, depending on the value of the key in the current context\.
+Sections render blocks of text zero or more times, depending on the value of the key in the current context\.
 .
 .P
 A section begins with a pound and ends with a slash\. That is, \fB{{#person}}\fR begins a "person" section while \fB{{/person}}\fR ends it\.
@@ -349,7 +349,7 @@ Hi Jon!
 An inverted section begins with a caret (hat) and ends with a slash\. That is \fB{{^person}}\fR begins a "person" inverted section while \fB{{/person}}\fR ends it\.
 .
 .P
-While sections can be used to render text one or more times based on the value of the key, inverted sections may render text once based on the inverse value of the key\. That is, they will be rendered if the key doesn\'t exist, is false, or is an empty list\.
+While sections can be used to render text zero or more times based on the value of the key, inverted sections may render text once based on the inverse value of the key\. That is, they will be rendered if the key doesn\'t exist, is false, or is an empty list\.
 .
 .P
 Template:

data/man/mustache.5.html

@@ -161,7 +161,7 @@ supports raising an exception in this situation, for instance.</p>
 
 <h3 id="Sections">Sections</h3>
 
-<p>Sections render blocks of text one or more times, depending on the
+<p>Sections render blocks of text zero or more times, depending on the
 value of the key in the current context.</p>
 
 <p>A section begins with a pound and ends with a slash. That is,
@@ -291,7 +291,7 @@ context for a single rendering of the block.</p>
 slash. That is <code>{{^person}}</code> begins a "person" inverted section while
 <code>{{/person}}</code> ends it.</p>
 
-<p>While sections can be used to render text one or more times based on the
+<p>While sections can be used to render text zero or more times based on the
 value of the key, inverted sections may render text once based
 on the inverse value of the key. That is, they will be rendered
 if the key doesn't exist, is false, or is an empty list.</p>
@@ -415,7 +415,7 @@ markup."</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>April 2014</li>
+    <li class='tc'>October 2014</li>
     <li class='tr'>mustache(5)</li>
   </ol>
 

data/man/mustache.5.ron

@@ -88,7 +88,7 @@ Output:
 
 ### Sections
 
-Sections render blocks of text one or more times, depending on the
+Sections render blocks of text zero or more times, depending on the
 value of the key in the current context.
 
 A section begins with a pound and ends with a slash. That is,
@@ -207,7 +207,7 @@ An inverted section begins with a caret (hat) and ends with a
 slash. That is `{{^person}}` begins a "person" inverted section while
 `{{/person}}` ends it.
 
-While sections can be used to render text one or more times based on the
+While sections can be used to render text zero or more times based on the
 value of the key, inverted sections may render text once based
 on the inverse value of the key. That is, they will be rendered
 if the key doesn't exist, is false, or is an empty list.

data/test/spec_test.rb

@@ -4,11 +4,7 @@ require 'yaml'
 require 'test/unit'
 
 # Calls appropriate method on YAML. See: https://gist.github.com/tenderlove/958999ab4240b93bd3cd
-if RUBY_VERSION > "1.8"
-  YAML.add_domain_type(nil, 'code') { |_, val| eval(val['ruby']) }
-else
-  YAML.add_builtin_type('code') { |_, val| eval(val['ruby']) }
-end
+YAML.add_domain_type(nil, 'code') { |_, val| eval(val['ruby']) }
 
 # A simple base class for Mustache specs.
 # Creates a partials directory, then points a (dynamic) subclass of Mustache at

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mustache
 version: !ruby/object:Gem::Version
-  version: 0.99.6
+  version: 0.99.7
+  prerelease: 
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,102 +11,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-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: chris@ozmm.org
 executables:
 - mustache
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
 - Rakefile
-- bin/mustache
-- lib/mustache.rb
-- lib/mustache/blah.rb
+- LICENSE
 - lib/mustache/context.rb
 - lib/mustache/enumerable.rb
 - lib/mustache/generator.rb
@@ -114,9 +131,11 @@ files:
 - lib/mustache/sinatra.rb
 - lib/mustache/template.rb
 - lib/mustache/version.rb
-- lib/rack/bug/panels/mustache_panel.rb
+- lib/mustache.rb
 - lib/rack/bug/panels/mustache_panel/mustache_extension.rb
 - lib/rack/bug/panels/mustache_panel/view.mustache
+- lib/rack/bug/panels/mustache_panel.rb
+- bin/mustache
 - man/mustache.1
 - man/mustache.1.html
 - man/mustache.1.ron
@@ -174,28 +193,29 @@ files:
 - test/partial_test.rb
 - test/spec_test.rb
 - test/template_test.rb
-homepage: http://github.com/defunkt/mustache
+homepage: http://github.com/mustache/mustache
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Mustache is a framework-agnostic way to render logic-free views.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e3c1091a71418634c3e493d6b3aae1e5a8f0d0f0
-  data.tar.gz: 87936c1b015243222b2c95c29693106a9ea646a1
-SHA512:
-  metadata.gz: a422377f6020f923eac84ca194e46b78d05ad611428faa4dede440c090c61e2a30d5d15618286ae72b8ebf486e9aae4b351fee521f5bdc4e13ecc99d1a1677e4
-  data.tar.gz: 30d05bc44030071c322a18ff64235c7bd8da19b03c1cbb4bc68dd3deba33c21d82af75dc435aa2c9845705ea8c7989130aa7626aced0ffb119d6bc18344fa420

data/lib/mustache/blah.rb

@@ -1,116 +0,0 @@
-require 'mustache'
-
-class Mustache::Template
-  def token_names
-    def recursor(toks, section)
-      toks.map do |token|
-        next unless token.is_a? Array
-        if token[0] == :mustache && [:etag,:utag].include? token[1]
-          (section + [token[2][2][0]]).join '.'
-        elsif token[0] == :mustache && [:section,:inverted_section].include? token[1]
-          recursor(token[4], section + [token[2][2][0]])
-        else
-          recursor(token, section)
-        end
-      end
-    end
-    recursor(tokens, []).flatten.reject(&:nil?).uniq
-  end
-
-  def section_names
-    def recursor(toks, section)
-      sections = []
-      toks.each do |token|
-        next unless token.is_a? Array
-        if token[0] == :mustache && [:section,:inverted_section].include? token[1]
-          new_section = section + [token[2][2][0]]
-          sections += [ new_section.join('.') ] + recursor(token[4], new_section)
-        else
-          sections += recursor(token, section)
-        end
-      end
-      sections
-    end
-    recursor(tokens,[]).reject(&:nil?).uniq
-  end
-
-  def partial_names
-    def recursor(toks)
-      partials = []
-      toks.each do |token|
-        next unless token.is_a? Array
-        partials += if token[0..1] == [:mustache, :partial]
-          [token[2]] # partial here
-        else
-          recursor(token)
-        end
-      end
-      partials
-    end
-    recursor(tokens).reject(&:nil?).uniq
-  end
-
-end
-
-if __FILE__ == $0
-  require "test/unit"
-
-  class TestMustacheTokenNames < Test::Unit::TestCase
-
-    def setup
-      @template = Mustache::Template.new(@@template_text ||= DATA.read)
-    end
-
-    def test_token_names
-      assert_equal(@template.token_names,
-        [ "yourname",
-          "HOME",
-          "friend.name",
-          "friend.morr.word",
-          "friend.morr.up",
-          "friend.morr.awesomesauce",
-          "friend.morr.hiss",
-          "friend.notinmorr",
-          "friend.person",
-          "love",
-          "triplestash"
-        ]
-      )
-    end
-
-    def test_partial_names
-      assert_equal(@template.partial_names, ["partial1", "partial2"])
-    end
-
-    def test_section_names
-      assert_equal(@template.section_names, ["friend", "friend.morr"])
-    end
-  end
-end
-
-__END__
-Hi there {{yourname}}.  Your home directory is {{HOME}}.
-
-{{#friend}}
-Your friend is named {{name}}
-  {{#morr}}
-   Hey {{word}} {{up}} {{{awesomesauce}}}.
-   {{/morr}}
-   {{^morr}}
-   Booooo.  {{hiss}}
-   {{/morr}}
-   {{notinmorr}}
-   {{> partial1}}
-{{/friend}}
-{{^friend}}
-You have no friends, {{person}}.  You suck.
-{{/friend}}
-
-{{> partial2}}
-{{! comments are awesome }}
-
-{{={% %}=}}
-
-{%love%}
-{%={{ }}=%}
-{{{triplestash}}}