deactivatable 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/deactivatable.rb

@@ -35,12 +35,20 @@ module ActiveRecord
         # Yields to a block, executing that block after removing the deactivated_at scope.
         #
         def with_deactivated_objects_scope
-          with_exclusive_scope do
+          remove_deactivated_objects_scope do
             with_scope(:find => {:conditions => "`#{self.table_name}`.`deactivated_at` IS NOT NULL"}) do
               yield
             end
           end
         end
+        
+        # Remove any scope related to deactivated_at and yield.
+        #
+        def remove_deactivated_objects_scope          
+          with_exclusive_scope(scoped_methods_without_deactivated_at_scope) do
+            yield
+          end          
+        end
 
         private
         # Scan the reflection associations defined on the current class,
@@ -58,6 +66,10 @@ module ActiveRecord
             @deactivatable_options[:dependencies] << reflection_name
           end          
         end
+        
+        def scoped_methods_without_deactivated_at_scope
+          scoped_methods.reject {|m| m.values.map {|v| v.keys.first}.include?(:deactivated_at) }
+        end
 
       end
 

data/test/deactivatable_test.rb

@@ -53,6 +53,10 @@ class DeactivatableTest < Test::Unit::TestCase
       assert @inactive_item.deactivated?
     end
     
+    should "be findable using the remove_deactivated_objects_scope" do
+      assert DeactivatableItem.remove_deactivated_objects_scope { DeactivatableItem.exists?(@inactive_item.id) }
+    end
+    
     context "when activated" do
       setup do
         @inactive_item.activate!
@@ -61,6 +65,10 @@ class DeactivatableTest < Test::Unit::TestCase
       should "be findable" do
         assert DeactivatableItem.exists?(@inactive_item.id)
       end
+    
+      should "be findable using the remove_deactivated_objects_scope" do
+       assert DeactivatableItem.remove_deactivated_objects_scope { DeactivatableItem.exists?(@inactive_item.id) }
+      end
     end #when reactivated    
   end #An inactive item, @inactive_item
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deactivatable
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Greg Fitzgerald
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -05:00
+date: 2009-11-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency