jcnetdev-acts_as_paranoid 1.1.20080706 → 1.2.20080706

data/acts_as_paranoid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'acts_as_paranoid'
-  s.version = '1.1.20080706'
+  s.version = '1.2.20080706'
   s.date = '2008-07-06'
   
   s.summary = "Allows ActiveRecord models to delete, without actually deleting."

data/lib/caboose/acts/paranoid.rb

@@ -51,6 +51,10 @@ module Caboose #:nodoc:
       module ClassMethods
         def acts_as_paranoid(options = {})
           unless paranoid? # don't let AR call this twice
+            class << self
+              VALID_FIND_OPTIONS << :with_deleted unless VALID_FIND_OPTIONS.include?(:with_deleted)
+            end
+            ActiveRecord::Calculations::CALCULATIONS_OPTIONS << :with_deleted unless ActiveRecord::Calculations::CALCULATIONS_OPTIONS.include?(:with_deleted)
             cattr_accessor :deleted_attribute
             self.deleted_attribute = options[:with] || :deleted_at
             alias_method :destroy_without_callbacks!, :destroy_without_callbacks
@@ -59,6 +63,9 @@ module Caboose #:nodoc:
               alias_method :calculate_with_deleted,     :calculate
               alias_method :delete_all!,                :delete_all
             end
+            if ActiveRecord::Base.respond_to?(:named_scope)
+              named_scope :with_deleted, lambda { |with_deleted| (with_deleted == true) ? { :with_deleted => true } : {} }
+            end
           end
           include InstanceMethods
         end
@@ -113,7 +120,11 @@ module Caboose #:nodoc:
             end
 
             def with_deleted_scope(&block)
-              with_scope({:find => { :conditions => ["#{table_name}.#{deleted_attribute} IS NULL OR #{table_name}.#{deleted_attribute} > ?", current_time] } }, :merge, &block)
+              unless current_scoped_methods.is_a?(Hash) && current_scoped_methods[:find].is_a?(Hash) && current_scoped_methods[:find][:with_deleted] == true
+                with_scope({:find => { :conditions => ["#{table_name}.#{deleted_attribute} IS NULL OR #{table_name}.#{deleted_attribute} > ?", current_time] } }, :merge, &block)
+              else
+                with_scope(&block)
+              end
             end
 
           private

data/rails/init.rb

@@ -1,30 +1 @@
-class << ActiveRecord::Base
-  def belongs_to_with_deleted(association_id, options = {})
-    with_deleted = options.delete :with_deleted
-    returning belongs_to_without_deleted(association_id, options) do
-      if with_deleted
-        reflection = reflect_on_association(association_id)
-        association_accessor_methods(reflection,            Caboose::Acts::BelongsToWithDeletedAssociation)
-        association_constructor_method(:build,  reflection, Caboose::Acts::BelongsToWithDeletedAssociation)
-        association_constructor_method(:create, reflection, Caboose::Acts::BelongsToWithDeletedAssociation)
-      end
-    end
-  end
-  
-  def has_many_without_deleted(association_id, options = {}, &extension)
-    with_deleted = options.delete :with_deleted
-    returning has_many_with_deleted(association_id, options, &extension) do
-      if options[:through] && !with_deleted
-        reflection = reflect_on_association(association_id)
-        collection_reader_method(reflection, Caboose::Acts::HasManyThroughWithoutDeletedAssociation)
-        collection_accessor_methods(reflection, Caboose::Acts::HasManyThroughWithoutDeletedAssociation, false)
-      end
-    end
-  end
-  
-  alias_method_chain :belongs_to, :deleted
-  alias_method :has_many_with_deleted, :has_many
-  alias_method :has_many, :has_many_without_deleted
-  alias_method :exists_with_deleted?, :exists?
-end
-ActiveRecord::Base.send :include, Caboose::Acts::Paranoid
+require 'acts_as_paranoid'

data/test/paranoid_test.rb

@@ -45,12 +45,21 @@ class ParanoidTest < Test::Unit::TestCase
   def test_should_exists_with_deleted
     assert Widget.exists_with_deleted?(2)
     assert !Widget.exists?(2)
+    if NAMED_SCOPE_TESTS
+      assert Widget.with_deleted(true).exists?(2)
+      assert !Widget.with_deleted(false).exists?(2)
+    end
   end
 
   def test_should_count_with_deleted
     assert_equal 1, Widget.count
     assert_equal 2, Widget.count_with_deleted
     assert_equal 2, Widget.calculate_with_deleted(:count, :all)
+    if NAMED_SCOPE_TESTS
+      assert_equal 1, Widget.with_deleted(false).count
+      assert_equal 2, Widget.with_deleted(true).count
+      assert_equal 2, Widget.with_deleted(true).calculate_with_deleted(:count, :all)
+    end
   end
 
   def test_should_set_deleted_at
@@ -174,12 +183,20 @@ class ParanoidTest < Test::Unit::TestCase
     assert_equal 1, Widget.send(:with_scope, :find => { :conditions => "title = 'widget 1'" }) { Widget.count }
     assert_equal 0, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.count }
     assert_equal 1, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.calculate_with_deleted(:count, :all) }
+    if NAMED_SCOPE_TESTS
+      assert_equal 1, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.with_deleted(true).count }
+      assert_equal 0, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.with_deleted(false).count }
+    end
   end
 
   def test_should_not_override_scopes_when_finding
     assert_equal [1], Widget.send(:with_scope, :find => { :conditions => "title = 'widget 1'" }) { Widget.find(:all) }.ids
     assert_equal [],  Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find(:all) }.ids
     assert_equal [2], Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find_with_deleted(:all) }.ids
+    if NAMED_SCOPE_TESTS
+      assert_equal [2], Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.with_deleted(true).find(:all) }.ids
+      assert_equal [], Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.with_deleted(false).find(:all) }.ids
+    end
   end
 
   def test_should_allow_multiple_scoped_calls_when_finding
@@ -197,6 +214,12 @@ class ParanoidTest < Test::Unit::TestCase
       assert_equal 1, Widget.calculate_with_deleted(:count, :all), "clobbers the constrain on the unmodified find"
       assert_equal 0, Widget.count
       assert_equal 0, Widget.count, 'clobbers the constrain on a paranoid find'
+      if NAMED_SCOPE_TESTS
+        assert_equal 1, Widget.with_deleted(true).calculate(:count, :all)
+        assert_equal 1, Widget.with_deleted(true).calculate(:count, :all), "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
 

data/test/test_helper.rb

@@ -9,6 +9,8 @@ config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
 
+NAMED_SCOPE_TESTS = ActiveRecord::Base.respond_to?(:named_scope)
+
 load(File.dirname(__FILE__) + "/schema.rb")
 
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcnetdev-acts_as_paranoid
 version: !ruby/object:Gem::Version 
-  version: 1.1.20080706
+  version: 1.2.20080706
 platform: ruby
 authors: 
 - Rick Olson