acts_as_paranoid 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57c69c6d7676bda21b0f8da016bd556f77003894
-  data.tar.gz: 5293e8a3b417fecdfe117aefddcd8e2a0d2f4b09
+  metadata.gz: 59510a8af45d737dccea2ee97aa62553790c49a2
+  data.tar.gz: d9b52994074e903a7b9d7f4d88f5113d37039f12
 SHA512:
-  metadata.gz: 8ae49e59c2f487c80243bb42c4d6e33c4f1676ecd0d039ba420c1e1e49e02b83a4c6635515d1ef53dd4ba0c68ebce427b386ce684992d4139ef2e4c638f61dd5
-  data.tar.gz: f449a10feae541515688ed6c55446aa815025982f293a2375c44ec74b68a8cfe7928abc1dffee3758a868bca4d6d92eb13632642bb0dc40279d47e5973a7bfb0
+  metadata.gz: 75b9853cab16dbce9e96a8976b0337e01fce18b38273e087ec68c39eae4fe3b4d2b347f1ead9f147226db2bced977eee5c4ae5a87658208737ae8ec9bd8e7d25
+  data.tar.gz: 3f6f6a1337fe18092b37f84de3bb08740ab971fa55cb7fb9cb5d7db5551275d498079f8ba38b6cf282e069d529fb0bd32e6765fc364b71dbca23dab90e542d42

data/README.md

@@ -1,10 +1,16 @@
 # ActsAsParanoid
 
-[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=0-4-stable)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
+[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=master)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
 
-A simple plugin which hides records instead of deleting them, being able to recover them.
+A Rails plugin to add soft delete.
 
-**This branch targets Rails 3.2.** If you're working with another version, switch to the corresponding branch.
+This gem can be used to hide records instead of deleting them, making them recoverable later.
+
+## Support
+
+**This branch targets Rails 4.x. and 5.x**
+
+If you're working with another version, switch to the corresponding branch, or require an older version of the `acts_as_paranoid` gem.
 
 ## Usage
 
@@ -31,12 +37,18 @@ The values shown are the defaults. While *column* can be anything (as long as it
 
 If your column type is a `string`, you can also specify which value to use when marking an object as deleted by passing `:deleted_value` (default is "deleted"). Any records with a non-matching value in this column will be treated normally (ie: not deleted).
 
+If your column type is a `boolean`, it is possible to specify `allow_nulls` option which is `true` by default. When set to `false`, entities that have `false` value in this column will be considered not deleted, and those which have `true` will be considered deleted. When `true` everything that has a not-null value will be considered deleted.
+
 ### Filtering
 
-If a record is deleted by ActsAsParanoid, it won't be retrieved when accessing the database. So, `Paranoiac.all` will **not** include the deleted_records. if you want to access them, you have 2 choices:
+If a record is deleted by ActsAsParanoid, it won't be retrieved when accessing the database.
+
+So, `Paranoiac.all` will **not** include the **deleted records**.
+
+When you want to access them, you have 2 choices:
 
 ```ruby
-Paranoiac.only_deleted # retrieves the deleted records
+Paranoiac.only_deleted # retrieves only the deleted records
 Paranoiac.with_deleted # retrieves all records, deleted or not
 ```
 
@@ -61,7 +73,13 @@ paranoiac.destroy!
 Paranoiac.delete_all!(conditions)
 ```
 
-You can also permanently delete a record by calling `destroy` or `delete_all` on it **twice**. If a record was already deleted (hidden by ActsAsParanoid) and you delete it again, it will be removed from the database. Take this example:
+You can also permanently delete a record by calling `destroy_fully!` on the object.
+
+Alternatively you can permanently delete a record by calling `destroy` or `delete_all` on the object **twice**.
+
+If a record was already deleted (hidden by `ActsAsParanoid`) and you delete it again, it will be removed from the database.
+
+Take this example:
 
 ```ruby
 p = Paranoiac.first
@@ -77,7 +95,9 @@ Recovery is easy. Just invoke `recover` on it, like this:
 Paranoiac.only_deleted.where("name = ?", "not dead yet").first.recover
 ```
 
-All associations marked as `:dependent => :destroy` are also recursively recovered. If you would like to disable this behavior, you can call `recover` with the `recursive` option:
+All associations marked as `:dependent => :destroy` are also recursively recovered.
+
+If you would like to disable this behavior, you can call `recover` with the `recursive` option:
 
 ```ruby
 Paranoiac.only_deleted.where("name = ?", "not dead yet").first.recover(:recursive => false)
@@ -91,7 +111,13 @@ class Paranoiac < ActiveRecord::Base
 end
 ```
 
-By default, dependent records will be recovered if they were deleted within 2 minutes of the object upon which they depend.  This restores the objects to the state before the recursive deletion without restoring other objects that were deleted earlier.  The behavior is only available when both parent and dependant are using timestamp fields to mark deletion, which is the default behavior. This window can be changed with the `dependent_recovery_window` option:
+By default, dependent records will be recovered if they were deleted within 2 minutes of the object upon which they depend.
+
+This restores the objects to the state before the recursive deletion without restoring other objects that were deleted earlier.
+
+The behavior is only available when both parent and dependant are using timestamp fields to mark deletion, which is the default behavior.
+
+This window can be changed with the `dependent_recovery_window` option:
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
@@ -119,9 +145,9 @@ ActiveRecord's built-in uniqueness validation does not account for records delet
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
-    acts_as_paranoid
-  	validates_as_paranoid
-  	validates_uniqueness_of_without_deleted :name
+  acts_as_paranoid
+  validates_as_paranoid
+  validates_uniqueness_of_without_deleted :name
 end
 
 p1 = Paranoiac.create(:name => 'foo')
@@ -144,13 +170,15 @@ Paranoiac.with_deleted.first.deleted? #=> true
 
 ### Scopes
 
-As you've probably guessed, `with_deleted` and `only_deleted` are scopes. You can, however, chain them freely with other scopes you might have. This
+As you've probably guessed, `with_deleted` and `only_deleted` are scopes. You can, however, chain them freely with other scopes you might have.
+
+For example:
 
 ```ruby
 Paranoiac.pretty.with_deleted
 ```
 
-is exactly the same as
+This is exactly the same as:
 
 ```ruby
 Paranoiac.with_deleted.pretty
@@ -160,8 +188,8 @@ You can work freely with scopes and it will just work:
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
-	acts_as_paranoid
-	scope :pretty, where(:pretty => true)
+  acts_as_paranoid
+  scope :pretty, where(:pretty => true)
 end
 
 Paranoiac.create(:pretty => true)
@@ -179,7 +207,9 @@ Paranoiac.pretty.only_deleted.count #=> 1
 
 ### Associations
 
-Associations are also supported. From the simplest behaviors you'd expect to more nifty things like the ones mentioned previously or the usage of the `:with_deleted` option with `belongs_to`
+Associations are also supported.
+
+From the simplest behaviors you'd expect to more nifty things like the ones mentioned previously or the usage of the `:with_deleted` option with `belongs_to`
 
 ```ruby
 class Parent < ActiveRecord::Base
@@ -191,7 +221,7 @@ class ParanoiacChild < ActiveRecord::Base
   belongs_to :parent
 
   # You may need to provide a foreign_key like this
-  belongs_to :parent_including_deleted, :class_name => "Parent", foreign_key => 'parent_id', :with_deleted => true
+  belongs_to :parent_including_deleted, :class_name => "Parent", :foreign_key => 'parent_id', :with_deleted => true
 end
 
 parent = Parent.first
@@ -212,32 +242,9 @@ Watch out for these caveats:
 -   You cannot name association `*_with_deleted`
 -   `unscoped` will return all records, deleted or not
 
-# Support
-
-This gem supports the most recent versions of Rails and Ruby.
-
-## Rails
-
-For Rails 3.2 check the README at the [rails3.2](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.2) branch and add this to your Gemfile:
-
-    gem "acts_as_paranoid", "~> 0.4.0"
-
-For Rails 3.1 check the README at the [rails3.1](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.1) branch and add this to your Gemfile:
-
-    gem "rails3_acts_as_paranoid", "~>0.1.4"
-
-For Rails 3.0 check the README at the [rails3.0](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.0) branch and add this to your Gemfile:
-
-    gem "rails3_acts_as_paranoid", "~>0.0.9"
-
-
-## Ruby
-
-This gem is tested on Ruby 1.9, JRuby and Rubinius (both in 1.9 mode).
-
-
 # Acknowledgements
 
+* To [Rick Olson](https://github.com/technoweenie) for creating acts_as_paranoid
 * To [cheerfulstoic](https://github.com/cheerfulstoic) for adding recursive recovery
 * To [Jonathan Vaught](https://github.com/gravelpup) for adding paranoid validations
 * To [Geoffrey Hichborn](https://github.com/phene) for improving the overral code quality and adding support for after_commit
@@ -245,12 +252,9 @@ This gem is tested on Ruby 1.9, JRuby and Rubinius (both in 1.9 mode).
 * To [vikramdhillon](https://github.com/vikramdhillon) for the idea and initial implementation of support for string column type
 * To [Craig Walker](https://github.com/softcraft-development) for Rails 3.1 support and fixing various pending issues
 * To [Charles G.](https://github.com/chuckg) for Rails 3.2 support and for making a desperately needed global code refactoring
+* To [Gonçalo Silva](https://github.com/goncalossilva) for supporting this gem prior to v0.4.3
+* To [Jean Boussier](https://github.com/byroot) for initial Rails 4.0.0 support
+* To [Matijs van Zuijlen](https://github.com/mvz) for Rails 4.1 and 4.2 support
+* To [Andrey Ponomarenko](https://github.com/sjke) for Rails 5 support
 
-## Credits
-
-This plugin was inspired by [acts_as_paranoid](http://github.com/technoweenie/acts_as_paranoid) and [acts_as_active](http://github.com/fernandoluizao/acts_as_active).
-
-While porting it to Rails 3, I decided to apply the ideas behind those plugins to an unified solution while removing a **lot** of the complexity found in them. I eventually ended up writing a new plugin from scratch.
-
-
-Copyright © 2014 Zachary Scott, Gonçalo Silva, Rick Olson, released under the MIT license
+See `LICENSE`.

data/lib/acts_as_paranoid/associations.rb

@@ -8,12 +8,17 @@ module ActsAsParanoid
     end
 
     module ClassMethods
-      def belongs_to_with_deleted(target, options = {})
-        with_deleted = options.delete(:with_deleted)
-        result = belongs_to_without_deleted(target, options)
+      def belongs_to_with_deleted(target, scope = nil, options = {})
+        with_deleted = (scope.is_a?(Hash) ? scope : options).delete(:with_deleted)
+        result = belongs_to_without_deleted(target, scope, options)
 
         if with_deleted
-          result.options[:with_deleted] = with_deleted
+          if result.is_a? Hash
+            result.values.last.options[:with_deleted] = with_deleted
+          else
+            result.options[:with_deleted] = with_deleted
+          end
+
           unless method_defined? "#{target}_with_unscoped"
             class_eval <<-RUBY, __FILE__, __LINE__
               def #{target}_with_unscoped(*args)

data/lib/acts_as_paranoid/core.rb

@@ -23,9 +23,11 @@ module ActsAsParanoid
 
       def only_deleted
         if string_type_with_deleted_value?
-          without_paranoid_default_scope.where("#{paranoid_column_reference} IS ?", paranoid_configuration[:deleted_value])
+          without_paranoid_default_scope.where(paranoid_column_reference => paranoid_configuration[:deleted_value])
+        elsif boolean_type_not_nullable?
+          without_paranoid_default_scope.where(paranoid_column_reference => true)
         else
-          without_paranoid_default_scope.where("#{paranoid_column_reference} IS NOT ?", nil)
+          without_paranoid_default_scope.where.not(paranoid_column_reference => nil)
         end
       end
 
@@ -34,16 +36,17 @@ module ActsAsParanoid
       end
 
       def delete_all(conditions = nil)
-        update_all ["#{paranoid_configuration[:column]} = ?", delete_now_value], conditions
+        where(conditions).update_all(["#{paranoid_configuration[:column]} = ?", delete_now_value])
       end
 
-      def paranoid_default_scope_sql
+      def paranoid_default_scope
         if string_type_with_deleted_value?
-          self.scoped.table[paranoid_column].eq(nil).
-            or(self.scoped.table[paranoid_column].not_eq(paranoid_configuration[:deleted_value])).
-            to_sql
+          self.all.table[paranoid_column].eq(nil).
+            or(self.all.table[paranoid_column].not_eq(paranoid_configuration[:deleted_value]))
+        elsif boolean_type_not_nullable?
+          self.all.table[paranoid_column].eq(false)
         else
-          self.scoped.table[paranoid_column].eq(nil).to_sql
+          self.all.table[paranoid_column].eq(nil)
         end
       end
 
@@ -51,6 +54,10 @@ module ActsAsParanoid
         paranoid_column_type == :string && !paranoid_configuration[:deleted_value].nil?
       end
 
+      def boolean_type_not_nullable?
+        paranoid_column_type == :boolean && !paranoid_configuration[:allow_nulls]
+      end
+
       def paranoid_column
         paranoid_configuration[:column].to_sym
       end
@@ -74,8 +81,17 @@ module ActsAsParanoid
     protected
 
       def without_paranoid_default_scope
-        scope = self.scoped.with_default_scope
-        scope.where_values.delete(paranoid_default_scope_sql)
+        scope = self.all
+
+        if ActiveRecord::VERSION::MAJOR < 5
+          # ActiveRecord 4.0.*
+          scope = scope.with_default_scope if ActiveRecord::VERSION::MINOR < 1
+          scope.where_values.delete(paranoid_default_scope)
+        else
+          scope = scope.unscope(where: paranoid_default_scope)
+          # Fix problems with unscope group chain
+          scope = scope.unscoped if scope.to_sql.include? paranoid_default_scope.to_sql
+        end
 
         scope
       end
@@ -89,7 +105,7 @@ module ActsAsParanoid
       self.send(self.class.paranoid_column)
     end
 
-    def destroy!
+    def destroy_fully!
       with_transaction_returning_status do
         run_callbacks :destroy do
           destroy_dependent_associations!
@@ -101,7 +117,7 @@ module ActsAsParanoid
       end
     end
 
-    def destroy
+    def destroy!
       if !deleted?
         with_transaction_returning_status do
           run_callbacks :destroy do
@@ -112,10 +128,12 @@ module ActsAsParanoid
           end
         end
       else
-        destroy!
+        destroy_fully!
       end
     end
 
+    alias_method :destroy, :destroy!
+
     def recover(options={})
       options = {
         :recursive => self.class.paranoid_configuration[:recover_dependent_associations],
@@ -144,7 +162,7 @@ module ActsAsParanoid
         # We can only recover by window if both parent and dependant have a
         # paranoid column type of :time.
         if self.class.paranoid_column_type == :time && klass.paranoid_column_type == :time
-          scope = scope.merge(klass.deleted_inside_time_window(paranoid_value, window))
+          scope = scope.deleted_inside_time_window(paranoid_value, window)
         end
 
         scope.each do |object|
@@ -169,8 +187,13 @@ module ActsAsParanoid
     end
 
     def deleted?
-      !(paranoid_value.nil? ||
-        (self.class.string_type_with_deleted_value? && paranoid_value != self.class.delete_now_value))
+      !if self.class.string_type_with_deleted_value?
+        paranoid_value != self.class.delete_now_value || paranoid_value.nil?
+      elsif self.class.boolean_type_not_nullable?
+        paranoid_value == false
+      else
+        paranoid_value.nil?
+      end
     end
 
     alias_method :destroyed?, :deleted?

data/lib/acts_as_paranoid/preloader_association.rb

@@ -0,0 +1,15 @@
+module ActsAsParanoid
+  module PreloaderAssociation
+    def self.included(base)
+      base.class_eval do
+        def build_scope_with_deleted
+          scope = build_scope_without_deleted
+          scope = scope.with_deleted if options[:with_deleted] && klass.respond_to?(:with_deleted)
+          scope
+        end
+
+        alias_method_chain :build_scope, :deleted
+      end
+    end
+  end
+end

data/lib/acts_as_paranoid/relation.rb

@@ -21,7 +21,7 @@ module ActsAsParanoid
 
         def delete_all(conditions = nil)
           if paranoid?
-            update_all(paranoid_deletion_attributes, conditions)
+            where(conditions).update_all(paranoid_deletion_attributes)
           else
             delete_all!(conditions)
           end

data/lib/acts_as_paranoid/validations.rb

@@ -6,37 +6,76 @@ module ActsAsParanoid
       base.extend ClassMethods
     end
 
-    class UniquenessWithoutDeletedValidator < ActiveRecord::Validations::UniquenessValidator
-      def validate_each(record, attribute, value)
-        finder_class = find_finder_class_for(record)
-        table = finder_class.arel_table
+    class UniquenessWithoutDeletedValidator
+      def self.[](version)
+        version = version.to_s
+        name = "V#{version.tr('.', '_')}"
+        unless constants.include? name.to_sym
+          raise "Unknown validator version #{version.inspect}; expected one of #{constants.sort.join(', ')}"
+        end
+        const_get name
+      end
 
-        coder = record.class.serialized_attributes[attribute.to_s]
+      class V5 < ActiveRecord::Validations::UniquenessValidator
+        def validate_each(record, attribute, value)
+          finder_class = find_finder_class_for(record)
+          table = finder_class.arel_table
 
-        if value && coder
-          value = coder.dump value
-        end
+          coder = record.class.attribute_types[attribute.to_s]
+          value = coder.type_cast_for_schema value if value && coder
 
-        relation = build_relation(finder_class, table, attribute, value)
-        [Array(finder_class.primary_key), Array(record.send(:id))].transpose.each do |pk_key, pk_value|
-          relation = relation.and(table[pk_key.to_sym].not_eq(pk_value))
-        end if record.persisted?
+          relation = build_relation(finder_class, table, attribute, value)
+          [Array(finder_class.primary_key), Array(record.send(:id))].transpose.each do |pk_key, pk_value|
+            relation = relation.where(table[pk_key.to_sym].not_eq(pk_value))
+          end if record.persisted?
 
-        Array.wrap(options[:scope]).each do |scope_item|
-          scope_value = record.send(scope_item)
-          relation = relation.and(table[scope_item].eq(scope_value))
+          Array.wrap(options[:scope]).each do |scope_item|
+            relation = relation.where(table[scope_item].eq(record.public_send(scope_item)))
+          end
+
+          if relation.where(finder_class.paranoid_default_scope).where(relation).exists?
+            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+          end
         end
+      end
+
+      class V4 < ActiveRecord::Validations::UniquenessValidator
+        def validate_each(record, attribute, value)
+          finder_class = find_finder_class_for(record)
+          table = finder_class.arel_table
+
+          # TODO: Use record.class.column_types[attribute.to_s].coder ?
+          coder = record.class.column_types[attribute.to_s]
+
+          if value && coder
+            value = if coder.respond_to? :type_cast_for_database
+                      coder.type_cast_for_database value
+                    else
+                      coder.type_cast_for_write value
+                    end
+          end
+
+          relation = build_relation(finder_class, table, attribute, value)
+          [Array(finder_class.primary_key), Array(record.send(:id))].transpose.each do |pk_key, pk_value|
+            relation = relation.and(table[pk_key.to_sym].not_eq(pk_value))
+          end if record.persisted?
+
+          Array.wrap(options[:scope]).each do |scope_item|
+            scope_value = record.send(scope_item)
+            relation = relation.and(table[scope_item].eq(scope_value))
+          end
 
-        # Re-add ActsAsParanoid default scope conditions manually.
-        if finder_class.unscoped.where(finder_class.paranoid_default_scope_sql).where(relation).exists?
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+          # Re-add ActsAsParanoid default scope conditions manually.
+          if finder_class.unscoped.where(finder_class.paranoid_default_scope).where(relation).exists?
+            record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+          end
         end
       end
     end
 
     module ClassMethods
       def validates_uniqueness_of_without_deleted(*attr_names)
-        validates_with UniquenessWithoutDeletedValidator, _merge_attributes(attr_names)
+        validates_with UniquenessWithoutDeletedValidator[ActiveRecord::VERSION::MAJOR], _merge_attributes(attr_names)
       end
     end
   end

data/lib/acts_as_paranoid/version.rb

@@ -1,3 +1,3 @@
 module ActsAsParanoid
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/lib/acts_as_paranoid.rb

@@ -2,6 +2,7 @@ require 'acts_as_paranoid/core'
 require 'acts_as_paranoid/associations'
 require 'acts_as_paranoid/validations'
 require 'acts_as_paranoid/relation'
+require 'acts_as_paranoid/preloader_association'
 
 module ActsAsParanoid
 
@@ -20,6 +21,7 @@ module ActsAsParanoid
 
     self.paranoid_configuration = { :column => "deleted_at", :column_type => "time", :recover_dependent_associations => true, :dependent_recovery_window => 2.minutes }
     self.paranoid_configuration.merge!({ :deleted_value => "deleted" }) if options[:column_type] == "string"
+    self.paranoid_configuration.merge!({ :allow_nulls => true }) if options[:column_type] == "boolean"
     self.paranoid_configuration.merge!(options) # user options
 
     raise ArgumentError, "'time', 'boolean' or 'string' expected for :column_type option, got #{paranoid_configuration[:column_type]}" unless ['time', 'boolean', 'string'].include? paranoid_configuration[:column_type]
@@ -31,7 +33,7 @@ module ActsAsParanoid
     include ActsAsParanoid::Core
 
     # Magic!
-    default_scope { where(paranoid_default_scope_sql) }
+    default_scope { where(paranoid_default_scope) }
 
     if paranoid_configuration[:column_type] == 'time'
       scope :deleted_inside_time_window, lambda {|time, window|
@@ -55,3 +57,6 @@ ActiveRecord::Relation.send :include, ActsAsParanoid::Relation
 
 # Push the recover callback onto the activerecord callback list
 ActiveRecord::Callbacks::CALLBACKS.push(:before_recover, :after_recover)
+
+# Use with_deleted in preloader build_scope
+ActiveRecord::Associations::Preloader::Association.send :include, ActsAsParanoid::PreloaderAssociation

data/test/test_associations.rb

@@ -2,8 +2,6 @@ require 'test_helper'
 
 class AssociationsTest < ParanoidBaseTest
   def test_removal_with_associations
-    # This test shows that the current implementation doesn't handle
-    # assciation deletion correctly (when hard deleting via parent-object)
     paranoid_company_1 = ParanoidDestroyCompany.create! :name => "ParanoidDestroyCompany #1"
     paranoid_company_2 = ParanoidDeleteCompany.create! :name => "ParanoidDestroyCompany #1"
     paranoid_company_1.paranoid_products.create! :name => "ParanoidProduct #1"
@@ -19,19 +17,32 @@ class AssociationsTest < ParanoidBaseTest
     assert_equal 1, ParanoidDestroyCompany.with_deleted.count
     assert_equal 2, ParanoidProduct.with_deleted.count
 
-    ParanoidDestroyCompany.with_deleted.first.destroy!
+    ParanoidDestroyCompany.with_deleted.first.destroy
     assert_equal 0, ParanoidDestroyCompany.count
     assert_equal 1, ParanoidProduct.count
     assert_equal 0, ParanoidDestroyCompany.with_deleted.count
     assert_equal 1, ParanoidProduct.with_deleted.count
 
-    ParanoidDeleteCompany.with_deleted.first.destroy!
+    ParanoidDeleteCompany.first.destroy
+    assert_equal 0, ParanoidDeleteCompany.count
+    assert_equal 0, ParanoidProduct.count
+    assert_equal 1, ParanoidDeleteCompany.with_deleted.count
+    assert_equal 1, ParanoidProduct.with_deleted.count
+
+    ParanoidDeleteCompany.with_deleted.first.destroy
     assert_equal 0, ParanoidDeleteCompany.count
     assert_equal 0, ParanoidProduct.count
     assert_equal 0, ParanoidDeleteCompany.with_deleted.count
     assert_equal 0, ParanoidProduct.with_deleted.count
   end
 
+  def test_belongs_to_with_scope_option
+    paranoid_has_many_dependant = ParanoidHasManyDependant.new
+    includes_values = ParanoidTime.includes(:not_paranoid).includes_values
+
+    assert_equal includes_values, paranoid_has_many_dependant.association(:paranoid_time_with_scope).scope.includes_values
+  end
+
   def test_belongs_to_with_deleted
     paranoid_time = ParanoidTime.first
     paranoid_has_many_dependant = paranoid_time.paranoid_has_many_dependants.create(:name => 'dependant!')
@@ -72,19 +83,19 @@ class AssociationsTest < ParanoidBaseTest
   end
 
   def test_belongs_to_options
-    paranoid_time = ParanoidHasManyDependant.reflections[:paranoid_time]
+    paranoid_time = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time]
     assert_equal :belongs_to, paranoid_time.macro
     assert_nil paranoid_time.options[:with_deleted]
   end
 
   def test_belongs_to_with_deleted_options
-    paranoid_time_with_deleted = ParanoidHasManyDependant.reflections[:paranoid_time_with_deleted]
+    paranoid_time_with_deleted = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time_with_deleted]
     assert_equal :belongs_to, paranoid_time_with_deleted.macro
     assert paranoid_time_with_deleted.options[:with_deleted]
   end
 
   def test_belongs_to_polymorphic_with_deleted_options
-    paranoid_time_polymorphic_with_deleted = ParanoidHasManyDependant.reflections[:paranoid_time_polymorphic_with_deleted]
+    paranoid_time_polymorphic_with_deleted = ParanoidHasManyDependant.reflections.with_indifferent_access[:paranoid_time_polymorphic_with_deleted]
     assert_equal :belongs_to, paranoid_time_polymorphic_with_deleted.macro
     assert paranoid_time_polymorphic_with_deleted.options[:with_deleted]
   end
@@ -101,6 +112,9 @@ class AssociationsTest < ParanoidBaseTest
     child.destroy
     assert_paranoid_deletion(child)
 
+    parent.reload
+
+    assert_equal [], parent.paranoid_has_many_dependants.to_a
     assert_equal [child], parent.paranoid_has_many_dependants.with_deleted.to_a
   end
 

data/test/test_core.rb

@@ -4,7 +4,6 @@ class ParanoidTest < ParanoidBaseTest
   def test_paranoid?
     assert !NotParanoid.paranoid?
     assert_raise(NoMethodError) { NotParanoid.delete_all! }
-    assert_raise(NoMethodError) { NotParanoid.first.destroy! }
     assert_raise(NoMethodError) { NotParanoid.with_deleted }
     assert_raise(NoMethodError) { NotParanoid.only_deleted }
 
@@ -41,9 +40,9 @@ class ParanoidTest < ParanoidBaseTest
   end
 
   def test_real_removal
-    ParanoidTime.first.destroy!
+    ParanoidTime.first.destroy_fully!
     ParanoidBoolean.delete_all!("name = 'extremely paranoid' OR name = 'really paranoid'")
-    ParanoidString.first.destroy!
+    ParanoidString.first.destroy_fully!
     assert_equal 2, ParanoidTime.count
     assert_equal 1, ParanoidBoolean.count
     assert_equal 0, ParanoidString.count
@@ -60,7 +59,7 @@ class ParanoidTest < ParanoidBaseTest
 
     ParanoidTime.delete_all!
     assert_empty ParanoidTime.all
-    assert_empty ParanoidTime.with_deleted.all
+    assert_empty ParanoidTime.with_deleted
   end
 
   def test_non_persisted_destroy
@@ -77,6 +76,10 @@ class ParanoidTest < ParanoidBaseTest
     assert_not_nil pt.paranoid_value
   end
 
+  def test_removal_not_persisted
+    assert ParanoidTime.new.destroy
+  end
+
   def test_recovery
     assert_equal 3, ParanoidBoolean.count
     ParanoidBoolean.first.destroy
@@ -141,12 +144,18 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, ParanoidHasOneDependant.count
     assert_equal 1, NotParanoid.count
     assert_equal 0, HasOneNotParanoid.count
+
+    assert_equal 3, ParanoidTime.with_deleted.count
+    assert_equal 4, ParanoidHasManyDependant.with_deleted.count
+    assert_equal 3, ParanoidBelongsDependant.with_deleted.count
+    assert_equal @paranoid_boolean_count + 3, ParanoidBoolean.with_deleted.count
+    assert_equal 3, ParanoidHasOneDependant.with_deleted.count
   end
 
   def test_recursive_real_removal
     setup_recursive_tests
 
-    @paranoid_time_object.destroy!
+    @paranoid_time_object.destroy_fully!
 
     assert_equal 0, ParanoidTime.only_deleted.count
     assert_equal 1, ParanoidHasManyDependant.only_deleted.count
@@ -295,8 +304,8 @@ class ParanoidTest < ParanoidBaseTest
       @paranoid_with_callback.recover
     end
 
-      assert @paranoid_with_callback.called_before_recover
-      assert @paranoid_with_callback.called_after_recover
+    assert @paranoid_with_callback.called_before_recover
+    assert @paranoid_with_callback.called_after_recover
   end
 
   def test_delete_by_multiple_id_is_paranoid
@@ -384,4 +393,44 @@ class ParanoidTest < ParanoidBaseTest
     2.times { ps.destroy }
     assert_equal 0, ParanoidString.with_deleted.where(:id => ps).count
   end
+
+  # Test boolean type columns, that are not nullable
+  def test_boolean_type_with_no_nil_value_before_destroy
+    ps = ParanoidBooleanNotNullable.create!()
+    assert_equal 1, ParanoidBooleanNotNullable.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_after_destroy
+    ps = ParanoidBooleanNotNullable.create!()
+    ps.destroy
+    assert_equal 0, ParanoidBooleanNotNullable.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_before_destroy_with_deleted
+    ps = ParanoidBooleanNotNullable.create!()
+    assert_equal 1, ParanoidBooleanNotNullable.with_deleted.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_after_destroy_with_deleted
+    ps = ParanoidBooleanNotNullable.create!()
+    ps.destroy
+    assert_equal 1, ParanoidBooleanNotNullable.with_deleted.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_before_destroy_only_deleted
+    ps = ParanoidBooleanNotNullable.create!()
+    assert_equal 0, ParanoidBooleanNotNullable.only_deleted.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_after_destroy_only_deleted
+    ps = ParanoidBooleanNotNullable.create!()
+    ps.destroy
+    assert_equal 1, ParanoidBooleanNotNullable.only_deleted.where(:id => ps).count
+  end
+
+  def test_boolean_type_with_no_nil_value_after_destroyed_twice
+    ps = ParanoidBooleanNotNullable.create!()
+    2.times { ps.destroy }
+    assert_equal 0, ParanoidBooleanNotNullable.with_deleted.where(:id => ps).count
+  end
 end

data/test/test_default_scopes.rb

@@ -37,7 +37,7 @@ class MultipleDefaultScopesTest < ParanoidBaseTest
     assert_equal 0, ParanoidHuman.only_deleted.count
     assert_equal 3, ParanoidHuman.unscoped.count
 
-    ParanoidHuman.first.destroy!
+    ParanoidHuman.first.destroy_fully!
     assert_equal 1, ParanoidHuman.count
     assert_equal 1, ParanoidHuman.with_deleted.count
     assert_equal 0, ParanoidHuman.only_deleted.count

data/test/test_helper.rb

@@ -24,7 +24,7 @@ def setup_db
       t.integer   :paranoid_belongs_dependant_id
       t.integer   :not_paranoid_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_booleans do |t|
@@ -32,7 +32,7 @@ def setup_db
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_strings do |t|
@@ -44,14 +44,14 @@ def setup_db
       t.string    :name
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :has_one_not_paranoids do |t|
       t.string    :name
       t.integer   :paranoid_time_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_has_many_dependants do |t|
@@ -61,14 +61,14 @@ def setup_db
       t.string    :paranoid_time_polymorphic_with_deleted_type
       t.integer   :paranoid_belongs_dependant_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_belongs_dependants do |t|
       t.string    :name
       t.datetime  :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_has_one_dependants do |t|
@@ -76,28 +76,28 @@ def setup_db
       t.datetime  :deleted_at
       t.integer   :paranoid_boolean_id
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_with_callbacks do |t|
       t.string    :name
       t.datetime  :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_destroy_companies do |t|
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_delete_companies do |t|
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_products do |t|
@@ -106,46 +106,46 @@ def setup_db
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :super_paranoids do |t|
       t.string :type
-      t.references :has_many_inherited_super_paranoidz
+      t.references :has_many_inherited_super_paranoidz, index: { name: 'index__sp_id_on_has_many_isp' }
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :has_many_inherited_super_paranoidzs do |t|
-      t.references :super_paranoidz
+      t.references :super_paranoidz, index: { name: 'index_has_many_isp_on_sp_id' }
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_parent_lefts do |t|
       t.string :name
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_parent_rights do |t|
       t.string :name
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_many_many_children do |t|
       t.integer :paranoid_many_many_parent_left_id
       t.integer :paranoid_many_many_parent_right_id
       t.datetime :deleted_at
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_with_scoped_validations do |t|
       t.string :name
       t.string :category
       t.datetime :deleted_at
-      t.timestamps
+      timestamps t
     end
 
    create_table :paranoid_forests do |t|
@@ -153,7 +153,7 @@ def setup_db
       t.boolean  :rainforest
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_trees do |t|
@@ -161,14 +161,14 @@ def setup_db
       t.string   :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_humen do |t|
       t.string   :gender
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_androids do |t|
@@ -181,13 +181,48 @@ def setup_db
       t.string    :paranoid_thing_type
       t.datetime :deleted_at
     end
+
+    create_table :paranoid_boolean_not_nullables do |t|
+      t.string :name
+      t.boolean :deleted, :boolean, :null => false, :default => false
+    end
+
+    create_table :paranoid_belongs_to_polymorphics do |t|
+      t.string :name
+      t.string :parent_type
+      t.integer :parent_id
+      t.datetime :deleted_at
+
+      t.timestamps
+    end
+
+    create_table :not_paranoid_has_many_as_parents do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+    create_table :paranoid_has_many_as_parents do |t|
+      t.string :name
+      t.datetime :deleted_at
+
+      t.timestamps
+    end
   end
 end
 
+def timestamps(table)
+  table.column  :created_at , :timestamp, :null => false
+  table.column  :updated_at , :timestamp, :null => false
+end
+
 def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
+  tables = if ActiveRecord::VERSION::MAJOR < 5
+    ActiveRecord::Base.connection.tables
+  else
+    ActiveRecord::Base.connection.data_sources
   end
+  tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
 end
 
 class ParanoidTime < ActiveRecord::Base
@@ -233,6 +268,7 @@ end
 class ParanoidHasManyDependant < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time
+  belongs_to :paranoid_time_with_scope, -> { includes(:not_paranoid) }, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id
   belongs_to :paranoid_time_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :with_deleted => true
   belongs_to :paranoid_time_polymorphic_with_deleted, :class_name => 'ParanoidTime', :foreign_key => :paranoid_time_id, :polymorphic => true, :with_deleted => true
 
@@ -323,25 +359,6 @@ class InheritedParanoid < SuperParanoid
   acts_as_paranoid
 end
 
-class ParanoidObserver < ActiveRecord::Observer
-  observe :paranoid_with_callback
-
-  attr_accessor :called_before_recover, :called_after_recover
-
-  def before_recover(paranoid_object)
-    self.called_before_recover = paranoid_object
-  end
-
-  def after_recover(paranoid_object)
-    self.called_after_recover = paranoid_object
-  end
-
-  def reset
-    self.called_before_recover = nil
-    self.called_after_recover = nil
-  end
-end
-
 
 class ParanoidManyManyParentLeft < ActiveRecord::Base
   has_many :paranoid_many_many_children
@@ -364,7 +381,19 @@ class ParanoidWithScopedValidation < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :category
 end
 
-ParanoidWithCallback.add_observer(ParanoidObserver.instance)
+class ParanoidBelongsToPolymorphic < ActiveRecord::Base
+  acts_as_paranoid
+  belongs_to :parent, :polymorphic => true, :with_deleted => true
+end
+
+class NotParanoidHasManyAsParent < ActiveRecord::Base
+  has_many :paranoid_belongs_to_polymorphics, :as => :parent, :dependent => :destroy
+end
+
+class ParanoidHasManyAsParent < ActiveRecord::Base
+  acts_as_paranoid
+  has_many :paranoid_belongs_to_polymorphics, :as => :parent, :dependent => :destroy
+end
 
 class ParanoidBaseTest < ActiveSupport::TestCase
   def setup
@@ -378,8 +407,6 @@ class ParanoidBaseTest < ActiveSupport::TestCase
     ParanoidString.create! :name => "strings can be paranoid"
     NotParanoid.create! :name => "no paranoid goals"
     ParanoidWithCallback.create! :name => "paranoid with callbacks"
-
-    ParanoidObserver.instance.reset
   end
 
   def teardown
@@ -411,11 +438,9 @@ end
 class ParanoidForest < ActiveRecord::Base
   acts_as_paranoid
 
-  # HACK: scope throws an error on 1.8.7 because the logger isn't initialized (see https://github.com/Casecommons/pg_search/issues/26)
-  require "active_support/core_ext/logger.rb"
   ActiveRecord::Base.logger = Logger.new(StringIO.new)
 
-  scope :rainforest, where(:rainforest => true)
+  scope :rainforest, lambda{ where(:rainforest => true) }
 
   has_many :paranoid_trees, :dependent => :destroy
 end
@@ -428,7 +453,7 @@ end
 
 class ParanoidHuman < ActiveRecord::Base
   acts_as_paranoid
-  default_scope where('gender = ?', 'male')
+  default_scope { where('gender = ?', 'male') }
 end
 
 class ParanoidAndroid < ActiveRecord::Base
@@ -440,3 +465,8 @@ class ParanoidSection < ActiveRecord::Base
   belongs_to :paranoid_time
   belongs_to :paranoid_thing, :polymorphic => true, :dependent => :destroy
 end
+
+class ParanoidBooleanNotNullable < ActiveRecord::Base
+  acts_as_paranoid column: 'deleted', column_type: 'boolean', allow_nulls: false
+end
+

data/test/test_preloader_association.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class PreloaderAssociationTest < ParanoidBaseTest
+  def test_includes_with_deleted
+    paranoid_time = ParanoidTime.first
+    paranoid_has_many_dependant = paranoid_time.paranoid_has_many_dependants.create(:name => 'dependant!')
+
+    paranoid_time.destroy
+
+    ParanoidHasManyDependant.with_deleted.includes(:paranoid_time_with_deleted).each do |hasmany|
+      assert_not_nil hasmany.paranoid_time_with_deleted
+    end
+  end
+
+  def test_includes_with_deleted_with_polymorphic_parent
+    not_paranoid_parent = NotParanoidHasManyAsParent.create(name: 'not paranoid parent')
+    paranoid_parent = ParanoidHasManyAsParent.create(name: 'paranoid parent')
+    ParanoidBelongsToPolymorphic.create(:name => 'belongs_to', :parent => not_paranoid_parent)
+    ParanoidBelongsToPolymorphic.create(:name => 'belongs_to', :parent => paranoid_parent)
+
+    paranoid_parent.destroy
+
+    ParanoidBelongsToPolymorphic.with_deleted.includes(:parent).each do |hasmany|
+      assert_not_nil hasmany.parent
+    end
+  end
+end

data/test/test_relations.rb

@@ -75,7 +75,7 @@ class RelationsTest < ParanoidBaseTest
 
   def test_fake_removal_through_relation
     # destroy: through a relation.
-    ParanoidForest.rainforest.destroy(@paranoid_forest_3)
+    ParanoidForest.rainforest.destroy(@paranoid_forest_3.id)
     assert_equal 1, ParanoidForest.rainforest.count
     assert_equal 2, ParanoidForest.rainforest.with_deleted.count
     assert_equal 1, ParanoidForest.rainforest.only_deleted.count
@@ -95,8 +95,8 @@ class RelationsTest < ParanoidBaseTest
 
     # destroy: two-step through a relation
     paranoid_tree = @paranoid_forest_1.paranoid_trees.first
-    @paranoid_forest_1.paranoid_trees.order(:id).destroy(paranoid_tree)
-    @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree)
+    @paranoid_forest_1.paranoid_trees.order(:id).destroy(paranoid_tree.id)
+    @paranoid_forest_1.paranoid_trees.only_deleted.destroy(paranoid_tree.id)
     assert_equal 1, @paranoid_forest_1.paranoid_trees(true).count
     assert_equal 1, @paranoid_forest_1.paranoid_trees(true).with_deleted.count
     assert_equal 0, @paranoid_forest_1.paranoid_trees(true).only_deleted.count

metadata

@@ -1,33 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Zachary Scott
-- André Medeiros
 - Goncalo Silva
-- Charles G.
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,16 +98,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -96,6 +126,7 @@ files:
 - lib/acts_as_paranoid.rb
 - lib/acts_as_paranoid/associations.rb
 - lib/acts_as_paranoid/core.rb
+- lib/acts_as_paranoid/preloader_association.rb
 - lib/acts_as_paranoid/relation.rb
 - lib/acts_as_paranoid/validations.rb
 - lib/acts_as_paranoid/version.rb
@@ -104,10 +135,10 @@ files:
 - test/test_default_scopes.rb
 - test/test_helper.rb
 - test/test_inheritance.rb
-- test/test_observers.rb
+- test/test_preloader_association.rb
 - test/test_relations.rb
 - test/test_validations.rb
-homepage: https://github.com/zzak/acts_as_paranoid
+homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
 metadata: {}
@@ -134,7 +165,7 @@ summary: Active Record plugin which allows you to hide and restore records witho
   actually deleting them.
 test_files:
 - test/test_inheritance.rb
-- test/test_observers.rb
+- test/test_preloader_association.rb
 - test/test_relations.rb
 - test/test_core.rb
 - test/test_validations.rb

data/test/test_observers.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class ParanoidObserverTest < ParanoidBaseTest
-  def test_called_observer_methods
-    @subject = ParanoidWithCallback.new
-    @subject.save
-
-    assert_nil ParanoidObserver.instance.called_before_recover
-    assert_nil ParanoidObserver.instance.called_after_recover
-
-    ParanoidWithCallback.find(@subject.id).recover
-
-    assert_equal @subject, ParanoidObserver.instance.called_before_recover
-    assert_equal @subject, ParanoidObserver.instance.called_after_recover
-  end
-end