mustache 0.99.2 → 0.99.3

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] FILE ..."
+        opts.banner = "Usage: mustache [-c] [-t] [-r library] FILE ..."
 
         opts.separator " "
 
@@ -42,6 +42,10 @@ class Mustache
           exit
         end
 
+        opts.on('-r', '--require LIB', 'Require a Ruby library before running.') do |lib|
+          require lib
+        end
+
         opts.separator "Common Options:"
 
         opts.on("-v", "--version", "Print the version") do |v|

data/lib/mustache/context.rb

@@ -128,7 +128,7 @@ class Mustache
       elsif hash && obj.has_key?(key.to_s)
         obj[key.to_s]
       elsif !hash && obj.respond_to?(key)
-        meth = obj.method(key)
+        meth = obj.method(key) rescue proc { obj.send(key) }
         if meth.arity == 1
           meth.to_proc
         else

data/lib/mustache/parser.rb

@@ -117,6 +117,7 @@ EOF
       # of a new line.
       unless start_of_line
         @result << [:static, padding] unless padding.empty?
+        pre_match_position += padding.length
         padding = ''
       end
 
@@ -140,7 +141,6 @@ EOF
 
       fetch = [:mustache, :fetch, content.split('.')]
       prev = @result
-      last_index = @result.size
 
       # Based on the sigil, do what needs to be done.
       case type
@@ -192,7 +192,7 @@ EOF
       # 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
       # from the beginning of the line, re-insert the padding as static text.
-      if start_of_line
+      if start_of_line && !@scanner.eos?
         if @scanner.peek(2) =~ /\r?\n/ && SKIP_WHITESPACE.include?(type)
           @scanner.skip(/\r?\n/)
         else

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = VERSION = '0.99.2'
+  Version = VERSION = '0.99.3'
 end

data/test/fixtures/method_missing.rb

@@ -0,0 +1,19 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'mustache'
+
+class MethodMissing < Mustache
+  self.template = '[ {{#list}}{{.}} {{/list}}]'
+
+  def method_missing(name, *args, &block)
+    return (0..10).to_a if name == :list
+    return super
+  end
+
+  def respond_to?(method)
+    method == :list
+  end
+end
+
+if $0 == __FILE__
+  puts MethodMissing.to_html
+end

data/test/mustache_test.rb

@@ -88,6 +88,13 @@ end_complex
     assert_equal "\taa", instance.render(:list => [1, 2])
   end
 
+  def test_padding_before_section_on_eos
+    instance = Mustache.new
+    instance.template = "{{#list}}\n\t{{/list}}"
+
+    assert_equal "", instance.render(:list => [1, 2])
+  end
+
   def test_two_line_sections
     html = %(<p class="flash-notice" {{# no_flash }}style="display: none;"\n{{/ no_flash }}>)
 
@@ -539,6 +546,10 @@ template
     assert_equal 'Marvin is 25', view.render
   end
 
+  def test_method_missing
+    assert_equal('[ 0 1 2 3 4 5 6 7 8 9 10 ]', MethodMissing.render)
+  end
+
   def test_custom_escaping
     view = Class.new(Mustache) do
       def escapeHTML(str)

data/test/parser_test.rb

@@ -56,4 +56,18 @@ EOF
 
     assert_equal expected, tokens
   end
+
+  def test_raw_content_and_whitespace
+    lexer = Mustache::Parser.new
+    tokens = lexer.compile("{{#list}}\t{{/list}}")
+
+    expected = [:multi,
+      [:mustache,
+        :section,
+        [:mustache, :fetch, ["list"]],
+        [:multi, [:static, "\t"]],
+        "\t"]]
+
+    assert_equal expected, tokens
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  hash: 407
+  hash: 405
   prerelease: false
   segments: 
   - 0
   - 99
-  - 2
-  version: 0.99.2
+  - 3
+  version: 0.99.3
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -08:00
+date: 2011-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -84,6 +84,7 @@ files:
 - test/fixtures/inverted_section.rb
 - test/fixtures/lambda.mustache
 - test/fixtures/lambda.rb
+- test/fixtures/method_missing.rb
 - test/fixtures/namespaced.mustache
 - test/fixtures/namespaced.rb
 - test/fixtures/nested_objects.mustache