acts_as_paranoid 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a57d617e3e2f52608fefad1c84bba5d6825d1b9ea96e681ade8739461ef35796
-  data.tar.gz: 549ef0573150ba7f30740a6145cb6b52ef2916b3584199fc0bab8eba17271eb0
+  metadata.gz: '096b348280798fe5ac4770a6c57bdb0731d2c5df9e7d361551cf065fe71f0b56'
+  data.tar.gz: 3d923644ebb1ccb3e06d9c04d8a0797f1677fcec880a188dd04ec8b19c9a957a
 SHA512:
-  metadata.gz: 13ac9918fc0dc45e93d02ad799f20fe9c13afd4eba4a0b81c52201bc495a690dc80b1ab9ba9e700b7d072a61c5973dcf8d134a1049c581d61c1c0120f4444d59
-  data.tar.gz: 6bba5d24a72d45b5de90670e1c577d6172160d1ee5d3850a3d9dd3845eb2fd73060a6d441d738b99dc9aea516189a6807c0406f377997dddf8ac443f88db6fbd
+  metadata.gz: e677d8e734d9c6d72fd68feaad170f928fb159ea6a90e400632ce8365f8120a991eae46508bb04d641117fa2e24d3e38e9df6699c1d70b2cd994a4cf85c49379
+  data.tar.gz: b58a42cbf60696baffac255deb673476e5e339dbbe4bd1681959442ca2fc33a51f6d2e146755fc8f79539976d47c6244927969c82a86fdb70a553de44281e512

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Notable changes to this project will be documented in this file.
 
+## 0.7.1
+
+* Support Rails 6.1 ([#191], by [Matijs van Zuijlen][mvz])
+* Support `belongs_to` with both `:touch` and `:counter_cache` options ([#208],
+  by [Matijs van Zuijlen][mvz] with [Paul Druziak][pauldruziak])
+* Support Ruby 3.0 ([#209], by [Matijs van Zuijlen][mvz])
+
 ## 0.7.0
 
 ### Breaking changes
@@ -78,6 +85,7 @@ Notable changes to this project will be documented in this file.
 [mvz]: https://github.com/mvz
 [nedcampion]: https://github.com/nedcampion
 [ri4a]: https://github.com/ri4a
+[pauldruziak]: https://github.com/pauldruziak
 [shadydealer]: https://github.com/shadydealer
 [thebravoman]: https://github.com/thebravoman
 [valeriecodes]: https://github.com/valeriecodes
@@ -85,6 +93,9 @@ Notable changes to this project will be documented in this file.
 
 <!-- issues & pull requests -->
 
+[#209]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/209
+[#208]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/208
+[#191]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/191
 [#175]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/175
 [#173]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/173
 [#171]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/171

data/README.md

@@ -255,9 +255,9 @@ Paranoiac.create(name: 'foo').destroy
 Paranoiac.with_deleted.first.deleted? #=> true
 ```
 
-After the first call to .destroy the object is deleted?
+After the first call to `.destroy` the object is `deleted?`.
 
-You can check if the object is fully destroyed with destroyed_fully? or deleted_fully?. 
+You can check if the object is fully destroyed with `destroyed_fully?` or `deleted_fully?`.
 
 ```ruby
 Paranoiac.create(name: 'foo').destroy

data/lib/acts_as_paranoid/core.rb

@@ -138,7 +138,7 @@ module ActsAsParanoid
             # 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(id)].transpose])
+              .delete_all!([Array(self.class.primary_key), Array(id)].transpose.to_h)
             decrement_counters_on_associations
           end
 
@@ -157,7 +157,7 @@ module ActsAsParanoid
               # 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(id)].transpose])
+                .delete_all([Array(self.class.primary_key), Array(id)].transpose.to_h)
               decrement_counters_on_associations
             end
 
@@ -272,15 +272,17 @@ module ActsAsParanoid
     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|
+        reflection_options = assoc_reflection.options
+        next unless reflection_options[:counter_cache]
+
         associated_object = send(assoc_reflection.name)
         next unless associated_object
 
         counter_cache_column = assoc_reflection.counter_cache_column
         associated_object.class.send(method_sym, counter_cache_column,
                                      associated_object.id)
+        associated_object.touch if reflection_options[:touch]
       end
     end
 

data/lib/acts_as_paranoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsParanoid
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/test_core.rb

@@ -539,16 +539,18 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 1, ParanoidNoDoubleTapDestroysFully.with_deleted.where(id: ps).count
   end
 
-  def test_decrement_counters
+  def test_decrement_counters_without_touch
     paranoid_boolean = ParanoidBoolean.create!
     paranoid_with_counter_cache = ParanoidWithCounterCache
       .create!(paranoid_boolean: paranoid_boolean)
 
     assert_equal 1, paranoid_boolean.paranoid_with_counter_caches_count
+    updated_at = paranoid_boolean.reload.updated_at
 
     paranoid_with_counter_cache.destroy
 
     assert_equal 0, paranoid_boolean.reload.paranoid_with_counter_caches_count
+    assert_equal updated_at, paranoid_boolean.reload.updated_at
   end
 
   def test_decrement_custom_counters
@@ -563,6 +565,32 @@ class ParanoidTest < ParanoidBaseTest
     assert_equal 0, paranoid_boolean.reload.custom_counter_cache
   end
 
+  def test_decrement_counters_with_touch
+    paranoid_boolean = ParanoidBoolean.create!
+    paranoid_with_counter_cache = ParanoidWithTouchAndCounterCache
+      .create!(paranoid_boolean: paranoid_boolean)
+
+    assert_equal 1, paranoid_boolean.paranoid_with_touch_and_counter_caches_count
+    updated_at = paranoid_boolean.reload.updated_at
+
+    paranoid_with_counter_cache.destroy
+
+    assert_equal 0, paranoid_boolean.reload.paranoid_with_touch_and_counter_caches_count
+    assert_not_equal updated_at, paranoid_boolean.reload.updated_at
+  end
+
+  def test_touch_belongs_to
+    paranoid_boolean = ParanoidBoolean.create!
+    paranoid_with_counter_cache = ParanoidWithTouch
+      .create!(paranoid_boolean: paranoid_boolean)
+
+    updated_at = paranoid_boolean.reload.updated_at
+
+    paranoid_with_counter_cache.destroy
+
+    assert_not_equal updated_at, paranoid_boolean.reload.updated_at
+  end
+
   def test_destroy_with_optional_belongs_to_and_counter_cache
     ps = ParanoidWithCounterCacheOnOptionalBelognsTo.create!
     ps.destroy

data/test/test_helper.rb

@@ -9,6 +9,14 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+if RUBY_ENGINE == "jruby"
+  # Workaround for issue in I18n/JRuby combo.
+  # See https://github.com/jruby/jruby/issues/6547 and
+  # https://github.com/ruby-i18n/i18n/issues/555
+  require "i18n/backend"
+  require "i18n/backend/simple"
+end
+
 require "simplecov"
 SimpleCov.start do
   enable_coverage :branch
@@ -16,6 +24,7 @@ end
 
 require "acts_as_paranoid"
 require "minitest/autorun"
+require "minitest/focus"
 
 # Silence deprecation halfway through the test
 I18n.enforce_available_locales = true
@@ -41,6 +50,7 @@ def setup_db
       t.boolean   :is_deleted
       t.integer   :paranoid_time_id
       t.integer   :paranoid_with_counter_caches_count
+      t.integer   :paranoid_with_touch_and_counter_caches_count
       t.integer   :custom_counter_cache
       timestamps t
     end
@@ -271,6 +281,8 @@ class ParanoidBoolean < ActiveRecord::Base
   has_one :paranoid_has_one_dependant, dependent: :destroy
   has_many :paranoid_with_counter_cache, dependent: :destroy
   has_many :paranoid_with_custom_counter_cache, dependent: :destroy
+  has_many :paranoid_with_touch_and_counter_cache, dependent: :destroy
+  has_many :paranoid_with_touch, dependent: :destroy
 end
 
 class ParanoidString < ActiveRecord::Base
@@ -322,6 +334,18 @@ class ParanoidWithCounterCacheOnOptionalBelognsTo < ActiveRecord::Base
   end
 end
 
+class ParanoidWithTouch < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, touch: true
+end
+
+class ParanoidWithTouchAndCounterCache < ActiveRecord::Base
+  self.table_name = "paranoid_with_counter_caches"
+  acts_as_paranoid
+  belongs_to :paranoid_boolean, touch: true, counter_cache: true
+end
+
 class ParanoidHasManyDependant < ActiveRecord::Base
   acts_as_paranoid
   belongs_to :paranoid_time

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Zachary Scott
 - Goncalo Silva
 - Rick Olson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2021-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -76,22 +76,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
+        version: '5.14'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 1.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +165,7 @@ dependencies:
         version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -167,7 +175,7 @@ dependencies:
         version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.22.0
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -195,7 +203,7 @@ homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,16 +218,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+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_relations.rb
-- test/test_inheritance.rb
+- test/test_associations.rb
 - test/test_core.rb
 - test/test_default_scopes.rb
 - test/test_helper.rb
+- test/test_inheritance.rb
+- test/test_relations.rb
 - test/test_validations.rb
-- test/test_associations.rb