mustache 0.13.0 → 0.98.0

data/README.md

@@ -61,7 +61,7 @@ We've got an `examples` folder but here's the canonical one:
       end
 
       def taxed_value
-        value - (value * 0.4)
+        value * 0.6
       end
 
       def in_ca
@@ -236,7 +236,7 @@ Then just include it:
       end
 
       def taxed_value
-        value - (value * 0.4)
+        value * 0.6
       end
 
       def in_ca

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 #
 
 def command?(command)
-  system("type #{command} > /dev/null")
+  system("type #{command} &> /dev/null")
 end
 
 

data/lib/mustache/context.rb

@@ -42,6 +42,13 @@ class Mustache
       @stack.detect { |frame| frame.is_a?(Mustache) }
     end
 
+    # Allows customization of how Mustache escapes things.
+    #
+    # Returns a String.
+    def escapeHTML(str)
+      mustache_in_stack.escapeHTML(str)
+    end
+
     # Adds a new object to the context's internal stack.
     #
     # Returns the Context.

data/lib/mustache/generator.rb

@@ -153,7 +153,7 @@ class Mustache
         v = ctx[#{name.to_sym.inspect}]
         v = Mustache::Template.new(v.call.to_s).render(ctx.dup) if v.is_a?(Proc)
         ctx.frame[ctx.key] = v if ctx.frame.is_a?(Hash)
-        CGI.escapeHTML(v.to_s)
+        ctx.escapeHTML(v.to_s)
       compiled
     end
 

data/lib/mustache/parser.rb

@@ -50,7 +50,7 @@ EOF
     SKIP_WHITESPACE = [ '#', '^', '/', '<', '>', '=', '!' ]
 
     # The content allowed in a tag name.
-    ALLOWED_CONTENT = /(\w|[?!\/-])*/
+    ALLOWED_CONTENT = /(\w|[?!\/.-])*/
 
     # These types of tags allow any content,
     # the rest only allow ALLOWED_CONTENT.
@@ -174,7 +174,18 @@ EOF
         type = "}" if type == "{"
         @result << [:mustache, :utag, content]
       else
-        @result << [:mustache, :etag, content]
+        parts = content.to_s.split(".").reverse
+
+        if parts.size == 0
+          # implicit iterators - {{.}}
+          @result << [:mustache, :etag, "to_s"]
+        else
+          # dot notation - {{person.name}}
+          etag = [:mustache, :etag, parts.shift]
+          @result << parts.inject(etag) { |section, key|
+            [:mustache, :section, key, section, content]
+          }
+        end
       end
 
       # Skip whitespace and any balancing sigils after the content

data/lib/mustache/sinatra.rb

@@ -88,6 +88,11 @@ class Mustache
         # Copy instance variables set in Sinatra to the view
         instance_variables.each do |name|
           instance.instance_variable_set(name, instance_variable_get(name))
+
+          # Automagic attr_readers for ivars you set in Sinatra routes.
+          if !instance.respond_to?(name)
+            (class << instance; self end).send(:attr_reader, name.to_s.sub('@',''))
+          end
         end
 
         # Render with locals.

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.13.0'
+  Version = VERSION = '0.98.0'
 end

data/lib/mustache.rb

@@ -315,6 +315,19 @@ class Mustache
     @template = templateify(template)
   end
 
+  # Override this to provide custom escaping.
+  #
+  # class PersonView < Mustache
+  #   def escapeHTML(str)
+  #     my_html_escape_method(str)
+  #   end
+  # end
+  #
+  # Returns a String
+  def escapeHTML(str)
+    CGI.escapeHTML(str)
+  end
+
   # Instance level version of `Mustache.raise_on_context_miss?`
   def raise_on_context_miss?
     self.class.raise_on_context_miss? || @raise_on_context_miss

data/test/fixtures/dot_notation.mustache

@@ -0,0 +1,6 @@
+* {{person.name.first}} {{person.name.last}}
+* {{person.age}}
+* {{person.hometown.city}}, {{person.hometown.state}}
+* {{#person}}{{hometown.city}}, {{hometown.state}}{{/person}}
+* {{#person}}{{#hometown}}{{city}}, {{state}}{{/hometown}}{{/person}}
+* {{normal}}

data/test/fixtures/dot_notation.rb

@@ -0,0 +1,25 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'mustache'
+
+class DotNotation < Mustache
+  self.path = File.dirname(__FILE__)
+
+  def person
+    return {
+      :name => OpenStruct.new(:first => 'Chris', :last => 'Firescythe'),
+      :age  => 24,
+      :hometown => {
+        :city  => "Cincinnati",
+        :state => "OH"
+      }
+    }
+  end
+
+  def normal
+    "Normal"
+  end
+end
+
+if $0 == __FILE__
+  puts DotNotation.to_html
+end

data/test/mustache_test.rb

@@ -497,6 +497,40 @@ template
     assert_equal 'Marvin is 25', view.render
   end
 
+  def test_custom_escaping
+    view = Class.new(Mustache) do
+      def escapeHTML(str)
+        "pong"
+      end
+    end
+
+    assert_equal 'pong', view.render("{{thing}}", :thing => "nothing")
+    assert_equal 'nothing', Mustache.render("{{thing}}", :thing => "nothing")
+  end
+
+  def test_implicit_iterator
+    view = Mustache.new
+    view.template = "{{#people}}* {{.}}\n{{/people}}"
+    view[:people] = %w( Chris Mark Scott )
+
+    assert_equal <<text, view.render
+* Chris
+* Mark
+* Scott
+text
+  end
+
+  def test_dot_notation
+    assert_equal <<-text.chomp, DotNotation.render
+* Chris Firescythe
+* 24
+* Cincinnati, OH
+* Cincinnati, OH
+* Cincinnati, OH
+* Normal
+text
+  end
+
   def test_inherited_attributes
     Object.const_set :TestNamespace, Module.new
     base = Class.new(Mustache)

data/test/spec_test.rb

@@ -53,11 +53,11 @@ spec_files = File.join(File.dirname(__FILE__), '..', 'ext', 'spec', 'specs', '*.
 Dir[spec_files].each do |file|
   spec = YAML.load_file(file)
 
-  Class.new(MustacheSpec) do
-    define_method :name do
-      File.basename(file).sub(/^./, &:upcase)
-    end
+  klass_name = "Test" + File.basename(file, ".yml").sub(/~/, '').capitalize
+  instance_eval "class ::#{klass_name} < MustacheSpec; end"
+  test_suite = Kernel.const_get(klass_name)
 
+  test_suite.class_eval do
     spec['tests'].each do |test|
       define_method :"test - #{test['name']}" do
         setup_partials(test)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 407
   prerelease: false
   segments: 
   - 0
-  - 13
+  - 98
   - 0
-  version: 0.13.0
+  version: 0.98.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -69,6 +69,8 @@ files:
 - test/fixtures/crazy_recursive.rb
 - test/fixtures/delimiters.mustache
 - test/fixtures/delimiters.rb
+- test/fixtures/dot_notation.mustache
+- test/fixtures/dot_notation.rb
 - test/fixtures/double_section.mustache
 - test/fixtures/double_section.rb
 - test/fixtures/escaped.mustache