acts_as_paranoid 0.1.6 → 0.1.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.7* (22 Oct 2005)
+
+* Added :with_deleted as a valid option of ActiveRecord::Base#find
+
 *0.1.6* (25 Sep 2005)
 
 * Fixed bug where nested constrains would get clobbered after multiple queries

data/lib/acts_as_paranoid.rb

@@ -40,7 +40,7 @@ module ActiveRecord #:nodoc:
 
       module ClassMethods
         def acts_as_paranoid
-          unless self.included_modules.include?(ActiveRecord::Acts::Paranoid::ParanoidMethods) # don't let AR call this twice
+          unless self.included_modules.include?(ParanoidMethods) # don't let AR call this twice
             alias_method :destroy_without_callbacks!, :destroy_without_callbacks
             class << self
               alias_method :original_find, :find
@@ -105,6 +105,10 @@ module ActiveRecord #:nodoc:
               else "#{scope_constrains[:conditions]} AND #{deleted_cond}"
             end
           end
+          
+          def validate_find_options(options)
+            options.assert_valid_keys [:conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :with_deleted]
+          end
         end
 
         def destroy_without_callbacks

data/test/paranoid_test.rb

@@ -1,9 +1,9 @@
 require 'abstract_unit'
 
 class Widget < ActiveRecord::Base
+  acts_as_paranoid
   has_many :categories, :dependent => true
   has_and_belongs_to_many :habtm_categories, :class_name => 'Category'
-  acts_as_paranoid
 end
 
 class Category < ActiveRecord::Base

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.6
-date: 2005-09-25
+  version: 0.1.7
+date: 2005-10-22
 summary: acts_as_paranoid keeps models from actually being deleted by setting a deleted_at field.
 require_paths: 
   - lib