massimo 0.8.0 → 0.8.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    massimo (0.7.5)
+    massimo (0.8.0)
       activesupport (~> 3.0.0)
       i18n (~> 0.4.0)
       rack (~> 1.2.0)

data/lib/massimo/site.rb

@@ -79,7 +79,7 @@ module Massimo
     
       def add_template_scope_extensions(scope)
         @template_scope_extensions.each do |extension|
-          scope.extend(extension)
+          scope.extend(extension) if extension.instance_of?(Module)
         end
       end
     
@@ -92,9 +92,8 @@ module Massimo
         
         if constants = cache[:constants]
           constants.each do |const|
-            if (helper = const.to_s.constantize rescue nil)
-              scope.extend(helper)
-            end
+            helper = const.to_s.constantize rescue nil
+            scope.extend(helper) if helper.instance_of?(Module)
           end
         end
       end

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/spec/massimo/site_spec.rb

@@ -184,6 +184,18 @@ describe Massimo::Site do
         Massimo.site.template_scope.cycle.should == 'even'
       end
     end
+    
+    context 'with a Class' do
+      it 'does not extend the template scope' do
+        class CycleClass
+          def does_not_cycle
+            'even'
+          end
+        end
+        Massimo.site.helpers CycleClass
+        Massimo.site.template_scope.should_not respond_to(:does_not_cycle)
+      end
+    end
   end
   
   describe '#process' do
@@ -294,6 +306,22 @@ describe Massimo::Site do
           }.to raise_error
         end
       end
+      
+      context 'with a class' do
+        it 'does not extend the template scope' do
+          content = <<-CONTENT.unindent
+            class SomeClass
+              def not_a_helper_method
+                'working'
+              end
+            end
+          CONTENT
+          with_file 'helpers/some_class.rb', content do
+            Massimo.site.process
+            Massimo.site.template_scope.should_not respond_to(:not_a_helper_method)
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -06:00
+date: 2011-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency