lib/caboose/acts/paranoid_find_wrapper.rb @@ -27,4 +27,8 @@ class << ActiveRecord::Base alias_method :has_many, :has_many_without_deleted alias_method :exists_with_deleted?, :exists? end -ActiveRecord::Base.send :include, Caboose::Acts::Paranoid \ No newline at end of file +ActiveRecord::Base.send :include, Caboose::Acts::Paranoid +ActiveRecord::Base.send :include, Caboose::Acts::ParanoidFindWrapper +class << ActiveRecord::Base + alias_method_chain :acts_as_paranoid, :find_wrapper +end init.rb @@ -16,9 +16,6 @@ module Caboose #:nodoc: # Widget.find_with_deleted(:all) # # SELECT * FROM widgets # - # Widget.find(:all, :with_deleted => true) - # # SELECT * FROM widgets - # # Widget.find_only_deleted(:all) # # SELECT * FROM widgets WHERE widgets.deleted_at IS NOT NULL # lib/caboose/acts/paranoid.rb @@ -42,6 +42,16 @@ end class ParanoidTest < Test::Unit::TestCase fixtures :widgets, :categories, :categories_widgets, :tags, :taggings + def test_should_recognize_with_deleted_option + assert_equal [1, 2], Widget.find(:all, :with_deleted => true).collect { |w| w.id } + assert_equal [1], Widget.find(:all, :with_deleted => false).collect { |w| w.id } + end + + def test_should_recognize_only_deleted_option + assert_equal [2], Widget.find(:all, :only_deleted => true).collect { |w| w.id } + assert_equal [1], Widget.find(:all, :only_deleted => false).collect { |w| w.id } + end + def test_should_exists_with_deleted assert Widget.exists_with_deleted?(2) assert !Widget.exists?(2) test/paranoid_test.rb b41975082dd9ed2f1e23d053c4abde25f0cda2d8 Diego Algorta diego@oboxodo.com http://github.com/technoweenie/acts_as_paranoid/commit/c947a854fbb9ef00607b4a8acb236ceff1e960dd c947a854fbb9ef00607b4a8acb236ceff1e960dd 2008-08-29T23:25:15-07:00 2008-08-29T23:18:16-07:00 Add ParanoidFindWrapper This module adds a wrapper around rails' find method so it would actualy recognize acts_as_paranoid specific options :with_deleted and :only_deleted. It could be merged directly into paranoid.rb, but opted not to pollute it with this rather optional functionality. 451aed1771fa60a67511461a67a13ab08f96f009 Diego Algorta diego@oboxodo.com