acts_as_paranoid 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.1.5* (22 Sep 2005)
+
+* Fixed bug where acts_as_paranoid would clobber other constrains
+* Simplified acts_as_paranoid mixin including.
+
 *0.1.4* (18 Sep 2005)
 
 * First RubyForge release

data/README

@@ -3,16 +3,24 @@
 Overrides some basic methods for the current model so that calling #destroy sets a 'deleted_at' field to the 
 current timestamp.  ActiveRecord is required.
 
-== Install
+== Resources
 
-Gem installation:
+Install
 
-  gem install acts_as_paranoid
-  
-Download: 
+* gem install acts_as_paranoid
 
-  http://rubyforge.org/projects/ar-paranoid/
+Rubyforge project
 
-== Documentation
+* http://rubyforge.org/projects/ar-paranoid
 
-RDocs are online at http://ar-paranoid.rubyforge.org
+RDocs
+
+* http://ar-paranoid.rubyforge.org
+
+Subversion
+
+* http://techno-weenie.net/svn/projects/acts_as_paranoid
+
+Collaboa
+
+* http://collaboa.techno-weenie.net/repository/browse/acts_as_paranoid

data/lib/acts_as_paranoid.rb

@@ -40,15 +40,14 @@ module ActiveRecord #:nodoc:
 
       module ClassMethods
         def acts_as_paranoid
-          return if self.included_modules.include?(ActiveRecord::Acts::Paranoid::ParanoidMethods) # don't let AR call this twice
-          class_eval do
+          unless self.included_modules.include?(ActiveRecord::Acts::Paranoid::ParanoidMethods) # don't let AR call this twice
             alias_method :destroy_without_callbacks!, :destroy_without_callbacks
             class << self
               alias_method :original_find, :find
               alias_method :count_with_deleted, :count
             end
-            include ParanoidMethods
           end
+          include ParanoidMethods
         end
       end
     
@@ -63,11 +62,7 @@ module ActiveRecord #:nodoc:
             call_original_find = lambda { original_find(*(args << options)) }
             
             if !options[:with_deleted]
-              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}"
-              constrain(:conditions => constrains) { return call_original_find.call }
+              constrain(scope_constrains.merge(:conditions => deleted_constrain)) { return call_original_find.call }
             end
             
             call_original_find.call
@@ -78,7 +73,14 @@ module ActiveRecord #:nodoc:
           end
 
           def count(conditions = nil, joins = nil)
-            constrain(:conditions => "#{table_name}.deleted_at IS NULL") { count_with_deleted(conditions, joins) }
+            constrain(scope_constrains.merge(:conditions => deleted_constrain)) { count_with_deleted(conditions, joins) }
+          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}"
           end
         end
 

data/test/paranoid_test.rb

@@ -77,4 +77,16 @@ class ParanoidTest < Test::Unit::TestCase
     Widget.class_eval { acts_as_paranoid }
     assert Widget.find(1)
   end
+
+  def test_should_not_override_constrains_when_counting
+    assert_equal 1, Widget.constrain(:conditions => "title = 'widget 1'") { Widget.count }
+    assert_equal 0, Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.count }
+    assert_equal 1, Widget.constrain(:conditions => "title = 'deleted widget 2'") { Widget.count_with_deleted }
+  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 }
+  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.4
-date: 2005-09-18
+  version: 0.1.5
+date: 2005-09-22
 summary: acts_as_paranoid keeps models from actually being deleted by setting a deleted_at field.
 require_paths: 
   - lib