curly-templates 0.3.1 → 0.4.0

data/curly-templates.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '0.3.1'
+  s.version           = '0.4.0'
   s.date              = '2013-04-18'
 
   s.summary     = "Free your views!"

data/lib/curly.rb

@@ -26,9 +26,9 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 
-  REFERENCE_REGEX = %r(\{\{(\w+)\}\})
+  REFERENCE_REGEX = %r(\{\{([\w\.]+)\}\})
 
   class InvalidReference < StandardError
   end
@@ -63,13 +63,20 @@ module Curly
     private
 
     def compile_reference(reference)
+      method, argument = reference.split(".", 2)
+
       %(\#{
-        if presenter.method_available?(:#{reference})
-          result = presenter.#{reference} {|*args| yield(*args) }
-          ERB::Util.html_escape(result)
-        else
+        unless presenter.method_available?(:#{method})
           raise Curly::InvalidReference, "invalid reference `{{#{reference}}}'"
         end
+
+        if presenter.method(:#{method}).arity == 1
+          result = presenter.#{method}(#{argument.inspect}) {|*args| yield(*args) }
+        else
+          result = presenter.#{method} {|*args| yield(*args) }
+        end
+
+        ERB::Util.html_escape(result)
       })
     end
 

data/spec/curly_spec.rb

@@ -20,8 +20,12 @@ describe Curly do
         "UNICORN"
       end
 
+      def parameterized(value)
+        value
+      end
+
       def method_available?(method)
-        [:foo, :high_yield, :yield_value, :dirty].include?(method)
+        [:foo, :parameterized, :high_yield, :yield_value, :dirty].include?(method)
       end
 
       def self.available_methods
@@ -42,6 +46,14 @@ describe Curly do
     evaluate("{{foo}}").should == "FOO"
   end
 
+  it "passes on an optional reference parameter to the presenter method" do
+    evaluate("{{parameterized.foo.bar}}").should == "foo.bar"
+  end
+
+  it "passes an empty string to methods that take a parameter when none is provided" do
+    evaluate("{{parameterized}}").should == ""
+  end
+
   it "makes sure only public methods are called on the presenter object" do
     expect { evaluate("{{bar}}") }.to raise_exception(Curly::InvalidReference)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1940230651346147654
+      hash: 2429714789931258072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: