acts_as_paranoid 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45239a76ba68990d6273016fdba8c582ecd44d93475ebabf5ae6717b5c58ddcc
-  data.tar.gz: 330ed8379df4137f3016de1db1def095ae268b3f99a6dce075b4fea8adf4eb42
+  metadata.gz: 06cfbf17cb1f8fe737c00e223cc6b02f8ea1159d751c3e6c1bfba1fd077ca6ac
+  data.tar.gz: b887b92760729053b6286412ee861e9677c7d418bcf28bdfdc996c4e9474ed30
 SHA512:
-  metadata.gz: a2f9c1437125d81959809addcdbee54003711ad8f339b2d1f78987b81aaab3766ac813563c110879f594b127ca90d59186ba84ca0079eeec5e69005b9e0dae08
-  data.tar.gz: 51f5f32565a0ae3f90de5f7afe517372a55c63c887c9de7ed07791f196b03e568f9cc275586c43f9e19806c5f45ef1431de4f446c819344cfebda64c0608d997
+  metadata.gz: 699e32ad650195f1d4b34ef89e266a379ef35f450d6434d753227788fe214c3af9ebe410397799117b8b6527a240d769e768cc1a60b49f8abd663d8e1ab81ff9
+  data.tar.gz: a5e7745201cfe1fb5689726ca93cff4fb24a594373a10c2fb7777541f9ca7dcb2681a20ddd91692eff6dae3149b80e6a962b56dc4fecd86d10b87e77f9be1221

data/CHANGELOG.md

@@ -0,0 +1,32 @@
+# CHANGELOG
+
+Notable changes to this project will be documented in this file.
+
+## 0.6.1
+
+* Add support for Rails 6 ([#124], by [Daniel Rice](danielricecodes),
+  [Josh Bryant](jbryant92), and [Romain Alexandre](RomainAlexandre))
+* Add support for incrementing and decrementing counter cache columns on
+  associated objects ([#119], by [Dimitar Lukanov][shadydealer])
+* Add `:double_tap_destroys_fully` option, with default `true` ([#116],
+  by [Michael Riviera][ri4a]).
+* Officially support Ruby 2.6 ([#114], by [Matijs van Zuijlen][mvz]).
+
+## 0.6.0 and earlier
+
+(To be added)
+
+<!-- Contributors -->
+
+[ri4a]: https://github.com/ri4a
+[mvz]: https://github.com/mvz
+[shadydealer]: https://github.com/shadydealer
+[danielricecodes]: https://github.com/danielricecodes
+[jbryant92]: https://github.com/jbryant92
+[RomainAlexandre]: https://github.com/RomainAlexandre
+
+<!-- issues & pull requests -->
+
+[#119]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/119
+[#116]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/116
+[#114]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/114

data/README.md

@@ -9,12 +9,12 @@ recoverable later.
 
 ## Support
 
-**This branch targets Rails 4.2, 5.0 and 5.1, with experimental support for 5.2**
+**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
+If you're working with Rails 4.1-, switch to the corresponding branch, or
 require an older version of the `acts_as_paranoid` gem.
 
-### Known issues with Rails 5.2
+### 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).
@@ -114,6 +114,10 @@ p.destroy # does NOT delete the first record, just hides it
 Paranoiac.only_deleted.where(:id => p.id).first.destroy # deletes the first record from the database
 ```
 
+This behaviour can be disabled by setting the configuration option. In a future version, `false` will be the default setting.
+
+- `:double_tap_destroys_fully => false`
+
 ### Recovery
 
 Recovery is easy. Just invoke `recover` on it, like this:
@@ -263,7 +267,6 @@ child.parent_including_deleted #=> Parent (it works!)
 
 Watch out for these caveats:
 
-
 -   You cannot use scopes named `with_deleted` and `only_deleted`
 -   You cannot use scopes named `deleted_inside_time_window`, `deleted_before_time`, `deleted_after_time` **if** your paranoid column's type is `time`
 -   You cannot name association `*_with_deleted`
@@ -283,5 +286,6 @@ Watch out for these caveats:
 * 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
+* To [Daniel Rice](https://github.com/danielricecodes), [Josh Bryant](https://github.com/jbryant92), and [Romain Alexandre](https://github.com/RomainAlexandre) for Rails 6.0 support.
 
 See `LICENSE`.

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

@@ -31,7 +31,7 @@ module ActsAsParanoid
                 association = association(:#{target})
                 return nil if association.options[:polymorphic] && association.klass.nil?
                 return #{target}_without_unscoped(*args) unless association.klass.paranoid?
-                association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
+                association.klass.with_deleted.scoping { association.klass.unscoped { #{target}_without_unscoped(*args) } }
               end
               alias_method :#{target}_without_unscoped, :#{target}
               alias_method :#{target}, :#{target}_with_unscoped

data/lib/acts_as_paranoid/core.rb

@@ -116,8 +116,14 @@ module ActsAsParanoid
       with_transaction_returning_status do
         run_callbacks :destroy do
           destroy_dependent_associations!
-          # 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?
+
+          if persisted?
+            # 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])
+
+            decrement_counters_on_associations
+          end
+
           self.paranoid_value = self.class.delete_now_value
           freeze
         end
@@ -128,19 +134,24 @@ module ActsAsParanoid
       if !deleted?
         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`.
-            @_trigger_destroy_callback = if persisted?
-                                           self.class.delete_all(Hash[[Array(self.class.primary_key), Array(self.id)].transpose])
-                                         else
-                                           true
-                                         end
+
+            if persisted?
+              # 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])
+
+              decrement_counters_on_associations
+            end
+
+            @_trigger_destroy_callback = true
 
             self.paranoid_value = self.class.delete_now_value
             self
           end
         end
       else
-        destroy_fully!
+        if paranoid_configuration[:double_tap_destroys_fully]
+          destroy_fully!
+        end
       end
     end
 
@@ -155,7 +166,7 @@ module ActsAsParanoid
       self.class.transaction do
         run_callbacks :recover do
           recover_dependent_associations(options[:recovery_window], options) if options[:recursive]
-
+          increment_counters_on_associations
           self.paranoid_value = self.class.paranoid_configuration[:recovery_value]
           self.save
         end
@@ -169,7 +180,11 @@ module ActsAsParanoid
         scope = klass.only_deleted
 
         # Merge in the association's scope
-        scope = scope.merge(association(reflection.name).association_scope)
+        scope = if ActiveRecord::VERSION::MAJOR >= 6
+          scope.merge(ActiveRecord::Associations::AssociationScope.scope(association(reflection.name)))
+        else
+          scope.merge(association(reflection.name).association_scope)
+        end
 
         # We can only recover by window if both parent and dependant have a
         # paranoid column type of :time.
@@ -190,7 +205,11 @@ module ActsAsParanoid
         scope = klass.only_deleted
 
         # Merge in the association's scope
-        scope = scope.merge(association(reflection.name).association_scope)
+        scope = if ActiveRecord::VERSION::MAJOR >= 6
+          scope.merge(ActiveRecord::Associations::AssociationScope.scope(association(reflection.name)))
+        else
+          scope.merge(association(reflection.name).association_scope)
+        end
 
         scope.each do |object|
           object.destroy!
@@ -223,5 +242,30 @@ module ActsAsParanoid
     def paranoid_value=(value)
       self.send("#{self.class.paranoid_column}=", value)
     end
+
+    def update_counters_on_associations method_sym
+
+      return unless [:decrement_counter, :increment_counter].include? method_sym
+
+      each_counter_cached_association_reflection do |assoc_reflection|
+        associated_object = send(assoc_reflection.name)
+        counter_cache_column = assoc_reflection.counter_cache_column
+        associated_object.class.send(method_sym, counter_cache_column, associated_object.id)
+      end
+    end
+
+    def each_counter_cached_association_reflection
+      _reflections.each do |name, reflection|
+        yield reflection if reflection.belongs_to? && reflection.counter_cache_column == "#{self.class.name.underscore.pluralize}_count"
+      end
+    end
+
+    def increment_counters_on_associations
+        update_counters_on_associations :increment_counter
+    end
+
+    def decrement_counters_on_associations
+        update_counters_on_associations :decrement_counter
+    end
   end
 end

data/lib/acts_as_paranoid/validations.rb

@@ -8,10 +8,9 @@ module ActsAsParanoid
 
     class UniquenessWithoutDeletedValidator
       def self.[](version)
-        version = version.to_s
-        name = "V#{version.tr('.', '_')}"
+        name = "V#{version.to_s.tr('.', '_')}"
         unless constants.include? name.to_sym
-          raise "Unknown validator version #{version.inspect}; expected one of #{constants.sort.join(', ')}"
+          raise "Unknown validator version #{name.inspect}; expected one of #{constants.sort.join(', ')}"
         end
         const_get name
       end
@@ -38,8 +37,11 @@ module ActsAsParanoid
         protected
 
         def build_relation(klass, attribute, value)
-          return super(klass, klass.arel_table, attribute, value) if ActiveRecord::VERSION::MINOR == 0
-          super
+          if ActiveRecord::VERSION::MINOR == 0 && ActiveRecord::VERSION::MAJOR == 5
+            return super(klass, klass.arel_table, attribute, value)
+          else
+            super
+          end
         end
       end
 
@@ -75,6 +77,9 @@ module ActsAsParanoid
           end
         end
       end
+
+      class V6 < V5
+      end
     end
 
     module ClassMethods

data/lib/acts_as_paranoid/version.rb

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

data/test/test_associations.rb

@@ -41,6 +41,48 @@ class AssociationsTest < ParanoidBaseTest
     includes_values = ParanoidTime.includes(:not_paranoid).includes_values
 
     assert_equal includes_values, paranoid_has_many_dependant.association(:paranoid_time_with_scope).scope.includes_values
+
+    paranoid_time = ParanoidTime.create(name: 'not-hello')
+    paranoid_has_many_dependant.paranoid_time = paranoid_time
+    paranoid_has_many_dependant.save!
+
+    assert_nil paranoid_has_many_dependant.paranoid_time_with_scope
+
+    paranoid_time.update(name: 'hello')
+
+    paranoid_has_many_dependant.reload
+
+    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_scope
+
+    paranoid_time.destroy
+
+    paranoid_has_many_dependant.reload
+
+    assert_nil paranoid_has_many_dependant.paranoid_time_with_scope
+  end
+
+  def test_belongs_to_with_scope_and_deleted_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_with_deleted).scope.includes_values
+
+    paranoid_time = ParanoidTime.create(name: 'not-hello')
+    paranoid_has_many_dependant.paranoid_time = paranoid_time
+    paranoid_has_many_dependant.save!
+
+    assert_nil paranoid_has_many_dependant.paranoid_time_with_scope_with_deleted
+
+    paranoid_time.update(name: 'hello')
+    paranoid_has_many_dependant.reload
+
+    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_scope_with_deleted
+
+    paranoid_time.destroy
+    paranoid_has_many_dependant.reload
+
+    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_scope_with_deleted
   end
 
   def test_belongs_to_with_deleted
@@ -51,9 +93,10 @@ class AssociationsTest < ParanoidBaseTest
     assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_deleted
 
     paranoid_time.destroy
+    paranoid_has_many_dependant.reload
 
-    assert_nil paranoid_has_many_dependant.reload.paranoid_time
-    assert_equal paranoid_time, paranoid_has_many_dependant.reload.paranoid_time_with_deleted
+    assert_nil paranoid_has_many_dependant.paranoid_time
+    assert_equal paranoid_time, paranoid_has_many_dependant.paranoid_time_with_deleted
   end
 
   def test_belongs_to_polymorphic_with_deleted
@@ -228,7 +271,7 @@ class AssociationsTest < ParanoidBaseTest
   end
 
   def test_mass_assignment_of_paranoid_column_enabled
-    if ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1
+    if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('5.2.0')
       skip 'Creation as deleted is not supported with Rails >= 5.2'
     end
     now = Time.now

data/test/test_core.rb

@@ -437,4 +437,47 @@ class ParanoidTest < ParanoidBaseTest
     2.times { ps.destroy }
     assert_equal 0, ParanoidBooleanNotNullable.with_deleted.where(:id => ps).count
   end
+
+  def test_no_double_tap_destroys_fully
+    ps = ParanoidNoDoubleTapDestroysFully.create!()
+    2.times { ps.destroy }
+    assert_equal 1, ParanoidNoDoubleTapDestroysFully.with_deleted.where(:id => ps).count
+  end
+
+  def test_decrement_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_counter_cache = ParanoidWithCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.paranoid_with_counter_caches_count
+
+    paranoid_with_counter_cache.destroy
+
+    assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
+  end
+
+  def test_hard_destroy_decrement_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_counter_cache = ParanoidWithCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.paranoid_with_counter_caches_count
+
+    paranoid_with_counter_cache.destroy_fully!
+
+    assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
+  end
+
+  def test_increment_counters
+    paranoid_boolean = ParanoidBoolean.create!()
+    paranoid_with_counter_cache = ParanoidWithCounterCache.create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.paranoid_with_counter_caches_count
+
+    paranoid_with_counter_cache.destroy
+
+    assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
+
+    paranoid_with_counter_cache.recover
+
+    assert_equal 1, paranoid_boolean.reload.paranoid_with_counter_caches_count
+  end
 end

data/test/test_default_scopes.rb

@@ -4,7 +4,6 @@ class MultipleDefaultScopesTest < ParanoidBaseTest
   def setup
     setup_db
 
-    # Naturally, the default scope for humans is male. Sexism++
     ParanoidPolygon.create! :sides => 3
     ParanoidPolygon.create! :sides => 3
     ParanoidPolygon.create! :sides => 3

data/test/test_helper.rb

@@ -31,7 +31,7 @@ def setup_db
       t.string    :name
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
-
+      t.integer   :paranoid_with_counter_caches_count
       timestamps t
     end
 
@@ -148,7 +148,7 @@ def setup_db
       timestamps t
     end
 
-   create_table :paranoid_forests do |t|
+    create_table :paranoid_forests do |t|
       t.string   :name
       t.boolean  :rainforest
       t.datetime :deleted_at
@@ -208,6 +208,18 @@ def setup_db
 
       timestamps t
     end
+
+    create_table :paranoid_no_double_tap_destroys_fullies do |t|
+      t.datetime :deleted_at
+    end
+
+    create_table :paranoid_with_counter_caches do |t|
+      t.string    :name
+      t.datetime  :deleted_at
+      t.integer   :paranoid_boolean_id
+
+      timestamps t
+    end
   end
 end
 
@@ -247,6 +259,7 @@ class ParanoidBoolean < ActiveRecord::Base
 
   belongs_to :paranoid_time
   has_one :paranoid_has_one_dependant, :dependent => :destroy
+  has_many :paranoid_with_counter_cache, :dependent => :destroy
 end
 
 class ParanoidString < ActiveRecord::Base
@@ -256,6 +269,10 @@ end
 class NotParanoid < ActiveRecord::Base
 end
 
+class ParanoidNoDoubleTapDestroysFully < ActiveRecord::Base
+  acts_as_paranoid :double_tap_destroys_fully => false
+end
+
 class HasOneNotParanoid < ActiveRecord::Base
   belongs_to :paranoid_time, :with_deleted => true
 end
@@ -265,11 +282,17 @@ class DoubleHasOneNotParanoid < HasOneNotParanoid
   belongs_to :paranoid_time, :with_deleted => true
 end
 
+class ParanoidWithCounterCache < ActiveRecord::Base
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, :counter_cache => true
+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_scope, -> { where(name: 'hello').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_with_scope_with_deleted, -> { where(name: 'hello').includes(:not_paranoid) }, :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
 
   belongs_to :paranoid_belongs_dependant, :dependent => :destroy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,21 +51,27 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +120,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -121,6 +141,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/acts_as_paranoid.rb
@@ -157,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without