paranoia 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f3f587b5571dc6b69507b4b97de85c0c851bfe248048dbcc2ff792d578ebbca
-  data.tar.gz: ba5bb9bde79c1be27152df53d2d0be62e852b5e3801cb71d1b2b33fe8bfb9f6b
+  metadata.gz: 5435d5ed0b4879dda1edf99c6cebfa860d8ae87a7420dea64289b6f53fc48314
+  data.tar.gz: af9635bbfa0477de0acf5cf18160b28e4f7e18ed0e41f551ae9e8a63146d3083
 SHA512:
-  metadata.gz: 42caeef276dfc15bcc15ca8fbd2dc8001ca7e24c3577d235d12bfa8cb175b082a4d585c07e4244f2d76acb9c49127c113a7f567bea7c60514a475cf3791ac789
-  data.tar.gz: 6655a5f44f71fe45e7df8df13545acd8706a8f105bece1e838c77722fbd8fe20ae6596f0e3961976b3bd2a3ed38c5a055230500c30599f8499d845be61c22a60
+  metadata.gz: 1a8b413670e0cfc193cb061ff7a9f4edec3765bfde3c4e3f37e43ecc0136f7adecf6ffb0ba5ee29791949e98b4a07daa0bdc58cbcd9c0ee30e13daddd9c4a3b9
+  data.tar.gz: 893ade53cdf583809902904061b8deae5a337042b41df30c373937b29fa310ea9945dd494b35ae566d52005f672bf1d4529d458c684a12a0226a0197898a5b2d

data/.github/workflows/build.yml

@@ -15,40 +15,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - 3.1
-          - '3.0'
-          - 2.7
-          - 2.6
-          - 2.5
-          # - jruby-9.2.19.0
-          # - jruby-9.3.1.0
-        rails:
-          - '~> 5.1.0'
-          - '~> 5.2.0'
-          - '~> 6.0.0'
-          - '~> 6.1.0'
-          - '~> 7.0.0'
-          - 'edge'
-        exclude:
-        # Rails edge is now 7.x and requires ruby 2.7
-        - rails: 'edge'
-          ruby: 2.6
-        - rails: 'edge'
-          ruby: 2.5
-        - rails: '~> 7.0.0'
-          ruby: 2.6
-        - rails: '~> 7.0.0'
-          ruby: 2.5
-        # Legacy Rails with newer rubies
-        - rails: '~> 5.1.0'
-          ruby: '3.0'
-        - rails: '~> 5.2.0'
-          ruby: '3.0'
-        - rails: '~> 5.1.0'
-          ruby: 3.1
-        - rails: '~> 5.2.0'
-          ruby: 3.1
+        rails: ["~> 7.0.0", "~> 6.1.0", "~> 6.0.0"]
+        ruby: ["3.2.2", "3.1.4", "3.0.6", "2.7.8"]
+        include:
+          - ruby: 3.2
+            rails: 'edge'
+          # single test failure with jruby
+          #- ruby: jruby-9.4
+          #  rails: '~> 7.0.0'
+          - ruby: 2.6
+            rails: '~> 6.1.0'
+          - ruby: 2.6
+            rails: '~> 6.0.0'
+          - ruby: 2.6
+            rails: '~> 5.2.0'
+          - ruby: 2.6
+            rails: '~> 5.1.0'
+          - ruby: 2.5
+            rails: '~> 6.0.0'
+          - ruby: 2.5
+            rails: '~> 5.2.0'
+          - ruby: 2.5
+            rails: '~> 5.1.0'
+        #os: ubuntu-latest
+        #arch: x64
 
     env:
       RAILS: ${{ matrix.rails }}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # paranoia Changelog
 
+## 2.6.2
+
+* [#441](https://github.com/rubysherpas/paranoia/pull/441) Recursive restore with has_many/one through assocs (#441) 
+  [Emil Ong](https://github.com/emilong)
+
 ## 2.6.1
 
 * [#535](https://github.com/rubysherpas/paranoia/pull/535) Allow to skip updating paranoia_destroy_attributes for records while really_destroy!

data/lib/paranoia/version.rb

@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = '2.6.1'.freeze
+  VERSION = '2.6.2'.freeze
 end

data/lib/paranoia.rb

@@ -217,7 +217,12 @@ module Paranoia
 
       if association_data.nil? && association.macro.to_s == "has_one"
         association_class_name = association.klass.name
-        association_foreign_key = association.foreign_key
+
+        association_foreign_key = if association.options[:through].present?
+          association.klass.primary_key
+        else
+          association.foreign_key
+        end
 
         if association.type
           association_polymorphic_type = association.type
@@ -226,7 +231,7 @@ module Paranoia
           association_find_conditions = { association_foreign_key => self.id }
         end
 
-        association_class = association_class_name.constantize
+        association_class = association.klass
         if association_class.paranoid?
           association_class.only_deleted.where(association_find_conditions).first
             .try!(:restore, recursive: true, :recovery_window_range => recovery_window_range)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paranoia
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - radarlistener@gmail.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.11
 signing_key:
 specification_version: 4
 summary: Paranoia is a re-implementation of acts_as_paranoid for Rails 3, 4, and 5,