acts_as_paranoid 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.6* (25 Sep 2005)
+
+* Fixed bug where nested constrains would get clobbered after multiple queries
+
 *0.1.5* (22 Sep 2005)
 
 * Fixed bug where acts_as_paranoid would clobber other constrains

data/lib/acts_as_paranoid.rb

@@ -53,6 +53,9 @@ module ActiveRecord #:nodoc:
     
       module ParanoidMethods #:nodoc:
         def self.included(base) # :nodoc:
+          class << base
+            alias_method :clobbering_constrain, :constrain
+          end
           base.extend ClassMethods
         end
       
@@ -75,12 +78,32 @@ module ActiveRecord #:nodoc:
           def count(conditions = nil, joins = nil)
             constrain(scope_constrains.merge(:conditions => deleted_constrain)) { count_with_deleted(conditions, joins) }
           end
-          
+
+          # Override #constrain so that nested constrains don't clobber each other.
+          #
+          #   Entry.constrain(:conditions => 'published_at IS NOT NULL') do
+          #     Entry.constrain(:conditions => 'deleted_at IS NULL') do
+          #       Entry.find(:all)
+          #     end
+          #   end
+          def constrain(options = {}, &block)
+            begin
+              is_new_scope = scope_constrains.empty?
+              self.scope_constrains = options
+              block.call if block_given?
+            ensure 
+              self.scope_constrains = nil if is_new_scope
+            end
+          end
+
           protected
           def deleted_constrain
-            constrain = "#{table_name}.deleted_at IS NULL"
-            constrains = (scope_constrains.nil? or scope_constrains[:conditions].nil? or scope_constrains[:conditions] == constrain) ?
-              constrain : "#{scope_constrains[:conditions]} AND #{constrain}"
+            deleted_cond = "#{table_name}.deleted_at IS NULL"
+            case scope_constrains[:conditions]
+              when /#{deleted_cond}/ then scope_constrains[:conditions]
+              when NilClass then deleted_cond
+              else "#{scope_constrains[:conditions]} AND #{deleted_cond}"
+            end
           end
         end
 

data/test/paranoid_test.rb

@@ -85,8 +85,32 @@ class ParanoidTest < Test::Unit::TestCase
   end
 
   def test_should_not_override_constrains_when_finding
-    assert_equal [1], Widget.constrain(:conditions => "title = 'widget 1'") { Widget.find(:all) }.collect { |w| w.id }
-    assert_equal [],  Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find(:all) }.collect { |w| w.id }
-    assert_equal [2], Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find_with_deleted(:all) }.collect { |w| w.id }
+    assert_equal [1], Widget.constrain(:conditions => "title = 'widget 1'") { Widget.find(:all) }.ids
+    assert_equal [],  Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find(:all) }.ids
+    assert_equal [2], Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.find_with_deleted(:all) }.ids
+  end
+
+  def test_should_allow_multiple_constrained_calls_when_finding
+    Widget.constrain(:conditions => "title = 'deleted widget 2'") do
+      assert_equal [2], Widget.find_with_deleted(:all).ids
+      assert_equal [2], Widget.find_with_deleted(:all).ids, "clobbers the constrain on the unmodified find"
+      assert_equal [], Widget.find(:all).ids
+      assert_equal [], Widget.find(:all).ids, 'clobbers the constrain on a paranoid find'
+    end
+  end
+
+  def test_should_allow_multiple_constrained_calls_when_counting
+    Widget.constrain(:conditions => "title = 'deleted widget 2'") do
+      assert_equal 1, Widget.count_with_deleted
+      assert_equal 1, Widget.count_with_deleted, "clobbers the constrain on the unmodified find"
+      assert_equal 0, Widget.count
+      assert_equal 0, Widget.count, 'clobbers the constrain on a paranoid find'
+    end
+  end
+end
+
+class Array
+  def ids
+    collect { |i| i.id }
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2005-09-22
+  version: 0.1.6
+date: 2005-09-25
 summary: acts_as_paranoid keeps models from actually being deleted by setting a deleted_at field.
 require_paths: 
   - lib