curly-templates 0.6.0 → 0.6.1

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.6.0'
-  s.date              = '2013-04-22'
+  s.version           = '0.6.1'
+  s.date              = '2013-04-29'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

@@ -26,7 +26,7 @@
 # See Curly::Presenter for more information on presenters.
 #
 module Curly
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 
   REFERENCE_REGEX = %r(\{\{([\w\.]+)\}\})
 

data/lib/curly/presenter.rb

@@ -100,8 +100,29 @@ module Curly
         "#{path}_presenter".camelize
       end
 
+      # Returns the presenter class for the given path.
+      #
+      # path - The String path of a template.
+      #
+      # Returns the Class or nil if the constant cannot be found.
       def presenter_for_path(path)
-        presenter_name_for_path(path).constantize rescue nil
+        name = presenter_name_for_path(path)
+
+        begin
+          name.constantize
+        rescue NameError => e
+          missing_name = e.name.to_s
+
+          # Since we only want to return nil when the constant matching the
+          # path could not be found, we need to do same hacky matching. If
+          # the constant's name is Foo::BarPresenter and Foo does not exist,
+          # we consider that a match. If Foo exists but Foo::BarPresenter does
+          # not, NameError#name will return :BarPresenter, so we need to match
+          # that as well.
+          unless name.start_with?(missing_name) || name.end_with?(missing_name)
+            raise # The NameError was due to something else, re-raise.
+          end
+        end
       end
 
       # Whether a method is available to templates rendered with the presenter.

data/spec/presenter_spec.rb

@@ -36,6 +36,15 @@ describe Curly::Presenter do
     it "returns nil if there is no presenter for the given path" do
       Curly::Presenter.presenter_for_path("foo/bar").should be_nil
     end
+
+    it "does not swallow exceptions" do
+      error = NameError.new("omg!", :baz)
+      String.any_instance.stub(:constantize).and_raise(error)
+
+      expect do
+        Curly::Presenter.presenter_for_path("foo/bar")
+      end.to raise_error(NameError)
+    end
   end
 
   describe ".version" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-29 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: -673817575168436386
+      hash: 3185475346795496979
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: