acts_as_paranoid 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59510a8af45d737dccea2ee97aa62553790c49a2
-  data.tar.gz: d9b52994074e903a7b9d7f4d88f5113d37039f12
+SHA256:
+  metadata.gz: 45239a76ba68990d6273016fdba8c582ecd44d93475ebabf5ae6717b5c58ddcc
+  data.tar.gz: 330ed8379df4137f3016de1db1def095ae268b3f99a6dce075b4fea8adf4eb42
 SHA512:
-  metadata.gz: 75b9853cab16dbce9e96a8976b0337e01fce18b38273e087ec68c39eae4fe3b4d2b347f1ead9f147226db2bced977eee5c4ae5a87658208737ae8ec9bd8e7d25
-  data.tar.gz: 3f6f6a1337fe18092b37f84de3bb08740ab971fa55cb7fb9cb5d7db5551275d498079f8ba38b6cf282e069d529fb0bd32e6765fc364b71dbca23dab90e542d42
+  metadata.gz: a2f9c1437125d81959809addcdbee54003711ad8f339b2d1f78987b81aaab3766ac813563c110879f594b127ca90d59186ba84ca0079eeec5e69005b9e0dae08
+  data.tar.gz: 51f5f32565a0ae3f90de5f7afe517372a55c63c887c9de7ed07791f196b03e568f9cc275586c43f9e19806c5f45ef1431de4f446c819344cfebda64c0608d997

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Zachary Scott, Gonçalo Silva, Rick Olson
+Copyright (c) 2014-2017 Zachary Scott, Gonçalo Silva, Rick Olson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -4,17 +4,40 @@
 
 A Rails plugin to add soft delete.
 
-This gem can be used to hide records instead of deleting them, making them recoverable later.
+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**
+**This branch targets Rails 4.2, 5.0 and 5.1, with experimental support for 5.2**
 
-If you're working with another version, switch to the corresponding branch, or require an older version of the `acts_as_paranoid` gem.
+If you're working with another version, switch to the corresponding branch, or
+require an older version of the `acts_as_paranoid` gem.
+
+### Known issues with Rails 5.2
+
+* Using acts_as_paranoid and ActiveStorage on the same model
+  [leads to a SystemStackError](https://github.com/ActsAsParanoid/acts_as_paranoid/issues/103).
+* You cannot directly create a model in a deleted state.
 
 ## Usage
 
-You can enable ActsAsParanoid like this:
+#### Install gem:
+
+``` ruby
+gem 'acts_as_paranoid', '~> 0.6.0'
+```
+``` shell
+bundle install
+```
+
+#### Create migration
+
+``` shell
+bin/rails generate migration AddDeletedAtToParanoiac deleted_at:datetime:index
+```
+
+#### Enable ActsAsParanoid:
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
@@ -22,14 +45,19 @@ class Paranoiac < ActiveRecord::Base
 end
 ```
 
-### Options
-
-You can also specify the name of the column to store it's *deletion* and the type of data it holds:
+The default column name and type are as follows:
 
 - `:column      => 'deleted_at'`
 - `:column_type => 'time'`
 
-The values shown are the defaults. While *column* can be anything (as long as it exists in your database), *type* is restricted to:
+### Options
+
+If you are using a different column name and type to store a record's *deletion*, you can specify them as follows:
+
+- `:column      => 'deleted'`
+- `:column_type => 'boolean'`
+
+While *column* can be anything (as long as it exists in your database), *type* is restricted to:
 
 - `boolean`
 - `time` or
@@ -69,11 +97,10 @@ Paranoiac.deleted_inside_time_window(time, 2.minutes)
 In order to really delete a record, just use:
 
 ```ruby
-paranoiac.destroy!
+paranoiac.destroy_fully!
 Paranoiac.delete_all!(conditions)
 ```
-
-You can also permanently delete a record by calling `destroy_fully!` on the object.
+**NOTE:** The `.destroy!` method is still usable, but equivalent to `.destroy`. It just hides the object.
 
 Alternatively you can permanently delete a record by calling `destroy` or `delete_all` on the object **twice**.
 
@@ -84,7 +111,7 @@ Take this example:
 ```ruby
 p = Paranoiac.first
 p.destroy # does NOT delete the first record, just hides it
-Paranoiac.only_deleted.where(:id => p.id).destroy # deletes the first record from the database
+Paranoiac.only_deleted.where(:id => p.id).first.destroy # deletes the first record from the database
 ```
 
 ### Recovery
@@ -107,7 +134,7 @@ If you would like to change this default behavior for one model, you can use the
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
-    acts_as_paranoid :recover_dependent_associations => false
+  acts_as_paranoid :recover_dependent_associations => false
 end
 ```
 
@@ -121,16 +148,16 @@ This window can be changed with the `dependent_recovery_window` option:
 
 ```ruby
 class Paranoiac < ActiveRecord::Base
-    acts_as_paranoid
-    has_many :paranoids, :dependent => :destroy
+  acts_as_paranoid
+  has_many :paranoids, :dependent => :destroy
 end
 
 class Paranoid < ActiveRecord::Base
-    belongs_to :paranoic
+  belongs_to :paranoic
 
-    # Paranoid objects will be recovered alongside Paranoic objects
-    # if they were deleted within 10 minutes of the Paranoic object
-    acts_as_paranoid :dependent_recovery_window => 10.minutes
+  # Paranoid objects will be recovered alongside Paranoic objects
+  # if they were deleted within 10 minutes of the Paranoic object
+  acts_as_paranoid :dependent_recovery_window => 10.minutes
 end
 ```
 

data/lib/acts_as_paranoid.rb

@@ -19,7 +19,7 @@ module ActsAsParanoid
 
     class_attribute :paranoid_configuration, :paranoid_column_reference
 
-    self.paranoid_configuration = { :column => "deleted_at", :column_type => "time", :recover_dependent_associations => true, :dependent_recovery_window => 2.minutes }
+    self.paranoid_configuration = { :column => "deleted_at", :column_type => "time", :recover_dependent_associations => true, :dependent_recovery_window => 2.minutes, :recovery_value => nil }
     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

data/lib/acts_as_paranoid/associations.rb

@@ -3,13 +3,19 @@ module ActsAsParanoid
     def self.included(base)
       base.extend ClassMethods
       class << base
-        alias_method_chain :belongs_to, :deleted
+        alias_method :belongs_to_without_deleted, :belongs_to
+        alias_method :belongs_to, :belongs_to_with_deleted
       end
     end
 
     module ClassMethods
       def belongs_to_with_deleted(target, scope = nil, options = {})
-        with_deleted = (scope.is_a?(Hash) ? scope : options).delete(:with_deleted)
+        if scope.is_a?(Hash)
+          options = scope
+          scope = nil
+        end
+
+        with_deleted = options.delete(:with_deleted)
         result = belongs_to_without_deleted(target, scope, options)
 
         if with_deleted
@@ -27,7 +33,8 @@ module ActsAsParanoid
                 return #{target}_without_unscoped(*args) unless association.klass.paranoid?
                 association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
               end
-              alias_method_chain :#{target}, :unscoped
+              alias_method :#{target}_without_unscoped, :#{target}
+              alias_method :#{target}, :#{target}_with_unscoped
             RUBY
           end
         end

data/lib/acts_as_paranoid/core.rb

@@ -105,6 +105,13 @@ module ActsAsParanoid
       self.send(self.class.paranoid_column)
     end
 
+    # Straight from ActiveRecord 5.1!
+    def delete
+      self.class.delete(id) if persisted?
+      @destroyed = true
+      freeze
+    end
+
     def destroy_fully!
       with_transaction_returning_status do
         run_callbacks :destroy do
@@ -122,7 +129,12 @@ module ActsAsParanoid
         with_transaction_returning_status do
           run_callbacks :destroy do
             # Handle composite keys, otherwise we would just use `self.class.primary_key.to_sym => self.id`.
-            self.class.delete_all(Hash[[Array(self.class.primary_key), Array(self.id)].transpose]) if persisted?
+            @_trigger_destroy_callback = if persisted?
+                                           self.class.delete_all(Hash[[Array(self.class.primary_key), Array(self.id)].transpose])
+                                         else
+                                           true
+                                         end
+
             self.paranoid_value = self.class.delete_now_value
             self
           end
@@ -144,7 +156,7 @@ module ActsAsParanoid
         run_callbacks :recover do
           recover_dependent_associations(options[:recovery_window], options) if options[:recursive]
 
-          self.paranoid_value = nil
+          self.paranoid_value = self.class.paranoid_configuration[:recovery_value]
           self.save
         end
       end

data/lib/acts_as_paranoid/preloader_association.rb

@@ -4,11 +4,12 @@ module ActsAsParanoid
       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 = scope.with_deleted if reflection.options[:with_deleted] && klass.respond_to?(:with_deleted)
           scope
         end
 
-        alias_method_chain :build_scope, :deleted
+        alias_method :build_scope_without_deleted, :build_scope
+        alias_method :build_scope, :build_scope_with_deleted
       end
     end
   end

data/lib/acts_as_paranoid/validations.rb

@@ -21,10 +21,7 @@ module ActsAsParanoid
           finder_class = find_finder_class_for(record)
           table = finder_class.arel_table
 
-          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)
+          relation = build_relation(finder_class, 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?
@@ -33,10 +30,17 @@ module ActsAsParanoid
             relation = relation.where(table[scope_item].eq(record.public_send(scope_item)))
           end
 
-          if relation.where(finder_class.paranoid_default_scope).where(relation).exists?
+          if relation.where(finder_class.paranoid_default_scope).exists?(relation)
             record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
           end
         end
+
+        protected
+
+        def build_relation(klass, attribute, value)
+          return super(klass, klass.arel_table, attribute, value) if ActiveRecord::VERSION::MINOR == 0
+          super
+        end
       end
 
       class V4 < ActiveRecord::Validations::UniquenessValidator

data/lib/acts_as_paranoid/version.rb

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

data/test/test_associations.rb

@@ -52,8 +52,8 @@ class AssociationsTest < ParanoidBaseTest
 
     paranoid_time.destroy
 
-    assert_nil paranoid_has_many_dependant.paranoid_time(true)
-    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_deleted(true)
+    assert_nil paranoid_has_many_dependant.reload.paranoid_time
+    assert_equal paranoid_time, paranoid_has_many_dependant.reload.paranoid_time_with_deleted
   end
 
   def test_belongs_to_polymorphic_with_deleted
@@ -65,8 +65,8 @@ class AssociationsTest < ParanoidBaseTest
 
     paranoid_time.destroy
 
-    assert_nil paranoid_has_many_dependant.paranoid_time(true)
-    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_polymorphic_with_deleted(true)
+    assert_nil paranoid_has_many_dependant.reload.paranoid_time
+    assert_equal paranoid_time, paranoid_has_many_dependant.reload.paranoid_time_polymorphic_with_deleted
   end
 
   def test_belongs_to_nil_polymorphic_with_deleted
@@ -78,8 +78,8 @@ class AssociationsTest < ParanoidBaseTest
 
     paranoid_time.destroy
 
-    assert_nil paranoid_has_many_dependant.paranoid_time(true)
-    assert_nil paranoid_has_many_dependant.paranoid_time_polymorphic_with_deleted(true)
+    assert_nil paranoid_has_many_dependant.reload.paranoid_time
+    assert_nil paranoid_has_many_dependant.reload.paranoid_time_polymorphic_with_deleted
   end
 
   def test_belongs_to_options
@@ -228,6 +228,9 @@ class AssociationsTest < ParanoidBaseTest
   end
 
   def test_mass_assignment_of_paranoid_column_enabled
+    if ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1
+      skip 'Creation as deleted is not supported with Rails >= 5.2'
+    end
     now = Time.now
     record = ParanoidTime.create! :name => 'Foo', :deleted_at => now
     assert_equal 'Foo', record.name

data/test/test_core.rb

@@ -186,15 +186,19 @@ class ParanoidTest < ParanoidBaseTest
   def test_recursive_recovery_dependant_window
     setup_recursive_tests
 
-    @paranoid_time_object.destroy
-    @paranoid_time_object.reload
-
     # Stop the following from recovering:
     #   - ParanoidHasManyDependant and its ParanoidBelongsDependant
     #   - A single ParanoidBelongsDependant, but not its parent
-    dependants = @paranoid_time_object.paranoid_has_many_dependants.with_deleted
-    dependants.first.update_attribute(:deleted_at, 2.days.ago)
-    ParanoidBelongsDependant.with_deleted.where(:id => dependants.last.paranoid_belongs_dependant_id).first.update_attribute(:deleted_at, 1.hour.ago)
+    Time.stub :now, 2.days.ago do
+      @paranoid_time_object.paranoid_has_many_dependants.first.destroy
+    end
+    Time.stub :now, 1.hour.ago do
+      @paranoid_time_object.paranoid_has_many_dependants.
+        last.paranoid_belongs_dependant.
+        destroy
+    end
+    @paranoid_time_object.destroy
+    @paranoid_time_object.reload
 
     @paranoid_time_object.recover(:recursive => true)
 
@@ -211,13 +215,13 @@ class ParanoidTest < ParanoidBaseTest
     child_1 = ParanoidAndroid.create
     section_1 = ParanoidSection.create(:paranoid_thing => child_1)
 
-    child_2 = ParanoidHuman.create(:gender => 'male')
+    child_2 = ParanoidPolygon.create(:sides => 3)
     section_2 = ParanoidSection.create(:paranoid_thing => child_2)
 
     assert_equal section_1.paranoid_thing, child_1
     assert_equal section_1.paranoid_thing.class, ParanoidAndroid
     assert_equal section_2.paranoid_thing, child_2
-    assert_equal section_2.paranoid_thing.class, ParanoidHuman
+    assert_equal section_2.paranoid_thing.class, ParanoidPolygon
 
     parent = ParanoidTime.create(:name => "paranoid_parent")
     parent.paranoid_sections << section_1
@@ -226,14 +230,14 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 4, ParanoidTime.count
     assert_equal 2, ParanoidSection.count
     assert_equal 1, ParanoidAndroid.count
-    assert_equal 1, ParanoidHuman.count
+    assert_equal 1, ParanoidPolygon.count
 
     parent.destroy
 
     assert_equal 3, ParanoidTime.count
     assert_equal 0, ParanoidSection.count
     assert_equal 0, ParanoidAndroid.count
-    assert_equal 0, ParanoidHuman.count
+    assert_equal 0, ParanoidPolygon.count
 
     parent.reload
     parent.recover
@@ -241,7 +245,7 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 4, ParanoidTime.count
     assert_equal 2, ParanoidSection.count
     assert_equal 1, ParanoidAndroid.count
-    assert_equal 1, ParanoidHuman.count
+    assert_equal 1, ParanoidPolygon.count
   end
 
   def test_non_recursive_recovery

data/test/test_default_scopes.rb

@@ -5,48 +5,48 @@ class MultipleDefaultScopesTest < ParanoidBaseTest
     setup_db
 
     # Naturally, the default scope for humans is male. Sexism++
-    ParanoidHuman.create! :gender => 'male'
-    ParanoidHuman.create! :gender => 'male'
-    ParanoidHuman.create! :gender => 'male'
-    ParanoidHuman.create! :gender => 'female'
+    ParanoidPolygon.create! :sides => 3
+    ParanoidPolygon.create! :sides => 3
+    ParanoidPolygon.create! :sides => 3
+    ParanoidPolygon.create! :sides => 8
 
-    assert_equal 3, ParanoidHuman.count
-    assert_equal 4, ParanoidHuman.unscoped.count
+    assert_equal 3, ParanoidPolygon.count
+    assert_equal 4, ParanoidPolygon.unscoped.count
   end
 
   def test_fake_removal_with_multiple_default_scope
-    ParanoidHuman.first.destroy
-    assert_equal 2, ParanoidHuman.count
-    assert_equal 3, ParanoidHuman.with_deleted.count
-    assert_equal 1, ParanoidHuman.only_deleted.count
-    assert_equal 4, ParanoidHuman.unscoped.count
-
-    ParanoidHuman.destroy_all
-    assert_equal 0, ParanoidHuman.count
-    assert_equal 3, ParanoidHuman.with_deleted.count
-    assert_equal 3, ParanoidHuman.with_deleted.count
-    assert_equal 4, ParanoidHuman.unscoped.count
+    ParanoidPolygon.first.destroy
+    assert_equal 2, ParanoidPolygon.count
+    assert_equal 3, ParanoidPolygon.with_deleted.count
+    assert_equal 1, ParanoidPolygon.only_deleted.count
+    assert_equal 4, ParanoidPolygon.unscoped.count
+
+    ParanoidPolygon.destroy_all
+    assert_equal 0, ParanoidPolygon.count
+    assert_equal 3, ParanoidPolygon.with_deleted.count
+    assert_equal 3, ParanoidPolygon.with_deleted.count
+    assert_equal 4, ParanoidPolygon.unscoped.count
   end
 
   def test_real_removal_with_multiple_default_scope
     # two-step
-    ParanoidHuman.first.destroy
-    ParanoidHuman.only_deleted.first.destroy
-    assert_equal 2, ParanoidHuman.count
-    assert_equal 2, ParanoidHuman.with_deleted.count
-    assert_equal 0, ParanoidHuman.only_deleted.count
-    assert_equal 3, ParanoidHuman.unscoped.count
-
-    ParanoidHuman.first.destroy_fully!
-    assert_equal 1, ParanoidHuman.count
-    assert_equal 1, ParanoidHuman.with_deleted.count
-    assert_equal 0, ParanoidHuman.only_deleted.count
-    assert_equal 2, ParanoidHuman.unscoped.count
-
-    ParanoidHuman.delete_all!
-    assert_equal 0, ParanoidHuman.count
-    assert_equal 0, ParanoidHuman.with_deleted.count
-    assert_equal 0, ParanoidHuman.only_deleted.count
-    assert_equal 1, ParanoidHuman.unscoped.count
+    ParanoidPolygon.first.destroy
+    ParanoidPolygon.only_deleted.first.destroy
+    assert_equal 2, ParanoidPolygon.count
+    assert_equal 2, ParanoidPolygon.with_deleted.count
+    assert_equal 0, ParanoidPolygon.only_deleted.count
+    assert_equal 3, ParanoidPolygon.unscoped.count
+
+    ParanoidPolygon.first.destroy_fully!
+    assert_equal 1, ParanoidPolygon.count
+    assert_equal 1, ParanoidPolygon.with_deleted.count
+    assert_equal 0, ParanoidPolygon.only_deleted.count
+    assert_equal 2, ParanoidPolygon.unscoped.count
+
+    ParanoidPolygon.delete_all!
+    assert_equal 0, ParanoidPolygon.count
+    assert_equal 0, ParanoidPolygon.with_deleted.count
+    assert_equal 0, ParanoidPolygon.only_deleted.count
+    assert_equal 1, ParanoidPolygon.unscoped.count
   end
 end

data/test/test_helper.rb

@@ -164,8 +164,8 @@ def setup_db
       timestamps t
     end
 
-    create_table :paranoid_humen do |t|
-      t.string   :gender
+    create_table :paranoid_polygons do |t|
+      t.integer   :sides
       t.datetime :deleted_at
 
       timestamps t
@@ -193,20 +193,20 @@ def setup_db
       t.integer :parent_id
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :not_paranoid_has_many_as_parents do |t|
       t.string :name
 
-      t.timestamps
+      timestamps t
     end
 
     create_table :paranoid_has_many_as_parents do |t|
       t.string :name
       t.datetime :deleted_at
 
-      t.timestamps
+      timestamps t
     end
   end
 end
@@ -451,9 +451,9 @@ class ParanoidTree < ActiveRecord::Base
   validates_presence_of :name
 end
 
-class ParanoidHuman < ActiveRecord::Base
+class ParanoidPolygon < ActiveRecord::Base
   acts_as_paranoid
-  default_scope { where('gender = ?', 'male') }
+  default_scope { where('sides = ?', 3) }
 end
 
 class ParanoidAndroid < ActiveRecord::Base

data/test/test_inheritance.rb

@@ -5,10 +5,10 @@ class InheritanceTest < ParanoidBaseTest
     has_many_inherited_super_paranoidz = HasManyInheritedSuperParanoidz.new
     has_many_inherited_super_paranoidz.save
     has_many_inherited_super_paranoidz.super_paranoidz.create
-    assert_nothing_raised(NoMethodError) { has_many_inherited_super_paranoidz.destroy }
+    assert_nothing_raised { has_many_inherited_super_paranoidz.destroy }
   end
 
   def test_class_instance_variables_are_inherited
-    assert_nothing_raised(ActiveRecord::StatementInvalid) { InheritedParanoid.paranoid_column }
+    assert_nothing_raised { InheritedParanoid.paranoid_column }
   end
 end

data/test/test_relations.rb

@@ -82,8 +82,8 @@ class RelationsTest < ParanoidBaseTest
 
     # destroy_all: through a relation
     @paranoid_forest_2.paranoid_trees.order(:id).destroy_all
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).count
-    assert_equal 2, @paranoid_forest_2.paranoid_trees(true).with_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.count
+    assert_equal 2, @paranoid_forest_2.paranoid_trees.with_deleted.count
   end
 
   def test_real_removal_through_relation
@@ -97,21 +97,21 @@ class RelationsTest < ParanoidBaseTest
     paranoid_tree = @paranoid_forest_1.paranoid_trees.first
     @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
+    assert_equal 1, @paranoid_forest_1.paranoid_trees.count
+    assert_equal 1, @paranoid_forest_1.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.only_deleted.count
 
     # destroy_all: two-step through a relation
     @paranoid_forest_1.paranoid_trees.order(:id).destroy_all
     @paranoid_forest_1.paranoid_trees.only_deleted.destroy_all
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).count
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).with_deleted.count
-    assert_equal 0, @paranoid_forest_1.paranoid_trees(true).only_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_1.paranoid_trees.only_deleted.count
 
     # delete_all!: through a relation
     @paranoid_forest_2.paranoid_trees.order(:id).delete_all!
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).count
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).with_deleted.count
-    assert_equal 0, @paranoid_forest_2.paranoid_trees(true).only_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.with_deleted.count
+    assert_equal 0, @paranoid_forest_2.paranoid_trees.only_deleted.count
   end
 end

data/test/test_validations.rb

@@ -13,6 +13,7 @@ class ValidatesUniquenessTest < ParanoidBaseTest
 
   def test_should_validate_without_deleted
     ParanoidBoolean.new(:name => 'paranoid').tap do |record|
+      refute record.valid?
       ParanoidBoolean.first.destroy
       assert record.valid?
       ParanoidBoolean.only_deleted.first.destroy!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,21 +155,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without
   actually deleting them.
 test_files:
-- test/test_inheritance.rb
-- test/test_preloader_association.rb
-- test/test_relations.rb
-- test/test_core.rb
 - test/test_validations.rb
+- test/test_relations.rb
+- test/test_inheritance.rb
+- test/test_default_scopes.rb
 - test/test_associations.rb
 - test/test_helper.rb
-- test/test_default_scopes.rb
-has_rdoc: 
+- test/test_core.rb
+- test/test_preloader_association.rb