deferring 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14441d2a2db2d40728af34eb27b47b4da1c7961a716be04a10019468298f7cfc
-  data.tar.gz: ddef46c10b1d7fd9f6e44a1f2e5507937c85e42af8424bc8f2d5d96e156de96a
+  metadata.gz: 16ac4b671c0daeb7924ebbd1ee8f3261706cbb48f4f28e2e30eb3399debfd2f6
+  data.tar.gz: 849d826f34488eeb42c31ef2a0827e2cf5d47e270b850d432eeee45439fea75b
 SHA512:
-  metadata.gz: 54eedbbfc6be7e60b517e38a94c1b0b248dd55e52ef90036ea17e4148c92ccf0b37ed153732e28601368704a238ec8dc9178cf7eacf3cacf3af180306bf6a0a4
-  data.tar.gz: 4c2f00b244eb1cab289353e5abcb46cdd48e58e656c83dbc5316af84ad826fb20d0974acd57ff5e90e78656044ce0cb800c9f84e87fc4bd8a36065433b0b01b8
+  metadata.gz: a47992cf72829202ea50280df6517ec6fa3607b964d2fb20faf441c62b114d634c75675d1bb778cd386179907666ef1733a0f409803e1baeb39305cb7af63515
+  data.tar.gz: 1497c96ecfcf8100221a5bb0bb24c04ddb1a183c860e683d3c1d70b76d14f2cce9d88c22ce30e07f578ec5a318b707355d175dd6a41e76f0c44c3fd4ab460017

data/.travis.yml

@@ -1,26 +1,17 @@
 language: ruby
 
 rvm:
-  - 2.3.8
-  - 2.4.6
   - 2.5.5
   - 2.6.3
   - 2.7.1
 
 gemfile:
-  - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_52.gemfile
   - gemfiles/rails_60.gemfile
+  - gemfiles/rails_61.gemfile
 
 sudo: false
 
 script: 'bundle exec rake'
-
-matrix:
-  exclude:
-  - rvm: 2.3.8
-    gemfile: gemfiles/rails_60.gemfile
-  - rvm: 2.4.6
-    gemfile: gemfiles/rails_60.gemfile

data/Appraisals

@@ -1,8 +1,3 @@
-appraise 'rails-42' do
-  gem 'activerecord', '4.2.11.3'
-  gem 'sqlite3', '~> 1.3.6'
-end
-
 appraise 'rails-50' do
   gem 'activerecord', '5.0.7.2'
   gem 'sqlite3', '~> 1.3.6'
@@ -14,11 +9,16 @@ appraise 'rails-51' do
 end
 
 appraise 'rails-52' do
-  gem 'activerecord', '5.2.4.3'
+  gem 'activerecord', '5.2.8.1'
   gem 'sqlite3'
 end
 
 appraise 'rails-60' do
-  gem 'activerecord', '6.0.3.2'
+  gem 'activerecord', '6.0.6.1'
+  gem 'sqlite3'
+end
+
+appraise 'rails-61' do
+  gem 'activerecord', '6.1.7.1'
   gem 'sqlite3'
 end

data/README.md

@@ -6,7 +6,7 @@
 Deferring makes it possible to delay saving ActiveRecord associations until the
 parent object has been saved.
 
-Currently supporting Rails 4.2, 5.0, 5.1 & 5.2 on MRI Ruby 2.3+.
+Currently supporting Rails 5.x, 6.0 & 6.1 on MRI Ruby 2.5+.
 
 It is important to note that Deferring does not touch the original `has_many`
 and `has_and_belongs_to_many` associations. You can use them, without worrying

data/deferring.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', ['>= 4.2']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'appraisal'

data/gemfiles/rails_42.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deferring (0.7.0)
+    deferring (0.7.1)
       activerecord (>= 4.2)
 
 GEM
@@ -56,11 +56,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 4.2.11.3)
   appraisal
-  bundler (~> 1.3)
+  bundler
   deferring!
   rake
   rspec
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.17.3
+   2.2.32

data/gemfiles/rails_50.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deferring (0.7.0)
+    deferring (0.8.0)
       activerecord (>= 4.2)
 
 GEM
@@ -54,11 +54,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 5.0.7.2)
   appraisal
-  bundler (~> 1.3)
+  bundler
   deferring!
   rake
   rspec
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.17.3
+   2.2.32

data/gemfiles/rails_51.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    deferring (0.7.0)
+    deferring (0.8.0)
       activerecord (>= 4.2)
 
 GEM
@@ -54,11 +54,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 5.1.7)
   appraisal
-  bundler (~> 1.3)
+  bundler
   deferring!
   rake
   rspec
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.2.32

data/gemfiles/rails_52.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5.2.4.3"
+gem "activerecord", "5.2.8.1"
 gem "sqlite3"
 
 gemspec path: "../"

data/gemfiles/rails_52.gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: ..
   specs:
-    deferring (0.7.0)
+    deferring (0.8.0)
       activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activerecord (5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activesupport (5.2.4.3)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -23,11 +23,11 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    i18n (1.8.3)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.17.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -45,20 +45,20 @@ GEM
     sqlite3 (1.4.2)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 5.2.4.3)
+  activerecord (= 5.2.8.1)
   appraisal
-  bundler (~> 1.3)
+  bundler
   deferring!
   rake
   rspec
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.2.32

data/gemfiles/rails_60.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "6.0.3.2"
+gem "activerecord", "6.0.6.1"
 gem "sqlite3"
 
 gemspec path: "../"

data/gemfiles/rails_60.gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: ..
   specs:
-    deferring (0.7.0)
+    deferring (0.8.0)
       activerecord (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -22,11 +22,11 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
-    i18n (1.8.3)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.17.0)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -44,21 +44,21 @@ GEM
     sqlite3 (1.4.2)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 6.0.3.2)
+  activerecord (= 6.0.6.1)
   appraisal
-  bundler (~> 1.3)
+  bundler
   deferring!
   rake
   rspec
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.2.32

data/gemfiles/rails_61.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.1.7.1"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails_61.gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: ..
+  specs:
+    deferring (0.8.0)
+      activerecord (>= 4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activerecord (6.1.7.1)
+      activemodel (= 6.1.7.1)
+      activesupport (= 6.1.7.1)
+    activesupport (6.1.7.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.17.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sqlite3 (1.6.0-x86_64-linux)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.6)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (= 6.1.7.1)
+  appraisal
+  bundler
+  deferring!
+  rake
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   2.2.32

data/lib/deferring/version.rb

@@ -1,3 +1,3 @@
 module Deferring
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/lib/deferring.rb

@@ -14,7 +14,7 @@ module Deferring
     autosave = options.fetch(:autosave, true)
     validate = options.fetch(:validate, true)
 
-    has_and_belongs_to_many(*args, options)
+    has_and_belongs_to_many(*args, **options)
     generate_deferred_association_methods(
       args.first.to_s,
       listeners,
@@ -34,7 +34,7 @@ module Deferring
     autosave = options.fetch(:autosave, true)
     validate = options.fetch(:validate, true)
 
-    has_many(*args, options)
+    has_many(*args, **options)
     generate_deferred_association_methods(
       args.first.to_s,
       listeners,
@@ -238,10 +238,17 @@ module Deferring
         unless record.valid?
           valid = false
           if autosave
-            record.errors.each do |attribute, message|
-              attribute = "#{association_name}.#{attribute}"
-              errors[attribute] << message
-              errors[attribute].uniq!
+            if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
+              record.errors.each do |error|
+                attribute = "#{association_name}.#{error.attribute}"
+                errors.add(attribute, error.message) unless errors.added?(attribute, error.message)
+              end
+            else
+              record.errors.each do |attribute, message|
+                attribute = "#{association_name}.#{attribute}"
+                errors[attribute] << message
+                errors[attribute].uniq!
+              end
             end
           else
             errors.add(association_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,8 @@ files:
 - gemfiles/rails_52.gemfile.lock
 - gemfiles/rails_60.gemfile
 - gemfiles/rails_60.gemfile.lock
+- gemfiles/rails_61.gemfile
+- gemfiles/rails_61.gemfile.lock
 - lib/deferring.rb
 - lib/deferring/deferred_association.rb
 - lib/deferring/deferred_callback_listener.rb
@@ -141,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Defer saving ActiveRecord associations until parent is saved