Merge pull request #18 from sobrinho/class_attribute

Class attribute
heartcombo · May 31, 2011 · 3d0854a · 3d0854a
2 parents 836cf44 + 0112ebb
commit 3d0854a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/has_scope.rb b/lib/has_scope.rb
@@ -12,7 +12,7 @@ def self.included(base)
     base.class_eval do
       extend ClassMethods
       helper_method :current_scopes
-      class_inheritable_hash :scopes_configuration, :instance_writer => false
+      class_attribute :scopes_configuration, :instance_writer => false
     end
   end
 
@@ -79,11 +79,11 @@ def has_scope(*scopes, &block)
       options[:only]   = Array(options[:only])
       options[:except] = Array(options[:except])
 
-      self.scopes_configuration ||= {}
+      self.scopes_configuration = (self.scopes_configuration || {}).dup
 
       scopes.each do |scope|
         self.scopes_configuration[scope] ||= { :as => scope, :type => :default, :block => block }
-        self.scopes_configuration[scope].merge!(options)
+        self.scopes_configuration[scope] = self.scopes_configuration[scope].merge(options)
       end
     end
   end

diff --git a/test/has_scope_test.rb b/test/has_scope_test.rb
@@ -48,6 +48,15 @@ def default_render
     end
 end
 
+class BonsaisController < TreesController
+  has_scope :categories, :if => :categories?
+
+  protected
+    def categories?
+      false
+    end
+end
+
 class HasScopeTest < ActionController::TestCase
   tests TreesController
 
@@ -222,6 +231,11 @@ def test_scope_with_other_block_types
      assert_equal({ :by_category => 'for' }, current_scopes)
    end
 
+   def test_overwritten_scope
+     assert_nil(TreesController.scopes_configuration[:categories][:if])
+     assert_equal(:categories?, BonsaisController.scopes_configuration[:categories][:if])
+   end
+
   protected
 
     def mock_tree(stubs={})