paranoia 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5558705162917407085514b9cc59f7be24f1a9aa8dfdc1d58588e4a7beb975e
-  data.tar.gz: b6e3bf484414fd2daa322bdf9fa5479d05815d3a14a312217854578ea5f19c8e
+  metadata.gz: d0174a966648c3afbf8ce8d09ef65361c48540838e705bb3327477f36ee27eff
+  data.tar.gz: 70a9eb72fa2cfda78c4adf5aa9918404ad5860d725ac657959f0b105fd300276
 SHA512:
-  metadata.gz: 50af9f20d148fca67815e2786fd70d6d539fb0c0ae7013abdc3dfb5707b9c1993a56ad02032f1cdd983a8d90088950b564cba9f81a6295169d61fe35d9a574fc
-  data.tar.gz: 6f46d6a812faf1efa4e8c654289a88fdd089ddbc899a12e5432161e0460bb29fe2f0d5d5611b4b5bf69f67f41fa802af53195017d8591e7727d871078e9c8dce
+  metadata.gz: 2a960433d0574c324778ae6774cc90501ee3a108c91e8aca45f91eeb59b1a80406b861b94e68b7fe391dc50c32fb7ebc034aa43296ec6ffd3bb78e863051a067
+  data.tar.gz: 765b1c436d256277a0ac54947584b90c69ffec5bad08011696e4a62267d1bf1e3b782957d904425933083b12e1fa3ce2668872acc83e04877304243ea96f9a61

data/.travis.yml

@@ -1,14 +1,15 @@
 sudo: false
 language: ruby
-before_install: gem update --system
+before_install:
+  - gem query -I -n "^bundler$" -v ">=2" || gem uninstall -x bundler -v ">=2" || rvm @global do gem uninstall -x bundler -v ">=2"
+  - gem query -i -n "^bundler$" -v "<2" || gem install bundler -v "<2"
 cache: bundler
 rvm:
-  - 2.2
   - 2.3.8
   - 2.4.5
   - 2.5.3
   - 2.6.3
-  - jruby-9.1.6.0
+  - jruby-9.2.8.0
 
 env:
   matrix:
@@ -16,24 +17,29 @@ env:
     - RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
     - RAILS='~> 5.1.0'
     - RAILS='~> 5.2.0'
+    - RAILS='~> 6.1.0'
     - RAILS='master'
 
 matrix:
   allow_failures:
     - env: RAILS='~> 4.2.0' SQLITE_VERSION='~> 1.3.6'
-      rvm: jruby-9.1.6.0
+      rvm: jruby-9.2.8.0
     - env: RAILS='~> 5.0.0' SQLITE_VERSION='~> 1.3.6'
-      rvm: jruby-9.1.6.0
+      rvm: jruby-9.2.8.0
     - env: RAILS='~> 5.1.0'
-      rvm: jruby-9.1.6.0
+      rvm: jruby-9.2.8.0
     - env: RAILS='~> 5.2.0'
-      rvm: jruby-9.1.6.0
+      rvm: jruby-9.2.8.0
     - env: RAILS='master'
-      rvm: jruby-9.1.6.0
+      rvm: jruby-9.2.8.0
+    - env: RAILS='~> 6.1.0'
+      rvm: jruby-9.2.8.0
   exclude:
-    - rvm: 2.2
-      env: RAILS='master'
     - rvm: 2.3.8
       env: RAILS='master'
     - rvm: 2.4.5
       env: RAILS='master'
+    - rvm: 2.3.8
+      env: RAILS='~> 6.1.0'
+    - rvm: 2.4.5
+      env: RAILS='~> 6.1.0'

data/lib/paranoia.rb

@@ -69,6 +69,7 @@ module Paranoia
           next unless send(association.reflection.name)
           association.decrement_counters
         end
+        @_trigger_destroy_callback = true
         @_disable_counter_cache = false
         result
       end
@@ -81,6 +82,10 @@ module Paranoia
       raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
   end
 
+  def trigger_transactional_callbacks?
+    super || @_trigger_destroy_callback && paranoia_destroyed?
+  end
+
   def paranoia_delete
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     if persisted?
@@ -311,7 +316,7 @@ module ActiveRecord
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error
         if value.present? && value.paranoia_destroyed?
-          record.errors[attribute] << 'has been soft-deleted'
+          record.errors.add(attribute, 'has been soft-deleted')
         end
       end
     end

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.4.2'.freeze
+  VERSION = '2.4.3'.freeze
 end

data/paranoia.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'activerecord', '>= 4.0', '< 6.1'
+  s.add_dependency 'activerecord', '>= 4.0', '< 6.2'
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"

data/test/paranoia_test.rb

@@ -131,6 +131,21 @@ class ParanoiaTest < test_framework
     assert model.instance_variable_get(:@after_commit_callback_called)
   end
 
+  def test_destroy_behavior_for_freshly_loaded_plain_models_callbacks
+    model = CallbackModel.new
+    model.save
+
+    model = CallbackModel.find(model.id)
+    model.destroy
+
+    assert_nil model.instance_variable_get(:@update_callback_called)
+    assert_nil model.instance_variable_get(:@save_callback_called)
+    assert_nil model.instance_variable_get(:@validate_called)
+
+    assert model.instance_variable_get(:@destroy_callback_called)
+    assert model.instance_variable_get(:@after_destroy_callback_called)
+    assert model.instance_variable_get(:@after_commit_callback_called)
+  end
 
   def test_delete_behavior_for_plain_models_callbacks
     model = CallbackModel.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - radarlistener@gmail.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ homepage: https://github.com/rubysherpas/paranoia
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,
   using much, much, much less code.