nested_record 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751a609790c41beec0e7d322daebcd7842f741feb3fc12ff7b102ca84dbff317
-  data.tar.gz: 160227615a2e00b882e7b8b2f0499b71fa250f3de39626ebf4e1362b20c95351
+  metadata.gz: 0761ce9c739c3f58d9ee2b52552664015df2d6fb6aed4dab164dd33038fbc1fe
+  data.tar.gz: 2d63fb82c3be079c5de28599ca02d0d4ddeb20c5a82f554901601bbaa8b70011
 SHA512:
-  metadata.gz: ab39393d9887e667af189a318cb68925115a67fa86a4774f8ef1694eed63ce0f41ecc397d0e1043d0c704d8765ab74cc7e1ee17d5de392f5e6b379f173c26d1e
-  data.tar.gz: 57422022e56c3011e4cdcc641658523413c5556f7ddefa8b2a11a17d1017b9827f7d2d4cfda1a93af5be62f7bdeddc1c1eddadc99bafc43b3b6d09034edca905
+  metadata.gz: 8ff11ab93295ca0d08551e513f81b6f086c115c264c7c3ae7843fcb34dcae099b549f2501b9cad65425708593a018b76af00ab2e76339317dbd9ad57a759a9ef
+  data.tar.gz: d6cb9f2f8fcc4c7b958905e93690cb8f7e319fad664780e4e1abb311b15d66f7c6f28b756874a5f1035c31ecd2fcf03935ee35f711e66d411595a86ea66b6b65

data/.github/workflows/rspec.yml

@@ -12,17 +12,28 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5.x
-          - 2.6.x
-          - 2.7.x
-          - 3.0.x
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
         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
         exclude:
           - gemfile: gemfiles/rails_5.2.gemfile
-            ruby: 3.0.x
+            ruby: "3.0"
+          - gemfile: gemfiles/rails_5.2.gemfile
+            ruby: "3.1"
+          - gemfile: gemfiles/rails_5.2.gemfile
+            ruby: "3.2"
+          - gemfile: gemfiles/rails_7.0.gemfile
+            ruby: "2.6"
+          - gemfile: gemfiles/rails_7.1.gemfile
+            ruby: "2.6"
     env:
       BUNDLE_GEMFILE: ${{ format('{0}/{1}', github.workspace, matrix.gemfile) }}
       BUNDLE_PATH: ${{ format('{0}/vendor/bundle', github.workspace) }}
@@ -31,23 +42,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Setup ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Install Bundler
-        run: gem install bundler:2.2.14
-      - name: Cache Bundler
-        uses: actions/cache@v1
-        id: cache-bundler
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ matrix.ruby }}-${{ hashFiles(format('{0}/{1}.lock', github.workspace, matrix.gemfile)) }}
-          restore-keys: |
-            ${{ runner.os }}-gem-${{ matrix.ruby }}-
-      - name: Install Bundler dependencies
-        if: steps.cache-bundler.outputs.cache-hit != 'true'
-        run: bundle install --jobs=4
-      - name: Check Bunlder dependencies
-        run: bundle check
+          bundler-cache: true
       - name: RSpec
         run: bundle exec rspec

data/Appraisals

@@ -1,11 +1,21 @@
+# frozen_string_literal: true
+
 appraise "rails-5.2" do
-  gem 'activemodel', '~> 5.2.4'
+  gem 'activemodel', '~> 5.2.8.1'
 end
 
 appraise "rails-6.0" do
-  gem 'activemodel', '~> 6.0.3'
+  gem 'activemodel', '~> 6.0.6.1'
 end
 
 appraise "rails-6.1" do
-  gem 'activemodel', '~> 6.1.3'
+  gem 'activemodel', '~> 6.1.7.6'
+end
+
+appraise "rails-7.0" do
+  gem 'activemodel', '~> 7.0.8'
+end
+
+appraise "rails-7.1" do
+  gem 'activemodel', '~> 7.1.1'
 end

data/Gemfile.lock

@@ -1,47 +1,57 @@
 PATH
   remote: .
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.9)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -105,6 +105,124 @@ user.profile_attributes = {
 }
 ```
 
+## Advanced usage
+
+`nested_record` can do many different things for you!
+
+### Validations
+
+Every `NestedRecord::Base` descendant in fact is an `ActiveModel::Model` so standard validations are also supported.
+
+```ruby
+class Profile < NestedRecord::Base
+  attribute :age,    :integer
+  attribute :active, :boolean
+
+  validates :age, presence: true
+end
+```
+
+### Don't bother with defining record micro-classes
+
+If you want so, you can rewrite the above example this way:
+
+```ruby
+class User < ApplicationRecord
+  has_one_nested :profile do
+    attribute :age, :integer
+    attribute :active, :boolean
+    has_one_nested :contacts do
+      attribute :email, :string
+      attribute :phone, :string
+      has_many_nested :socials do
+        attribute :name
+        attribute :url
+      end
+    end
+  end
+end
+```
+
+Record classes then available under _local types_ namespace module e.g. `User::LocalTypes::Profile`.
+
+### Concerns
+
+Common attributes, validations and other settings can be DRY-ed to modules called _concerns_.
+
+```ruby
+module TitleAndDescription
+  extend NestedRecord::Concern
+  
+  attribute :title
+  attribute :description
+  
+  validates :title, presence: true
+end
+
+class Article < NestedRecord::Base
+  has_one_nested :foo do
+    include TitleAndDescription
+  end
+end
+```
+
+### `:class_name` option
+
+By default, class name of nested record is automatically inferred from the association name but of course it's all customizable. There's a `:class_name` option for this!
+
+Depending on what form do you use — `has_* :foo` or `has_* :foo do ... end`, the `:class_name` option means different things.
+
+#### `:class_name` option when referring an external model
+
+In a non-`&block` form, the `:class_name` behaves similar to the option with same name in ActiveRecord's `has_one`/`has_many` associations.
+
+```ruby
+class User < ApplicationRecord
+  has_one_nested :profile, class_name: 'SomeNamespace::Profile'
+end
+
+class SomeNamespace::Profile < NestedRecord::Base
+  attribute :age, :integer
+  attribute :active, :boolean
+end
+```
+
+#### `:class_name` option when using with an embedded _local types_
+
+When record definition is embedded, `:class_name` option denotes the name of the class in _local types_ namespace module under which it's defined.
+
+```ruby
+class User < ApplicationRecord
+  has_one_nested :profile, class_name: 'ProfileRecord' do
+    attribute :age, :integer
+    attribute :active, :boolean
+  end
+end
+```
+
+Then the profile model is available under `User::LocalTypes::ProfileRecord` name.
+
+You can also disable the const naming at all, passing `class_name: false`. In this case, the _local type_ is anonymous so no constant in _local types_ namespace is set.
+
+`class_name: true` (the default) means infer the class name from association name e.g. `User::LocalTypes::Profile` constant is set by default.
+
+### `nested_accessors`
+
+This is the `store_accessor` on steroids! Unlike `store_accessor` it's support nesting, type coercions and all other things this library can do. Think of it as a `has_one_nested` association with accessors lifted up one level.
+
+```ruby
+class User < ApplicationRecord
+  nested_accessors from: :profile do
+    attribute :age, :integer
+    attribute :active, :integer
+  end
+end
+
+user = User.new
+user.age = 33
+user.active = true
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/gemfiles/rails_5.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 5.2.4"
+gem "activemodel", "~> 5.2.8.1"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,52 +1,52 @@
 PATH
   remote: ..
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activesupport (5.2.4.5)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.9)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 5.2.4)
+  activemodel (~> 5.2.8.1)
   appraisal
   bundler (>= 2)
   nested_record!
@@ -54,4 +54,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.14
+   2.3.22

data/gemfiles/rails_6.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 6.0.3"
+gem "activemodel", "~> 6.0.6.1"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile.lock

@@ -1,54 +1,54 @@
 PATH
   remote: ..
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activesupport (6.0.3.5)
+    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)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.9)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 6.0.3)
+  activemodel (~> 6.0.6.1)
   appraisal
   bundler (>= 2)
   nested_record!
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.14
+  2.4.20

data/gemfiles/rails_6.1.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 6.1.3"
+gem "activemodel", "~> 6.1.7.6"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile.lock

@@ -1,53 +1,53 @@
 PATH
   remote: ..
   specs:
-    nested_record (1.1.0)
-      activemodel (>= 4.2, < 6.2)
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.4.0)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
-    i18n (1.8.9)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 6.1.3)
+  activemodel (~> 6.1.7.6)
   appraisal
   bundler (>= 2)
   nested_record!
@@ -55,4 +55,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.14
+  2.4.20

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.0.8"
+
+gemspec path: "../"

data/gemfiles/rails_7.0.gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
+      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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    thor (1.3.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 7.0.8)
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+  2.4.20

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.1.1"
+
+gemspec path: "../"

data/gemfiles/rails_7.1.gemfile.lock

@@ -0,0 +1,68 @@
+PATH
+  remote: ..
+  specs:
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
+    i18n (1.14.1)
+      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)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      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)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 7.1.1)
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+  2.4.20

data/lib/nested_record/base.rb

@@ -143,11 +143,11 @@ class NestedRecord::Base
       subclass ||=
         begin
           if type_name.start_with?('::')
-            ActiveSupport::Dependencies.constantize(type_name)
+            NestedRecord.constantize(type_name)
           elsif subtypes_store_full?
-            ActiveSupport::Dependencies.constantize(type_name)
+            NestedRecord.constantize(type_name)
           elsif subtypes_namespace
-            ActiveSupport::Dependencies.safe_constantize("#{subtypes_namespace}::#{type_name}") || ActiveSupport::Dependencies.constantize(type_name)
+            NestedRecord.safe_constantize("#{subtypes_namespace}::#{type_name}") || NestedRecord.constantize(type_name)
           else
             NestedRecord.lookup_const(self, type_name)
           end

data/lib/nested_record/collection_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NestedRecord::CollectionProxy
   extend Forwardable
   include Enumerable

data/lib/nested_record/lookup_const.rb

@@ -1,18 +1,36 @@
 # frozen_string_literal: true
 
 module NestedRecord
-  # Derived from Rails source: https://github.com/rails/rails/blob/98a57aa5f610bc66af31af409c72173cdeeb3c9e/activerecord/lib/active_record/inheritance.rb#L181-L207
+  # TODO: Remove this when we drop support for Rails < 7.0
+  if ActiveSupport::VERSION::MAJOR < 7
+    def self.constantize(type_name)
+      ActiveSupport::Dependencies.constantize(type_name)
+    end
+
+    def self.safe_constantize(type_name)
+      ActiveSupport::Dependencies.safe_constantize(type_name)
+    end
+  else
+    def self.constantize(type_name)
+      type_name.constantize
+    end
 
+    def self.safe_constantize(type_name)
+      type_name.safe_constantize
+    end
+  end
+
+  # Derived from Rails source: https://github.com/rails/rails/blob/98a57aa5f610bc66af31af409c72173cdeeb3c9e/activerecord/lib/active_record/inheritance.rb#L181-L207
   def self.lookup_const(owner, type_name)
     if type_name.start_with?('::')
-      ActiveSupport::Dependencies.constantize(type_name)
+      NestedRecord.constantize(type_name)
     else
       candidates = []
       owner.name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
       candidates << type_name
 
       candidates.each do |candidate|
-        constant = ActiveSupport::Dependencies.safe_constantize(candidate)
+        constant = NestedRecord.safe_constantize(candidate)
         return constant if candidate == constant.to_s
       end
 

data/lib/nested_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NestedRecord
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/nested_record.rb

@@ -5,6 +5,7 @@ module NestedRecord
 
   require 'active_model'
   require 'active_support/dependencies'
+  require 'active_support/inflector'
   require 'active_support/concern'
   require 'active_support/json'
 

data/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", ">= 4.2", "< 6.2"
+  spec.add_dependency "activemodel", "> 5.2", "< 7.2"
 end

data/spec/support/model.rb

@@ -64,9 +64,19 @@ module TestModel
   module Erase
     def erase_test_consts
       Array(@test_consts).reverse_each do |klass|
-        ActiveSupport::Dependencies.remove_constant(klass.name)
+        remove_constant(klass.name)
+      end
+      ActiveSupport::Dependencies.clear unless zeitwerk?
+    end
+
+    def remove_constant(klass_name)
+      if ActiveSupport::Dependencies.respond_to?(:remove_constant)
+        ActiveSupport::Dependencies.remove_constant(klass_name)
+      else
+        base, _, object = klass_name.to_s.rpartition('::')
+        base = base.empty? ? Object : NestedRecord.constantize(base)
+        base.send :remove_const, object
       end
-      ActiveSupport::Dependencies.clear
     end
 
     def test_const_dig_name!(name)
@@ -85,5 +95,9 @@ module TestModel
       end
       [namespace, name]
     end
+
+    def zeitwerk?
+      ActiveSupport::VERSION::MAJOR >= 7
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_record
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vladimir Kochnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,22 +70,22 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.2'
 description:
 email:
 - hashtable@yandex.ru
@@ -110,6 +110,10 @@ files:
 - gemfiles/rails_6.0.gemfile.lock
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_6.1.gemfile.lock
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.0.gemfile.lock
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.1.gemfile.lock
 - lib/nested_record.rb
 - lib/nested_record/base.rb
 - lib/nested_record/collection.rb
@@ -157,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: ActiveModel mapper for JSON fields