curly-templates 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ### Unreleased
 
+### Curly 0.9.1 (June 20, 2013)
+
+* Better error handling. If a presenter class cannot be found, we not raise a
+  more descriptive exception.
+
+  *Daniel Schierbeck*
+
+* Include the superclass' dependencies in a presenter's dependency list.
+
+  *Daniel Schierbeck*
+
 ### Curly 0.9.0 (June 4, 2013)
 
 * Allow running setup code before rendering a Curly view. Simply add a `#setup!`

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.9.0'
-  s.date              = '2013-06-04'
+  s.version           = '0.9.1'
+  s.date              = '2013-06-20'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     curly-templates.gemspec
     lib/curly-templates.rb
     lib/curly.rb
+    lib/curly/compilation_error.rb
     lib/curly/compiler.rb
     lib/curly/dependency_tracker.rb
     lib/curly/invalid_reference.rb

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/compilation_error.rb

@@ -0,0 +1,19 @@
+module Curly
+  class CompilationError < StandardError
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def message
+      "error compiling `#{path}`: could not find #{presenter_class_name}"
+    end
+
+    private
+
+    def presenter_class_name
+      Curly::Presenter.presenter_name_for_path(path)
+    end
+  end
+end

data/lib/curly/compiler.rb

@@ -12,6 +12,10 @@ module Curly
       #
       # Returns a String containing the Ruby code.
       def compile(template, presenter_class)
+        if presenter_class.nil?
+          raise ArgumentError, "presenter class cannot be nil"
+        end
+
         source = template.inspect
         source.gsub!(REFERENCE_REGEX) { compile_reference($1, presenter_class) }
 

data/lib/curly/presenter.rb

@@ -191,7 +191,11 @@ module Curly
       #
       # Returns a Set of String view paths.
       def dependencies
+        # The base presenter doesn't have any dependencies.
+        return Set.new if self == Curly::Presenter
+
         @dependencies ||= Set.new
+        @dependencies.union(superclass.dependencies)
       end
 
       # Indicate that the presenter depends a list of other views.
@@ -199,8 +203,9 @@ module Curly
       # deps - A list of String view paths that the presenter depends on.
       #
       # Returns nothing.
-      def depends_on(*deps)
-        dependencies.merge(deps)
+      def depends_on(*dependencies)
+        @dependencies ||= Set.new
+        @dependencies.merge(dependencies)
       end
 
       # Get or set the version of the presenter.

data/lib/curly/template_handler.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'action_view'
 require 'curly'
+require 'curly/compilation_error'
 
 class Curly::TemplateHandler
   class << self
@@ -27,6 +28,8 @@ class Curly::TemplateHandler
       path = template.virtual_path
       presenter_class = Curly::Presenter.presenter_for_path(path)
 
+      raise Curly::CompilationError.new(path) if presenter_class.nil?
+
       source = Curly.compile(template.source, presenter_class)
 
       <<-RUBY

data/spec/compiler_spec.rb

@@ -58,6 +58,12 @@ describe Curly::Compiler do
       evaluate("{{parameterized}}").should == ""
     end
 
+    it "raises ArgumentError if the presenter class is nil" do
+      expect do
+        Curly::Compiler.compile("foo", nil)
+      end.to raise_exception(ArgumentError)
+    end
+
     it "makes sure only public methods are called on the presenter object" do
       expect { evaluate("{{bar}}") }.to raise_exception(Curly::InvalidReference)
     end

data/spec/presenter_spec.rb

@@ -142,4 +142,18 @@ describe Curly::Presenter do
       cache_key.should == "Foo::BarPresenter/42/foo/bum"
     end
   end
+
+  describe ".dependencies" do
+    it "returns the dependencies defined for the presenter" do
+      presenter = Class.new(Curly::Presenter) { depends_on 'foo' }
+      presenter.dependencies.to_a.should == ['foo']
+    end
+
+    it "includes the dependencies defined for parent classes" do
+      Curly::Presenter.dependencies
+      parent = Class.new(Curly::Presenter) { depends_on 'foo' }
+      presenter = Class.new(parent) { depends_on 'bar' }
+      presenter.dependencies.to_a.should =~ ['foo', 'bar']
+    end
+  end
 end

data/spec/template_handler_spec.rb

@@ -98,6 +98,12 @@ describe Curly::TemplateHandler do
     output.should == "BAR"
   end
 
+  it "should fail if there's no matching presenter class" do
+    template.stub(:virtual_path) { "missing" }
+    template.stub(:source) { " FOO " }
+    expect { output }.to raise_exception(Curly::CompilationError)
+  end
+
   it "allows calling public methods on the presenter" do
     template.stub(:source) { "{{foo}}" }
     output.should == "FOO"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -116,6 +116,7 @@ files:
 - curly-templates.gemspec
 - lib/curly-templates.rb
 - lib/curly.rb
+- lib/curly/compilation_error.rb
 - lib/curly/compiler.rb
 - lib/curly/dependency_tracker.rb
 - lib/curly/invalid_reference.rb
@@ -147,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3268332445838018672
+      hash: 3388653685709819519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: