nested_record 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5710483535afba122d37dded3a1cf743254f6a2ea43e40ad126adf8a98bf8ed3
-  data.tar.gz: 6219144c936fae21346f49380082b773e44c6e1bbed670de53f6b96a5d4200ec
+  metadata.gz: 0761ce9c739c3f58d9ee2b52552664015df2d6fb6aed4dab164dd33038fbc1fe
+  data.tar.gz: 2d63fb82c3be079c5de28599ca02d0d4ddeb20c5a82f554901601bbaa8b70011
 SHA512:
-  metadata.gz: dbfb5c90d3a43c9a0671af39bc3969ca544deb1ba58809800d018621d4dccded78efdba763dfb425299236cb8fd631dfe6b30786fdab45d1fe6b712070afd0fd
-  data.tar.gz: b18afab1feb7f6e29cac1cfec75a7b4176c3a35bf3de85a6b411d4a6501617f363c5e757d04cd009094002cba78c45682f189ad9235908598db04e65aac3e0da
+  metadata.gz: 8ff11ab93295ca0d08551e513f81b6f086c115c264c7c3ae7843fcb34dcae099b549f2501b9cad65425708593a018b76af00ab2e76339317dbd9ad57a759a9ef
+  data.tar.gz: d6cb9f2f8fcc4c7b958905e93690cb8f7e319fad664780e4e1abb311b15d66f7c6f28b756874a5f1035c31ecd2fcf03935ee35f711e66d411595a86ea66b6b65

data/.github/workflows/rspec.yml

@@ -0,0 +1,50 @@
+name: RSpec
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - "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"
+          - 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) }}
+      BUNDLE_DEPLOYMENT: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: RSpec
+        run: bundle exec rspec

data/.gitignore

@@ -6,8 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/Gemfile.lock
-/gemfiles/*.lock
 
 # rspec failure tracking
 .rspec_status

data/Appraisals

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+appraise "rails-5.2" do
+  gem 'activemodel', '~> 5.2.8.1'
+end
+
+appraise "rails-6.0" do
+  gem 'activemodel', '~> 6.0.6.1'
+end
+
+appraise "rails-6.1" do
+  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

@@ -0,0 +1,67 @@
+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.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.2.14

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

@@ -1,5 +1,7 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.3"
+gem "activemodel", "~> 5.2.8.1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: ..
+  specs:
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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.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)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 5.2.8.1)
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   2.3.22

data/gemfiles/rails_6.0.gemfile

@@ -1,5 +1,7 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "activemodel", "~> 6.0.6.1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: ..
+  specs:
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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.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)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 6.0.6.1)
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+  2.4.20

data/gemfiles/rails_6.1.gemfile

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

data/gemfiles/rails_6.1.gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: ..
+  specs:
+    nested_record (1.1.1)
+      activemodel (> 5.2, < 7.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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.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)
+    zeitwerk (2.6.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 6.1.7.6)
+  appraisal
+  bundler (>= 2)
+  nested_record!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+  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
@@ -247,7 +247,9 @@ class NestedRecord::Base
   end
 
   def read_attribute(attr)
-    attribute(attr)
+    name = attr.to_s
+    name = self.class.attribute_aliases[name] || name
+    @attributes.fetch_value(name)
   end
 
   def query_attribute(attr)

data/lib/nested_record/collection.rb

@@ -21,7 +21,7 @@ class NestedRecord::Collection
 
   def each
     return to_enum(:each) unless block_given?
-    @ary.each(&proc)
+    @ary.each { |obj| yield obj }
   end
 
   def to_ary
@@ -70,19 +70,19 @@ class NestedRecord::Collection
 
   def select!
     return to_enum(:select!) unless block_given?
-    @ary.select!(&proc)
+    @ary.select! { |obj| yield obj }
     self
   end
 
   def reject!
     return to_enum(:reject!) unless block_given?
-    @ary.reject!(&proc)
+    @ary.reject! { |obj| yield obj }
     self
   end
 
   def sort_by!
     return to_enum(:sort_by!) unless block_given?
-    @ary.sort_by!(&proc)
+    @ary.sort_by! { |obj| yield obj }
     self
   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/macro_recorder.rb

@@ -28,16 +28,20 @@ class NestedRecord::MacroRecorder
     after_initialize
     before_validation after_validation
   ].freeze.each do |meth|
-    define_method(meth) do |*args, &block|
-      @macros << [meth, args, block]
+    define_method(meth) do |*args, **kwargs, &block|
+      @macros << [meth, args, kwargs, block]
     end
   end
 
   def apply_to(mod_or_class)
     macros = @macros
     mod_or_class.module_eval do
-      macros.each do |meth, args, block|
-        public_send(meth, *args, &block)
+      macros.each do |meth, args, kwargs, block|
+        if kwargs.empty?
+          public_send(meth, *args, &block)
+        else
+          public_send(meth, *args, **kwargs, &block)
+        end
       end
     end
   end

data/lib/nested_record/methods/many.rb

@@ -95,24 +95,40 @@ class NestedRecord::Methods
 
     def validation_method_body
       name = @setup.name
-      proc do
-        collection = public_send(name)
-        collection.map.with_index do |record, index|
-          next true if record.valid?
-          record.errors.each do |attribute, message|
-            error_attribute = "#{name}[#{index}].#{attribute}"
-            errors[error_attribute] << message
-            errors[error_attribute].uniq!
-          end
-          record.errors.details.each_key do |attribute|
-            error_attribute = "#{name}[#{index}].#{attribute}"
-            record.errors.details[attribute].each do |error|
-              errors.details[error_attribute] << error
-              errors.details[error_attribute].uniq!
+      if ActiveModel::VERSION::MAJOR < 6 || (ActiveModel::VERSION::MAJOR == 6 && ActiveModel::VERSION::MINOR < 1)
+        proc do
+          collection = public_send(name)
+          collection.map.with_index do |record, index|
+            next true if record.valid?
+            record.errors.each do |attribute, message|
+              error_attribute = "#{name}[#{index}].#{attribute}"
+              errors[error_attribute] << message
+              errors[error_attribute].uniq!
             end
-          end
-          false
-        end.all?
+            record.errors.details.each_key do |attribute|
+              error_attribute = "#{name}[#{index}].#{attribute}"
+              record.errors.details[attribute].each do |error|
+                errors.details[error_attribute] << error
+                errors.details[error_attribute].uniq!
+              end
+            end
+            false
+          end.all?
+        end
+      else
+        proc do
+          collection = public_send(name)
+          collection.map.with_index do |record, index|
+            next true if record.valid?
+            record.errors.group_by_attribute.each do |attribute, errors|
+              error_attribute = "#{name}[#{index}].#{attribute}"
+              errors.each do |error|
+                self.errors.import(error, attribute: error_attribute)
+              end
+            end
+            false
+          end.all?
+        end
       end
     end
   end

data/lib/nested_record/methods/one.rb

@@ -62,24 +62,40 @@ class NestedRecord::Methods
 
     def validation_method_body
       name = @setup.name
-      proc do
-        record = public_send(name)
-        return true unless record
-        return true if record.valid?
+      if ActiveModel::VERSION::MAJOR < 6 || (ActiveModel::VERSION::MAJOR == 6 && ActiveModel::VERSION::MINOR < 1)
+        proc do
+          record = public_send(name)
+          return true unless record
+          return true if record.valid?
 
-        record.errors.each do |attribute, message|
-          error_attribute = "#{name}.#{attribute}"
-          errors[error_attribute] << message
-          errors[error_attribute].uniq!
+          record.errors.each do |attribute, message|
+            error_attribute = "#{name}.#{attribute}"
+            errors[error_attribute] << message
+            errors[error_attribute].uniq!
+          end
+          record.errors.details.each_key do |attribute|
+            error_attribute = "#{name}.#{attribute}"
+            record.errors.details[attribute].each do |error|
+              errors.details[error_attribute] << error
+              errors.details[error_attribute].uniq!
+            end
+          end
+          false
         end
-        record.errors.details.each_key do |attribute|
-          error_attribute = "#{name}.#{attribute}"
-          record.errors.details[attribute].each do |error|
-            errors.details[error_attribute] << error
-            errors.details[error_attribute].uniq!
+      else
+        proc do
+          record = public_send(name)
+          return true unless record
+          return true if record.valid?
+
+          record.errors.group_by_attribute.each do |attribute, errors|
+            error_attribute = "#{name}.#{attribute}"
+            errors.each do |error|
+              self.errors.import(error, attribute: error_attribute)
+            end
           end
+          false
         end
-        false
       end
     end
   end

data/lib/nested_record/type.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class NestedRecord::Type < ActiveRecord::Type::Json
+class NestedRecord::Type < ActiveModel::Type::Value
   require 'nested_record/type/many'
   require 'nested_record/type/one'
 
@@ -13,11 +13,16 @@ class NestedRecord::Type < ActiveRecord::Type::Json
   end
 
   def deserialize(value)
-    cast_value(super)
+    value = if value.is_a?(::String)
+      ActiveSupport::JSON.decode(value) rescue nil
+    else
+      value
+    end
+    cast_value(value)
   end
 
   def serialize(obj)
-    super(obj&.as_json)
+    ActiveSupport::JSON.encode(obj.as_json) unless obj.nil?
   end
 
   private

data/lib/nested_record/version.rb

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

data/lib/nested_record.rb

@@ -3,9 +3,11 @@ module NestedRecord
 
   require 'forwardable'
 
-  require 'active_record'
+  require 'active_model'
   require 'active_support/dependencies'
+  require 'active_support/inflector'
   require 'active_support/concern'
+  require 'active_support/json'
 
   require 'nested_record/macro'
   require 'nested_record/base'

data/nested_record.gemspec

@@ -22,11 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "appraisal"
 
-  spec.add_dependency "rails", ">= 5.2", "<= 6.0"
+  spec.add_dependency "activemodel", "> 5.2", "< 7.2"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'bundler/setup'
 require 'nested_record'
-require 'pry'
 
 Dir[File.join(__dir__, 'support/**/*.rb')].each { |f| require f }
 

data/spec/support/model.rb

@@ -53,7 +53,7 @@ module TestModel
         include NestedRecord::Macro
 
         def read_attribute(attr)
-          attribute(attr)
+          attribute(attr.to_s)
         end
 
         class_eval(&block) if block
@@ -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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nested_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vladimir Kochnev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,57 +67,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
-description: 
+        version: '7.2'
+description:
 email:
 - hashtable@yandex.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- Appraisals
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_5.2.gemfile.lock
 - gemfiles/rails_6.0.gemfile
+- 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
@@ -150,7 +146,7 @@ homepage: https://github.com/marshall-lee/nested_record
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: ActiveModel mapper for JSON fields
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5
-  - 2.6
-gemfile:
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-before_install: gem install bundler -v 2.0.1