diff --git a/Appraisals b/Appraisals index 6dd7814..51f9e65 100644 --- a/Appraisals +++ b/Appraisals @@ -15,5 +15,5 @@ appraise 'activerecord_7.2.0' do end appraise 'activerecord_8.0.0' do - gem 'activerecord', '8.0.0.beta1', '< 9' + gem 'activerecord', '8.0.0.rc1', '< 9' end diff --git a/Gemfile b/Gemfile index 779f96f..a393d0e 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,12 @@ gem 'appraisal' gem 'bundler' gem 'combustion' gem 'database_cleaner', '~> 2' +gem 'ostruct' gem 'pg', '~> 1.5' gem 'pry' gem 'rake' gem 'rspec-rails' gem 'rubocop-rspec' gem 'simplecov', '~> 0.20' +# The following version lock is necessary to support Ruby 3.1 +gem 'zeitwerk', '~> 2.6.0' diff --git a/gemfiles/activerecord_7.0.0.gemfile b/gemfiles/activerecord_7.0.0.gemfile index 6a8abc3..9b98b5a 100644 --- a/gemfiles/activerecord_7.0.0.gemfile +++ b/gemfiles/activerecord_7.0.0.gemfile @@ -6,12 +6,14 @@ gem "appraisal" gem "bundler" gem "combustion" gem "database_cleaner", "~> 2" +gem "ostruct" gem "pg", "~> 1.5" gem "pry" gem "rake" gem "rspec-rails" gem "rubocop-rspec" gem "simplecov", "~> 0.20" +gem "zeitwerk", "~> 2.6.0" gem "activerecord", "~> 7.0", "< 7.1" gem "base64" gem "bigdecimal" diff --git a/gemfiles/activerecord_7.0.0.gemfile.lock b/gemfiles/activerecord_7.0.0.gemfile.lock index fe2b928..899c8dc 100644 --- a/gemfiles/activerecord_7.0.0.gemfile.lock +++ b/gemfiles/activerecord_7.0.0.gemfile.lock @@ -7,25 +7,25 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activesupport (7.0.8.4) + activemodel (7.0.8.5) + activesupport (= 7.0.8.5) + activerecord (7.0.8.5) + activemodel (= 7.0.8.5) + activesupport (= 7.0.8.5) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -69,6 +69,7 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + ostruct (0.6.0) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) @@ -78,7 +79,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -88,9 +89,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -98,12 +99,12 @@ GEM rainbow (3.1.1) rake (13.2.1) regexp_parser (2.9.2) - rspec-core (3.13.1) + rspec-core (3.13.2) 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) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (7.0.1) @@ -115,7 +116,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -127,7 +128,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-rspec (3.0.5) + rubocop-rspec (3.1.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) simplecov (0.22.0) @@ -155,6 +156,7 @@ DEPENDENCIES database_cleaner (~> 2) drb mutex_m + ostruct parentry! pg (~> 1.5) pry @@ -162,6 +164,7 @@ DEPENDENCIES rspec-rails rubocop-rspec simplecov (~> 0.20) + zeitwerk (~> 2.6.0) BUNDLED WITH 2.5.17 diff --git a/gemfiles/activerecord_7.1.0.gemfile b/gemfiles/activerecord_7.1.0.gemfile index b8791f5..c5094e8 100644 --- a/gemfiles/activerecord_7.1.0.gemfile +++ b/gemfiles/activerecord_7.1.0.gemfile @@ -6,12 +6,14 @@ gem "appraisal" gem "bundler" gem "combustion" gem "database_cleaner", "~> 2" +gem "ostruct" gem "pg", "~> 1.5" gem "pry" gem "rake" gem "rspec-rails" gem "rubocop-rspec" gem "simplecov", "~> 0.20" +gem "zeitwerk", "~> 2.6.0" gem "activerecord", "~> 7.1", "< 7.2" gemspec path: "../" diff --git a/gemfiles/activerecord_7.1.0.gemfile.lock b/gemfiles/activerecord_7.1.0.gemfile.lock index a7de267..4c9a6c4 100644 --- a/gemfiles/activerecord_7.1.0.gemfile.lock +++ b/gemfiles/activerecord_7.1.0.gemfile.lock @@ -7,9 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.1.4) - actionview (= 7.1.4) - activesupport (= 7.1.4) + actionpack (7.1.4.1) + actionview (= 7.1.4.1) + activesupport (= 7.1.4.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -17,19 +17,19 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.4) - activesupport (= 7.1.4) + actionview (7.1.4.1) + activesupport (= 7.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.1.4) - activesupport (= 7.1.4) - activerecord (7.1.4) - activemodel (= 7.1.4) - activesupport (= 7.1.4) + activemodel (7.1.4.1) + activesupport (= 7.1.4.1) + activerecord (7.1.4.1) + activemodel (= 7.1.4.1) + activesupport (= 7.1.4.1) timeout (>= 0.4.0) - activesupport (7.1.4) + activesupport (7.1.4.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -83,6 +83,7 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + ostruct (0.6.0) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) @@ -94,7 +95,7 @@ GEM psych (5.1.2) stringio racc (1.8.1) - rack (3.1.7) + rack (3.1.8) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -109,9 +110,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.4) - actionpack (= 7.1.4) - activesupport (= 7.1.4) + railties (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -124,12 +125,12 @@ GEM regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) - rspec-core (3.13.1) + rspec-core (3.13.2) 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) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (7.0.1) @@ -141,7 +142,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -153,7 +154,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-rspec (3.0.5) + rubocop-rspec (3.1.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) simplecov (0.22.0) @@ -180,6 +181,7 @@ DEPENDENCIES bundler combustion database_cleaner (~> 2) + ostruct parentry! pg (~> 1.5) pry @@ -187,6 +189,7 @@ DEPENDENCIES rspec-rails rubocop-rspec simplecov (~> 0.20) + zeitwerk (~> 2.6.0) BUNDLED WITH 2.5.17 diff --git a/gemfiles/activerecord_7.2.0.gemfile b/gemfiles/activerecord_7.2.0.gemfile index 41e65d7..3780516 100644 --- a/gemfiles/activerecord_7.2.0.gemfile +++ b/gemfiles/activerecord_7.2.0.gemfile @@ -6,12 +6,14 @@ gem "appraisal" gem "bundler" gem "combustion" gem "database_cleaner", "~> 2" +gem "ostruct" gem "pg", "~> 1.5" gem "pry" gem "rake" gem "rspec-rails" gem "rubocop-rspec" gem "simplecov", "~> 0.20" +gem "zeitwerk", "~> 2.6.0" gem "activerecord", "~> 7.2", "< 8" gemspec path: "../" diff --git a/gemfiles/activerecord_7.2.0.gemfile.lock b/gemfiles/activerecord_7.2.0.gemfile.lock index 403f5ce..7bde8ed 100644 --- a/gemfiles/activerecord_7.2.0.gemfile.lock +++ b/gemfiles/activerecord_7.2.0.gemfile.lock @@ -7,9 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.2.1) - actionview (= 7.2.1) - activesupport (= 7.2.1) + actionpack (7.2.1.1) + actionview (= 7.2.1.1) + activesupport (= 7.2.1.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -18,19 +18,19 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.1) - activesupport (= 7.2.1) + actionview (7.2.1.1) + activesupport (= 7.2.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.2.1) - activesupport (= 7.2.1) - activerecord (7.2.1) - activemodel (= 7.2.1) - activesupport (= 7.2.1) + activemodel (7.2.1.1) + activesupport (= 7.2.1.1) + activerecord (7.2.1.1) + activemodel (= 7.2.1.1) + activesupport (= 7.2.1.1) timeout (>= 0.4.0) - activesupport (7.2.1) + activesupport (7.2.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -85,6 +85,7 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + ostruct (0.6.0) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) @@ -96,7 +97,7 @@ GEM psych (5.1.2) stringio racc (1.8.1) - rack (3.1.7) + rack (3.1.8) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -111,9 +112,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.2.1) - actionpack (= 7.2.1) - activesupport (= 7.2.1) + railties (7.2.1.1) + actionpack (= 7.2.1.1) + activesupport (= 7.2.1.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -126,12 +127,12 @@ GEM regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) - rspec-core (3.13.1) + rspec-core (3.13.2) 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) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (7.0.1) @@ -143,7 +144,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -155,7 +156,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-rspec (3.0.5) + rubocop-rspec (3.1.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -184,6 +185,7 @@ DEPENDENCIES bundler combustion database_cleaner (~> 2) + ostruct parentry! pg (~> 1.5) pry @@ -191,6 +193,7 @@ DEPENDENCIES rspec-rails rubocop-rspec simplecov (~> 0.20) + zeitwerk (~> 2.6.0) BUNDLED WITH 2.5.17 diff --git a/gemfiles/activerecord_8.0.0.gemfile b/gemfiles/activerecord_8.0.0.gemfile index 1300858..cf8e58e 100644 --- a/gemfiles/activerecord_8.0.0.gemfile +++ b/gemfiles/activerecord_8.0.0.gemfile @@ -6,12 +6,14 @@ gem "appraisal" gem "bundler" gem "combustion" gem "database_cleaner", "~> 2" +gem "ostruct" gem "pg", "~> 1.5" gem "pry" gem "rake" gem "rspec-rails" gem "rubocop-rspec" gem "simplecov", "~> 0.20" -gem "activerecord", "8.0.0.beta1", "< 9" +gem "zeitwerk", "~> 2.6.0" +gem "activerecord", "8.0.0.rc1", "< 9" gemspec path: "../" diff --git a/gemfiles/activerecord_8.0.0.gemfile.lock b/gemfiles/activerecord_8.0.0.gemfile.lock index f6dd809..ff7359f 100644 --- a/gemfiles/activerecord_8.0.0.gemfile.lock +++ b/gemfiles/activerecord_8.0.0.gemfile.lock @@ -7,9 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (8.0.0.beta1) - actionview (= 8.0.0.beta1) - activesupport (= 8.0.0.beta1) + actionpack (8.0.0.rc1) + actionview (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -17,19 +17,19 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (8.0.0.beta1) - activesupport (= 8.0.0.beta1) + actionview (8.0.0.rc1) + activesupport (= 8.0.0.rc1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (8.0.0.beta1) - activesupport (= 8.0.0.beta1) - activerecord (8.0.0.beta1) - activemodel (= 8.0.0.beta1) - activesupport (= 8.0.0.beta1) + activemodel (8.0.0.rc1) + activesupport (= 8.0.0.rc1) + activerecord (8.0.0.rc1) + activemodel (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) timeout (>= 0.4.0) - activesupport (8.0.0.beta1) + activesupport (8.0.0.rc1) base64 benchmark (>= 0.3) bigdecimal @@ -87,6 +87,7 @@ GEM nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) + ostruct (0.6.0) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) @@ -98,7 +99,7 @@ GEM psych (5.1.2) stringio racc (1.8.1) - rack (3.1.7) + rack (3.1.8) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -113,9 +114,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (8.0.0.beta1) - actionpack (= 8.0.0.beta1) - activesupport (= 8.0.0.beta1) + railties (8.0.0.rc1) + actionpack (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -128,12 +129,12 @@ GEM regexp_parser (2.9.2) reline (0.5.10) io-console (~> 0.5) - rspec-core (3.13.1) + rspec-core (3.13.2) 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) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (7.0.1) @@ -145,7 +146,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -157,7 +158,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-rspec (3.0.5) + rubocop-rspec (3.1.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -182,11 +183,12 @@ PLATFORMS ruby DEPENDENCIES - activerecord (= 8.0.0.beta1, < 9) + activerecord (= 8.0.0.rc1, < 9) appraisal bundler combustion database_cleaner (~> 2) + ostruct parentry! pg (~> 1.5) pry @@ -194,6 +196,7 @@ DEPENDENCIES rspec-rails rubocop-rspec simplecov (~> 0.20) + zeitwerk (~> 2.6.0) BUNDLED WITH 2.5.20