diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml index 870f4d5..d8bf4cb 100644 --- a/.github/workflows/rspec.yml +++ b/.github/workflows/rspec.yml @@ -17,12 +17,14 @@ jobs: - "3.0" - "3.1" - "3.2" + - "3.3" gemfile: - gemfiles/rails_5.2.gemfile - gemfiles/rails_6.0.gemfile - gemfiles/rails_6.1.gemfile - gemfiles/rails_7.0.gemfile - gemfiles/rails_7.1.gemfile + - gemfiles/rails_7.2.gemfile exclude: - gemfile: gemfiles/rails_5.2.gemfile ruby: "3.0" @@ -34,6 +36,8 @@ jobs: ruby: "2.6" - gemfile: gemfiles/rails_7.1.gemfile ruby: "2.6" + - gemfile: gemfiles/rails_7.2.gemfile + ruby: "2.6" env: BUNDLE_GEMFILE: ${{ format('{0}/{1}', github.workspace, matrix.gemfile) }} BUNDLE_PATH: ${{ format('{0}/vendor/bundle', github.workspace) }} diff --git a/Appraisals b/Appraisals index 3adc306..84d6eea 100644 --- a/Appraisals +++ b/Appraisals @@ -13,9 +13,13 @@ appraise "rails-6.1" do end appraise "rails-7.0" do - gem 'activemodel', '~> 7.0.8' + gem 'activemodel', '~> 7.0.8.4' end appraise "rails-7.1" do - gem 'activemodel', '~> 7.1.1' + gem 'activemodel', '~> 7.1.4' +end + +appraise "rails-7.2" do + gem 'activemodel', '~> 7.2.1' end diff --git a/Gemfile.lock b/Gemfile.lock index cc2014d..fba761c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,39 @@ PATH remote: . specs: - nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + nested_record (1.1.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ specs: - activemodel (7.1.1) - activesupport (= 7.1.1) - activesupport (7.1.1) + activemodel (7.2.1) + activesupport (= 7.2.1) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) appraisal (2.5.0) bundler rake thor (>= 0.14.0) - base64 (0.1.1) - bigdecimal (3.1.4) - concurrent-ruby (1.2.2) + base64 (0.2.0) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) connection_pool (2.4.1) diff-lcs (1.5.0) - drb (2.1.1) - ruby2_keywords - i18n (1.14.1) + drb (2.2.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.0) - mutex_m (0.1.2) + logger (1.6.1) + minitest (5.25.1) rake (13.0.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -48,7 +48,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) - ruby2_keywords (0.0.5) + securerandom (0.3.1) thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 0f77e9e..f6b7fc8 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ @@ -18,26 +18,26 @@ GEM bundler rake thor (>= 0.14.0) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - i18n (1.14.1) + concurrent-ruby (1.3.4) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.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.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + minitest (5.25.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.2) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 63f2bb0..69c4a20 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ @@ -19,30 +19,30 @@ GEM bundler rake thor (>= 0.14.0) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - i18n (1.14.1) + concurrent-ruby (1.3.4) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.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.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + minitest (5.25.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.2) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - zeitwerk (2.6.12) + zeitwerk (2.6.18) PLATFORMS ruby @@ -56,4 +56,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index f757170..3df24e3 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -2,14 +2,14 @@ PATH remote: .. specs: nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ specs: - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activesupport (6.1.7.6) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -19,29 +19,29 @@ GEM bundler rake thor (>= 0.14.0) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - i18n (1.14.1) + concurrent-ruby (1.3.4) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.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.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + minitest (5.25.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.12) + zeitwerk (2.6.18) PLATFORMS ruby @@ -55,4 +55,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 96c12d3..8864094 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -gem "activemodel", "~> 7.0.8" +gem "activemodel", "~> 7.0.8.4" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index c87ff95..9d075f5 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -2,14 +2,14 @@ PATH remote: .. specs: nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ specs: - activemodel (7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -18,26 +18,26 @@ GEM bundler rake thor (>= 0.14.0) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - i18n (1.14.1) + concurrent-ruby (1.3.4) + diff-lcs (1.5.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.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.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + minitest (5.25.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -45,7 +45,7 @@ PLATFORMS ruby DEPENDENCIES - activemodel (~> 7.0.8) + activemodel (~> 7.0.8.4) appraisal bundler (>= 2) nested_record! @@ -53,4 +53,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 17dbc1a..b515993 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -gem "activemodel", "~> 7.1.1" +gem "activemodel", "~> 7.1.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 98e737c..e692db5 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -2,14 +2,14 @@ PATH remote: .. specs: nested_record (1.1.1) - activemodel (> 5.2, < 7.2) + activemodel (> 5.2, < 8.0) GEM remote: https://rubygems.org/ specs: - activemodel (7.1.1) - activesupport (= 7.1.1) - activesupport (7.1.1) + activemodel (7.1.4) + activesupport (= 7.1.4) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -23,33 +23,31 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.1.1) - bigdecimal (3.1.4) - concurrent-ruby (1.2.2) + base64 (0.2.0) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - diff-lcs (1.5.0) - drb (2.1.1) - ruby2_keywords - i18n (1.14.1) + diff-lcs (1.5.1) + drb (2.2.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - minitest (5.20.0) - mutex_m (0.1.2) - 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.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + minitest (5.25.1) + mutex_m (0.2.0) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - ruby2_keywords (0.0.5) - thor (1.3.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -57,7 +55,7 @@ PLATFORMS ruby DEPENDENCIES - activemodel (~> 7.1.1) + activemodel (~> 7.1.4) appraisal bundler (>= 2) nested_record! @@ -65,4 +63,4 @@ DEPENDENCIES rspec (~> 3.0) BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 0000000..9aef0bb --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activemodel", "~> 7.2.1" + +gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock new file mode 100644 index 0000000..7c66a31 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile.lock @@ -0,0 +1,69 @@ +PATH + remote: .. + specs: + nested_record (1.1.1) + activemodel (> 5.2, < 8.0) + +GEM + remote: https://rubygems.org/ + specs: + activemodel (7.2.1) + activesupport (= 7.2.1) + activesupport (7.2.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + base64 (0.2.0) + bigdecimal (3.1.8) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + diff-lcs (1.5.1) + drb (2.2.1) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + logger (1.6.1) + minitest (5.25.1) + rake (13.2.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + securerandom (0.3.1) + thor (1.3.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + activemodel (~> 7.2.1) + appraisal + bundler (>= 2) + nested_record! + rake (~> 13.0) + rspec (~> 3.0) + +BUNDLED WITH + 2.5.5 diff --git a/lib/nested_record/version.rb b/lib/nested_record/version.rb index 16ce093..8b778c1 100644 --- a/lib/nested_record/version.rb +++ b/lib/nested_record/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module NestedRecord - VERSION = '1.1.1' + VERSION = '1.1.2' end diff --git a/nested_record.gemspec b/nested_record.gemspec index 5dce119..08721a7 100644 --- a/nested_record.gemspec +++ b/nested_record.gemspec @@ -27,5 +27,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "appraisal" - spec.add_dependency "activemodel", "> 5.2", "< 7.2" + spec.add_dependency "activemodel", "> 5.2", "< 8.0" end