stache 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 0.2.0
+
+* Patch to properly reraise NameError/LoadError that occurs upon loading a Stache::View

data/lib/stache/handler.rb

@@ -8,13 +8,13 @@ module Stache
     if Stache::Util.needs_compilable?
       include Stache::Util.av_template_class(:Handlers)::Compilable
     end
-    
+
     # Thanks to Mustache::Rails3 for getting us most of the way home here
     def compile(template)
       #
       # get a custom Mustache, or the default Stache::View
       mustache_class = mustache_class_from_template(template)
-    
+
       # Return a string that will be eval'd in the context of the ActionView, ugly, but it works.
       <<-MUSTACHE
         mustache = ::#{mustache_class}.new
@@ -25,15 +25,15 @@ module Stache
         mustache.context.update(local_assigns)
         variables = controller.instance_variable_names
         variables -= %w[@template]
-  
+
         if controller.respond_to?(:protected_instance_variables)
           variables -= controller.protected_instance_variables
         end
-  
+
         variables.each do |name|
           mustache.instance_variable_set(name, controller.instance_variable_get(name))
         end
-  
+
         # Declaring an +attr_reader+ for each instance variable in the
         # Stache::View subclass makes them available to your templates.
         mustache.class.class_eval do
@@ -43,7 +43,7 @@ module Stache
         mustache.render.html_safe
       MUSTACHE
     end
-  
+
     # In Rails 3.1+, #call takes the place of #compile
     def self.call(template)
       new.compile(template)
@@ -54,10 +54,15 @@ module Stache
       const_name = ActiveSupport::Inflector.camelize(template.virtual_path.to_s)
       begin
         const_name.constantize
-      rescue NameError, LoadError
-        Stache::View
+      rescue NameError, LoadError => e
+        # Only rescue NameError/LoadError concerning our mustache_class
+        if e.message.match(/#{const_name}$/)
+          Stache::View
+        else
+          raise e
+        end
       end
     end
 
   end
-end
+end

data/lib/stache/version.rb

@@ -1,3 +1,3 @@
 module Stache
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/stache/handler_spec.rb

@@ -25,5 +25,17 @@ describe Stache::Handler do
     it "retuns Stache::View if it can't find none" do
       @handler.mustache_class_from_template(@template).should == Stache::View
     end
+    it "reraises error if loaded mustache_class raises a NameError" do
+      @template.stub!(:virtual_path).and_return("profiles/index")
+      module Profiles; end
+      # Emulate autoload behavior so the error gets raised upon const_get
+      Profiles.autoload :Index, File.join(File.dirname(__FILE__), "profile_autoload.rb")
+
+      lambda {
+        @handler.mustache_class_from_template(@template)
+      }.should raise_error(NameError, "uninitialized constant Profiles::Index::Foo")
+
+      Object.send(:remove_const, :Profiles)
+    end
   end
-end
+end

data/spec/stache/profile_autoload.rb

@@ -0,0 +1,6 @@
+# This file is intended to raise a NameError upon require
+module Profiles
+  class Index < Stache::View
+    include Foo
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: stache
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Wilson
@@ -14,7 +14,6 @@ date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +43,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +54,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +65,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bueller
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +76,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +87,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,6 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id008
 description: A rails 3.x compatible template handler, configurable.
 email: mhw@hypomodern.com
@@ -114,6 +114,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -167,6 +168,7 @@ files:
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb
 - spec/stache/handler_spec.rb
+- spec/stache/profile_autoload.rb
 - spec/stache/util_spec.rb
 - spec/stache/view_spec.rb
 - spec/stache_spec.rb
@@ -184,6 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 542671315864466060
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -240,6 +245,7 @@ test_files:
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb
 - spec/stache/handler_spec.rb
+- spec/stache/profile_autoload.rb
 - spec/stache/util_spec.rb
 - spec/stache/view_spec.rb
 - spec/stache_spec.rb