curly-templates 0.5.0 → 0.6.0

data/curly-templates.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '0.5.0'
-  s.date              = '2013-04-19'
+  s.version           = '0.6.0'
+  s.date              = '2013-04-22'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

@@ -26,11 +26,20 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 
   REFERENCE_REGEX = %r(\{\{([\w\.]+)\}\})
 
   class InvalidReference < StandardError
+    attr_reader :reference
+
+    def initialize(reference)
+      @reference = reference
+    end
+
+    def message
+      "invalid reference `{{#{reference}}}'"
+    end
   end
 
   class << self
@@ -40,9 +49,9 @@ module Curly
     # template - The template String that should be compiled.
     #
     # Returns a String containing the Ruby code.
-    def compile(template)
+    def compile(template, presenter_class)
       source = template.inspect
-      source.gsub!(REFERENCE_REGEX) { compile_reference($1) }
+      source.gsub!(REFERENCE_REGEX) { compile_reference($1, presenter_class) }
 
       source
     end
@@ -62,20 +71,26 @@ module Curly
 
     private
 
-    def compile_reference(reference)
+    def compile_reference(reference, presenter_class)
       method, argument = reference.split(".", 2)
 
-      %(\#{
-        unless presenter.method_available?(:#{method})
-          raise Curly::InvalidReference, "invalid reference `{{#{reference}}}'"
-        end
+      unless presenter_class.method_available?(method.to_sym)
+        raise Curly::InvalidReference.new(method.to_sym)
+      end
 
-        if presenter.method(:#{method}).arity == 1
-          result = presenter.#{method}(#{argument.inspect}) {|*args| yield(*args) }
-        else
-          result = presenter.#{method} {|*args| yield(*args) }
-        end
+      if presenter_class.instance_method(method).arity == 1
+        # The method accepts a single argument -- pass it in.
+        code = <<-RUBY
+          presenter.#{method}(#{argument.inspect}) {|*args| yield(*args) }
+        RUBY
+      else
+        code = <<-RUBY
+          presenter.#{method} {|*args| yield(*args) }
+        RUBY
+      end
 
+      %(\#{
+        result = #{code}
         ERB::Util.html_escape(result)
       })
     end

data/lib/curly/presenter.rb

@@ -84,24 +84,6 @@ module Curly
       nil
     end
 
-    # Whether a method is available to templates rendered with the presenter.
-    #
-    # Templates can reference "variables", which are simply methods defined on
-    # the presenter. By default, only public instance methods can be
-    # referenced, and any method defined on Curly::Presenter itself cannot be
-    # referenced. This means that methods such as `#cache_key` and #inspect are
-    # not available. This is done for safety purposes.
-    #
-    # This policy can be changed by overriding this method in your presenters.
-    #
-    # method - The Symbol name of the method.
-    #
-    # Returns true if the method can be referenced by a template,
-    #   false otherwise.
-    def method_available?(method)
-      self.class.available_methods.include?(method)
-    end
-
     class << self
 
       # The name of the presenter class for a given view path.
@@ -122,6 +104,24 @@ module Curly
         presenter_name_for_path(path).constantize rescue nil
       end
 
+      # Whether a method is available to templates rendered with the presenter.
+      #
+      # Templates can reference "variables", which are simply methods defined on
+      # the presenter. By default, only public instance methods can be
+      # referenced, and any method defined on Curly::Presenter itself cannot be
+      # referenced. This means that methods such as `#cache_key` and #inspect are
+      # not available. This is done for safety purposes.
+      #
+      # This policy can be changed by overriding this method in your presenters.
+      #
+      # method - The Symbol name of the method.
+      #
+      # Returns true if the method can be referenced by a template,
+      #   false otherwise.
+      def method_available?(method)
+        available_methods.include?(method)
+      end
+
       # A list of methods available to templates rendered with the presenter.
       #
       # Returns an Array of Symbol method names.

data/lib/curly/template_handler.rb

@@ -13,9 +13,9 @@ class Curly::TemplateHandler
   # Returns a String containing the Ruby code representing the template.
   def self.call(template)
     path = template.virtual_path
-    presenter_class = Curly::Presenter.presenter_name_for_path(path)
+    presenter_class = Curly::Presenter.presenter_for_path(path)
 
-    source = Curly.compile(template.source)
+    source = Curly.compile(template.source, presenter_class)
     template_digest = Digest::MD5.hexdigest(template.source)
 
     # Template is empty, so there's no need to initialize a presenter.

data/spec/curly_spec.rb

@@ -20,11 +20,15 @@ describe Curly do
         "UNICORN"
       end
 
+      def dirty
+        nil
+      end
+
       def parameterized(value)
         value
       end
 
-      def method_available?(method)
+      def self.method_available?(method)
         [:foo, :parameterized, :high_yield, :yield_value, :dirty].include?(method)
       end
 
@@ -58,6 +62,15 @@ describe Curly do
     expect { evaluate("{{bar}}") }.to raise_exception(Curly::InvalidReference)
   end
 
+  it "includes the invalid reference when failing to compile" do
+    begin
+      evaluate("{{bar}}")
+      fail
+    rescue Curly::InvalidReference => e
+      e.reference.should == :bar
+    end
+  end
+
   it "propagates yields to the caller" do
     evaluate("{{high_yield}}") { "$$$" }.should == "$$$, motherfucker!"
   end
@@ -96,7 +109,7 @@ describe Curly do
   end
 
   def evaluate(template, &block)
-    code = Curly.compile(template)
+    code = Curly.compile(template, presenter_class)
     context = double("context", presenter: presenter)
 
     context.instance_eval(<<-RUBY)

data/spec/template_handler_spec.rb

@@ -25,7 +25,7 @@ describe Curly::TemplateHandler do
         @cache_duration
       end
 
-      def method_available?(method)
+      def self.method_available?(method)
         true
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4267343467533588102
+      hash: -673817575168436386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: