nested_record 1.0.0.beta → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6708f834d18f3aeb71c1c05238bd610d63d25cd04aa2019a7e08c78bc122e6cc
-  data.tar.gz: 41aa9e91f4b29e186331e5a242901c7f860fc10b1fdb42cf1cb0b00cebf17483
+  metadata.gz: 5710483535afba122d37dded3a1cf743254f6a2ea43e40ad126adf8a98bf8ed3
+  data.tar.gz: 6219144c936fae21346f49380082b773e44c6e1bbed670de53f6b96a5d4200ec
 SHA512:
-  metadata.gz: 36d195b559a3d9c0e4cdc24234dffadc9fcc7e0decfab35e98e153d3a427b1a85c1a48d4803ff0f8fa6e1c94ea81178fe6c163625276bcaeb72b187aabe05687
-  data.tar.gz: 628ca798a9e9a704ac8d4c340d4124cba83013ac721c229a46b758452109e775f2a485971a6c0c80f9cf63eb3eff670869a0b35c60d3c2a3dac400c440facf89
+  metadata.gz: dbfb5c90d3a43c9a0671af39bc3969ca544deb1ba58809800d018621d4dccded78efdba763dfb425299236cb8fd631dfe6b30786fdab45d1fe6b712070afd0fd
+  data.tar.gz: b18afab1feb7f6e29cac1cfec75a7b4176c3a35bf3de85a6b411d4a6501617f363c5e757d04cd009094002cba78c45682f189ad9235908598db04e65aac3e0da

data/.gitignore

@@ -1,4 +1,4 @@
-/.bundle/
+.bundle/
 /.yardoc
 /_yardoc/
 /coverage/
@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
+/gemfiles/*.lock
 
 # rspec failure tracking
 .rspec_status

data/.travis.yml

@@ -5,4 +5,7 @@ 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

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.3"
+
+gemspec :path => "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec :path => "../"

data/lib/nested_record.rb

@@ -1,6 +1,8 @@
 module NestedRecord
   require 'nested_record/version'
 
+  require 'forwardable'
+
   require 'active_record'
   require 'active_support/dependencies'
   require 'active_support/concern'
@@ -8,9 +10,14 @@ module NestedRecord
   require 'nested_record/macro'
   require 'nested_record/base'
   require 'nested_record/collection'
+  require 'nested_record/collection_proxy'
   require 'nested_record/setup'
+  require 'nested_record/nested_accessors_setup'
+  require 'nested_record/primary_key_check'
   require 'nested_record/methods'
   require 'nested_record/type'
   require 'nested_record/errors'
   require 'nested_record/lookup_const'
+  require 'nested_record/macro_recorder'
+  require 'nested_record/concern'
 end

data/lib/nested_record/base.rb

@@ -4,6 +4,7 @@ class NestedRecord::Base
   include ActiveModel::Model
   include ActiveModel::Attributes
   include ActiveModel::Dirty
+  include ActiveModel::Validations::Callbacks
   include NestedRecord::Macro
 
   class << self
@@ -246,7 +247,17 @@ class NestedRecord::Base
   end
 
   def read_attribute(attr)
-    @attributes.fetch_value(attr.to_s)
+    attribute(attr)
+  end
+
+  def query_attribute(attr)
+    value = read_attribute(attr)
+
+    case value
+    when true        then true
+    when false, nil  then false
+    else !value.blank?
+    end
   end
 
   def match?(attrs)
@@ -256,6 +267,8 @@ class NestedRecord::Base
         is_a? others
       when :_instance_of?, '_instance_of?'
         instance_of? others
+      when :_not_equal?, '_not_equal?'
+        !equal?(others)
       else
         ours = read_attribute(attr)
         if others.is_a? Array
@@ -268,4 +281,11 @@ class NestedRecord::Base
   end
 
   define_model_callbacks :initialize, only: :after
+  attribute_method_suffix '?'
+
+  private
+
+  def attribute?(attr)
+    query_attribute(attr)
+  end
 end

data/lib/nested_record/collection.rb

@@ -42,6 +42,7 @@ class NestedRecord::Collection
 
   def build(attributes = {})
     record_class.new(attributes).tap do |obj|
+      yield obj if block_given?
       self << obj
     end
   end
@@ -110,14 +111,19 @@ class NestedRecord::Collection
     RUBY
   end
 
+  def exists?(attrs)
+    attrs = attrs.stringify_keys
+    any? { |obj| obj.match?(attrs) }
+  end
+
   def find_by(attrs)
     attrs = attrs.stringify_keys
     find { |obj| obj.match?(attrs) }
   end
 
-  def find_or_initialize_by(attrs)
+  def find_or_initialize_by(attrs, &block)
     attrs = attrs.stringify_keys
-    find_by(attrs) || build(attrs)
+    find_by(attrs) || build(attrs, &block)
   end
 
   private

data/lib/nested_record/collection_proxy.rb

@@ -0,0 +1,68 @@
+class NestedRecord::CollectionProxy
+  extend Forwardable
+  include Enumerable
+
+  class << self
+    def subclass_for(setup)
+      Class.new(self) do
+        methods = setup.collection_class.public_instance_methods
+        methods -= NestedRecord::Collection.public_instance_methods
+        methods -= NestedRecord::CollectionProxy.public_instance_methods(false)
+        def_delegators :__collection__, *methods unless methods.empty?
+        @setup = setup
+      end
+    end
+
+    def __nested_record_setup__
+      @setup
+    end
+  end
+
+  def initialize(owner)
+    @owner = owner
+  end
+
+  def method_missing(method_name, *args, &block)
+    collection = __collection__
+    if collection.respond_to? method_name
+      collection.public_send(method_name, *args, &block)
+    else
+      super
+    end
+  end
+
+  def respond_to_missing?(method_name, _)
+    super || __collection__.respond_to?(method_name)
+  end
+
+  def build(attributes = {})
+    __collection__.build(attributes) do |record|
+      ensure_primary! record
+      yield record if block_given?
+    end
+  end
+
+  def __build__(attributes)
+    __collection__.build(attributes)
+  end
+
+  def find_or_initialize_by(attributes)
+    __collection__.find_or_initialize_by(attributes) do |record|
+      ensure_primary! record
+      yield record if block_given?
+    end
+  end
+
+  def_delegators :__collection__, *(NestedRecord::Collection.public_instance_methods(false) - public_instance_methods(false))
+
+  def __collection__
+    @owner.read_attribute(self.class.__nested_record_setup__.name)
+  end
+
+  private
+
+  def ensure_primary!(record)
+    check = self.class.__nested_record_setup__.primary_check(record.read_attribute('type'))
+    check&.perform!(__collection__, record)
+  end
+end

data/lib/nested_record/concern.rb

@@ -0,0 +1,14 @@
+module NestedRecord::Concern
+  extend Forwardable
+
+  def_delegators :macro_recorder, *(NestedRecord::MacroRecorder::MACROS - [:include])
+
+  def included(mod_or_class)
+    super
+    macro_recorder.apply_to(mod_or_class)
+  end
+
+  def macro_recorder
+    @macro_recorder ||= NestedRecord::MacroRecorder.new
+  end
+end

data/lib/nested_record/errors.rb

@@ -3,4 +3,5 @@ module NestedRecord
   class TypeMismatchError < Error; end
   class InvalidTypeError < Error; end
   class ConfigurationError < Error; end
+  class PrimaryKeyError < Error; end
 end

data/lib/nested_record/macro.rb

@@ -11,5 +11,9 @@ module NestedRecord::Macro
     def has_one_nested(name, **options, &block)
       NestedRecord::Setup::HasOne.new(self, name, **options, &block)
     end
+
+    def nested_accessors(from:, **options, &block)
+      NestedRecord::NestedAccessorsSetup.new(self, from, **options, &block)
+    end
   end
 end

data/lib/nested_record/macro_recorder.rb

@@ -0,0 +1,44 @@
+class NestedRecord::MacroRecorder
+  def initialize
+    @macros = []
+  end
+
+  attr_reader :macros
+
+  MACROS = %i[
+    include
+    attribute
+    def_primary_uuid
+    primary_key
+    has_one_nested
+    has_many_nested
+    subtype subtypes
+    collection_methods
+    validate validates validates! validates_with validates_each
+    validates_absence_of
+    validates_acceptance_of
+    validates_confirmation_of
+    validates_exclusion_of
+    validates_format_of
+    validates_inclusion_of
+    validates_length_of
+    validates_numericality_of
+    validates_presence_of
+    validates_size_of
+    after_initialize
+    before_validation after_validation
+  ].freeze.each do |meth|
+    define_method(meth) do |*args, &block|
+      @macros << [meth, args, 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)
+      end
+    end
+  end
+end

data/lib/nested_record/methods.rb

@@ -5,12 +5,14 @@ class NestedRecord::Methods < Module
 
   def define(name)
     method_name = public_send("#{name}_method_name")
-    method_body = public_send("#{name}_method_body")
+    method_body = (bodym = public_method("#{name}_method_body")).call
     case method_body
     when Proc
       define_method(method_name, &method_body)
     when String
-      module_eval <<~RUBY
+      location = bodym.source_location
+      location[1] += 1
+      module_eval <<~RUBY, *location
         def #{method_name}
           #{method_body}
         end
@@ -20,6 +22,10 @@ class NestedRecord::Methods < Module
     end
   end
 
+  def reader_method_name
+    @setup.name
+  end
+
   def writer_method_name
     :"#{@setup.name}="
   end

data/lib/nested_record/methods/many.rb

@@ -2,6 +2,7 @@ class NestedRecord::Methods
   class Many < self
     def initialize(setup)
       super
+      define :reader
       define :writer
       define :rewrite_attributes
       define :upsert_attributes
@@ -13,13 +14,30 @@ class NestedRecord::Methods
       :"validate_associated_records_for_#{@setup.name}"
     end
 
+    def reader_method_body
+      setup = @setup
+      ivar = :"@_#{@setup.name}_collection_proxy"
+      proc do
+        instance_variable_get(ivar) || instance_variable_set(ivar, setup.collection_proxy_class.new(self))
+      end
+    end
+
     def writer_method_body
       setup = @setup
       proc do |records|
         collection_class = setup.collection_class
-        return super(records.dup) if records.is_a? collection_class
-        collection = collection_class.new
-        records.each { |obj| collection << obj }
+        if records.is_a? collection_class
+          collection = records.dup
+        else
+          collection = collection_class.new
+          records.each { |record| collection << record }
+        end
+        collection.group_by { |record| setup.primary_check(record.read_attribute('type')) }.each do |check, records|
+          next unless check
+          records.each do |record|
+            check.perform!(collection, record)
+          end
+        end
         super(collection)
       end
     end
@@ -39,29 +57,17 @@ class NestedRecord::Methods
           attributes = attributes.stringify_keys
           next if setup.reject_if_proc&.call(attributes)
 
-          if (pkey_attributes = setup.primary_key)
-            klass = setup.record_class
-          else
-            klass = setup.record_class.find_subtype(attributes['type'])
-            while !(pkey_attributes = klass.primary_key) && (klass < NestedRecord::Base)
-              klass = klass.superclass
-            end
-            unless pkey_attributes
-              raise NestedRecord::ConfigurationError, 'You should specify a primary_key when using :upsert strategy'
-            end
+          pkey_check = setup.primary_check(attributes['type'])
+          unless pkey_check
+            raise NestedRecord::ConfigurationError, 'You should specify a primary_key when using :upsert strategy'
           end
-          key = { _is_a?: klass }
-          pkey_attributes.each do |name|
-            value = attributes[name]
-            if (type = klass.type_for_attribute(name))
-              value = type.cast(value)
-            end
-            key[name] = value
-          end
-          if (record = collection.find_by(key))
+
+          pkey = pkey_check.build_pkey(attributes)
+
+          if (record = collection.find_by(pkey))
             record.assign_attributes(attributes)
           else
-            collection.build(attributes)
+            collection.__build__(attributes)
           end
         end
       end

data/lib/nested_record/nested_accessors_setup.rb

@@ -0,0 +1,66 @@
+class NestedRecord::NestedAccessorsSetup
+  def initialize(owner, name, class_name: false, default: {}, &block)
+    raise ArgumentError, 'block is required for .nested_accessors_in' unless block
+
+    recorder = NestedRecord::MacroRecorder.new
+    recorder.instance_eval(&block)
+
+    @has_one_setup = owner.has_one_nested(name, class_name: class_name, default: default, attributes_writer: { strategy: :rewrite }) do
+      recorder.apply_to(self)
+    end
+
+    @extension = Module.new
+
+    macros = [
+      recorder,
+      *recorder.macros.select do |macro, args, _|
+        macro == :include && args.first.is_a?(NestedRecord::Concern)
+      end.map! { |_, args, _| args.first.macro_recorder }
+    ].flat_map(&:macros)
+
+    macros.each do |macro, args, _block|
+      case macro
+      when :attribute
+        attr_name = args.first
+        delegate(attr_name)
+        delegate("#{attr_name}?")
+        delegate1("#{attr_name}=")
+      when :has_one_nested
+        assoc_name = args.first
+        delegate(assoc_name)
+        delegate("#{assoc_name}!")
+        delegate1("#{assoc_name}=")
+        delegate1("#{assoc_name}_attributes=")
+      when :has_many_nested
+        assoc_name = args.first
+        delegate(assoc_name)
+        delegate1("#{assoc_name}=")
+        delegate1("#{assoc_name}_attributes=")
+      end
+    end
+
+    owner.include(@extension)
+  end
+
+  def name
+    @has_one_setup.name
+  end
+
+  private
+
+  def delegate(meth)
+    @extension.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+      def #{meth}
+        #{name}!.#{meth}
+      end
+    RUBY
+  end
+
+  def delegate1(meth)
+    @extension.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+      def #{meth}(arg)
+        #{name}!.#{meth}(arg)
+      end
+    RUBY
+  end
+end

data/lib/nested_record/primary_key_check.rb

@@ -0,0 +1,44 @@
+class NestedRecord::PrimaryKeyCheck
+  def initialize(klass, pkey_attributes)
+    @klass = klass
+    @pkey_attributes = pkey_attributes
+    @params = [klass, pkey_attributes]
+  end
+
+  attr_reader :params
+
+  def hash
+    params.hash
+  end
+
+  def ==(other)
+    self.class === other && params == other.params
+  end
+  alias eql? ==
+
+  def build_pkey(obj)
+    pkey = { _is_a?: @klass }
+    if obj.is_a? @klass
+      pkey[:_not_equal?] = obj
+      @pkey_attributes.each do |name|
+        pkey[name] = obj.read_attribute(name)
+      end
+    elsif obj.respond_to? :[]
+      @pkey_attributes.each do |name|
+        value = obj[name]
+        if (type = @klass.type_for_attribute(name))
+          value = type.cast(value)
+        end
+        pkey[name] = value
+      end
+    else
+      fail
+    end
+    pkey
+  end
+
+  def perform!(collection, obj)
+    pkey = build_pkey(obj)
+    raise NestedRecord::PrimaryKeyError if collection.exists?(pkey)
+  end
+end

data/lib/nested_record/setup.rb

@@ -8,53 +8,10 @@ class NestedRecord::Setup
     @owner = owner
     @name = name
 
-    if block
-      case (cn = options.fetch(:class_name) { false })
-      when true
-        cn = name.to_s.camelize
-        cn = cn.singularize if self.is_a?(HasMany)
-        class_name = cn
-      when false
-        class_name = nil
-      when String, Symbol
-        class_name = cn.to_s
-      else
-        raise NestedRecord::ConfigurationError, "Bad :class_name option #{cn.inspect}"
-      end
-      @record_class = Class.new(NestedRecord::Base, &block)
-      @owner.const_set(class_name, @record_class) if class_name
-    else
-      if options.key? :class_name
-        case (cn = options.fetch(:class_name))
-        when String, Symbol
-          @record_class = cn.to_s
-        else
-          raise NestedRecord::ConfigurationError, "Bad :class_name option #{cn.inspect}"
-        end
-      else
-        cn = name.to_s.camelize
-        cn = cn.singularize if self.is_a?(HasMany)
-        @record_class = cn
-      end
-    end
-
-    case (aw = options.fetch(:attributes_writer) { {} })
-    when Hash
-      @attributes_writer_opts = aw
-    when true, false
-      @attributes_writer_opts = {}
-    when Symbol
-      @attributes_writer_opts = { strategy: aw }
-    else
-      raise NestedRecord::ConfigurationError, "Bad :attributes_writer option #{aw.inspect}"
-    end
-    @reject_if_proc = @attributes_writer_opts[:reject_if]
-
-    @methods_extension = build_methods_extension
-
-    @owner.attribute @name, type, default: default_value
-    @owner.include @methods_extension
-    @owner.validate @methods_extension.validation_method_name
+    setup_association_attribute
+    setup_record_class(&block)
+    setup_attributes_writer_opts
+    setup_methods_extension
   end
 
   def record_class
@@ -66,6 +23,7 @@ class NestedRecord::Setup
 
   def primary_key
     return @primary_key if defined? @primary_key
+
     @primary_key = Array(@options[:primary_key])
     if @primary_key.empty?
       @primary_key = nil
@@ -77,6 +35,7 @@ class NestedRecord::Setup
 
   def attributes_writer_strategy
     return unless @options.fetch(:attributes_writer) { true }
+
     case (strategy = @attributes_writer_opts.fetch(:strategy) { :upsert })
     when :rewrite, :upsert
       return strategy
@@ -85,8 +44,92 @@ class NestedRecord::Setup
     end
   end
 
+  def primary_check(type)
+    if (pkey_attributes = primary_key)
+      klass = record_class
+    else
+      klass = record_class.find_subtype(type)
+      while !(pkey_attributes = klass.primary_key) && (klass < NestedRecord::Base)
+        klass = klass.superclass
+      end
+    end
+    # TODO: cache this
+    NestedRecord::PrimaryKeyCheck.new(klass, pkey_attributes) if pkey_attributes
+  end
+
   private
 
+  def setup_association_attribute
+    @owner.attribute name, type, default: default_value
+  end
+
+  def setup_record_class(&block)
+    if block
+      define_local_record_class(&block)
+    else
+      link_existing_record_class
+    end
+  end
+
+  def define_local_record_class(&block)
+    case (cn = @options.fetch(:class_name) { false })
+    when true
+      class_name = infer_record_class_name
+    when false
+      class_name = nil
+    when String, Symbol
+      class_name = cn.to_s
+    else
+      raise NestedRecord::ConfigurationError, "Bad :class_name option #{cn.inspect}"
+    end
+    @record_class = Class.new(NestedRecord::Base, &block)
+    @owner.const_set(class_name, @record_class) if class_name
+  end
+
+  def link_existing_record_class
+    if @options.key? :class_name
+      case (cn = @options.fetch(:class_name))
+      when String, Symbol
+        @record_class = cn.to_s
+      else
+        raise NestedRecord::ConfigurationError, "Bad :class_name option #{cn.inspect}"
+      end
+    else
+      @record_class = infer_record_class_name
+    end
+  end
+
+  def infer_record_class_name
+    cn = name.to_s.camelize
+    cn = cn.singularize if self.is_a?(HasMany)
+    cn
+  end
+
+  def setup_attributes_writer_opts
+    case (aw = @options.fetch(:attributes_writer) { {} })
+    when Hash
+      @attributes_writer_opts = aw
+    when true, false
+      @attributes_writer_opts = {}
+    when Symbol
+      @attributes_writer_opts = { strategy: aw }
+    else
+      raise NestedRecord::ConfigurationError, "Bad :attributes_writer option #{aw.inspect}"
+    end
+    @reject_if_proc = @attributes_writer_opts[:reject_if]
+  end
+
+  def setup_methods_extension
+    methods_extension = build_methods_extension
+    @owner.include methods_extension
+    @owner.const_set methods_extension_module_name, methods_extension
+    @owner.validate methods_extension.validation_method_name
+  end
+
+  def methods_extension_module_name
+    @methods_extension_module_name ||= :"NestedRecord_#{self.class.name.demodulize}_#{name.to_s.camelize}"
+  end
+
   class HasMany < self
     def type
       @type ||= NestedRecord::Type::Many.new(self)
@@ -96,10 +139,23 @@ class NestedRecord::Setup
       record_class.collection_class
     end
 
+    def collection_proxy_class
+      return @owner.const_get(collection_proxy_class_name, false) if @owner.const_defined?(collection_proxy_class_name, false)
+
+      @owner.const_set(
+        collection_proxy_class_name,
+        ::NestedRecord::CollectionProxy.subclass_for(self)
+      )
+    end
+
+    def collection_proxy_class_name
+      @collection_proxy_class_name ||= :"NestedRecord_#{self.class.name.demodulize}_#{name.to_s.camelize}_CollectionProxy"
+    end
+
     private
 
     def default_value
-      []
+      @options.fetch(:default) { [] }
     end
 
     def build_methods_extension
@@ -115,7 +171,7 @@ class NestedRecord::Setup
     private
 
     def default_value
-      nil
+      @options.fetch(:default) { nil }
     end
 
     def build_methods_extension

data/lib/nested_record/version.rb

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

data/nested_record.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
 
-  spec.add_dependency "rails", "~> 5.2"
+  spec.add_dependency "rails", ">= 5.2", "<= 6.0"
 end

data/spec/nested_record/base_spec.rb

@@ -257,6 +257,33 @@ RSpec.describe NestedRecord::Base do
     end
   end
 
+  describe '#query_attribute' do
+    it 'returns true if boolean attribute is true' do
+      expect(Foo.new(z: true).query_attribute(:z)).to eq true
+    end
+
+    it 'returns true if boolean attribute is false' do
+      expect(Foo.new(z: false).query_attribute(:z)).to eq false
+    end
+
+    it 'returns true if string attribute is non-blank' do
+      expect(Foo.new(x: 'a').query_attribute(:x)).to eq true
+    end
+
+    it 'returns false if string attribute is blank' do
+      expect(Foo.new(x: '').query_attribute(:x)).to eq false
+    end
+
+    it 'works with suffix ? version' do
+      foo = Foo.new(x: '1', z: false)
+      expect(foo.x?).to eq true
+      expect(foo.z?).to eq false
+      foo = Foo.new(x: '', z: true)
+      expect(foo.x?).to eq false
+      expect(foo.z?).to eq true
+    end
+  end
+
   describe '#match?' do
     let(:record) { Foo.new(x: 'aa', y: 123, z: true) }
 

data/spec/nested_record/concern_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe NestedRecord::Concern do
+  nested_concern(:Y) do
+    attribute :y, :integer
+    has_many_nested :ys, attributes_writer: { strategy: :rewrite } do
+      attribute :yy
+    end
+  end
+  nested_model(:XY) do
+    attribute :x, :string
+    include Y
+  end
+
+  it 'adds attributes to the class where it is included' do
+    expect(XY.new(x: 'foo', y: 123, ys_attributes: [{ yy: 'yy' }])).to match an_object_having_attributes(
+      x: 'foo',
+      y: 123,
+      ys: [
+        an_object_having_attributes(yy: 'yy')
+      ]
+    )
+  end
+
+  context 'with nested concerns' do
+    nested_concern(:YZ) do
+      include Y
+      attribute :z, :boolean
+    end
+    nested_model(:XYZ) do
+      attribute :x, :string
+      include YZ
+    end
+
+    it 'adds attributes to the class where it is included' do
+      expect(XYZ.new(x: 'foo', y: 123, z: true, ys_attributes: [{ yy: 'yy' }])).to match an_object_having_attributes(
+        x: 'foo',
+        y: 123,
+        z: true,
+        ys: [
+          an_object_having_attributes(yy: 'yy')
+        ]
+      )
+    end
+  end
+end

data/spec/nested_record_spec.rb

@@ -325,6 +325,27 @@ RSpec.describe NestedRecord do
         foo.bars = []
         expect(foo.bars).to be_empty
       end
+
+      it 'raises an error if primary key is violated' do
+        foo = Foo.new
+        expect { foo.bars = [Bar.new(id: 'wow'), Bar.new(id: 'wow')] }.to raise_error(NestedRecord::PrimaryKeyError)
+      end
+    end
+
+    describe 'build method' do
+      it 'builds a new record' do
+        foo = Foo.new
+        foo.bars.build(x: 'xx')
+        expect(foo.bars).to match [
+          an_object_having_attributes(x: 'xx')
+        ]
+      end
+
+      it 'raises an error if primary key is violated' do
+        foo = Foo.new
+        foo.bars.build(id: 'wow')
+        expect { foo.bars.build(id: 'wow') }.to raise_error(NestedRecord::PrimaryKeyError)
+      end
     end
 
     describe 'attributes writer' do
@@ -632,4 +653,109 @@ RSpec.describe NestedRecord do
       end
     end
   end
+
+  describe 'nested_accessors' do
+    active_model(:Foo) do
+      nested_accessors from: :bar, class_name: true do
+        attribute :x, :integer
+        has_one_nested :one, class_name: true do
+          attribute :y, :integer
+        end
+        has_many_nested :things, class_name: true, attributes_writer: { strategy: :rewrite } do
+          attribute :z, :integer
+        end
+      end
+    end
+
+    it 'delegates attributes writers to the inner attribute' do
+      foo = Foo.new(
+        x: 1,
+        one_attributes: { y: 2 },
+        things_attributes: [{ z: 3 }, { z: 4 }]
+      )
+      expect(foo.bar).to match an_object_having_attributes(
+        x: 1,
+        one: an_object_having_attributes(
+          y: 2
+        ),
+        things: [
+          an_object_having_attributes(z: 3),
+          an_object_having_attributes(z: 4)
+        ]
+      )
+    end
+
+    it 'delegates readers to the inner attribute' do
+      foo = Foo.new(
+        x: 1,
+        one_attributes: { y: 2 },
+        things_attributes: [{ z: 3 }, { z: 4 }]
+      )
+      expect(foo).to match an_object_having_attributes(
+        x: 1,
+        one: an_object_having_attributes(
+          y: 2
+        ),
+        things: [
+          an_object_having_attributes(z: 3),
+          an_object_having_attributes(z: 4)
+        ]
+      )
+    end
+
+    it 'delegates writers for associations' do
+      foo = Foo.new(x: 1)
+      foo.one = Foo::Bar::One.new(y: 2)
+      foo.things = [Foo::Bar::Thing.new(z: 3), Foo::Bar::Thing.new(z: 4)]
+      expect(foo.bar).to match an_object_having_attributes(
+        x: 1,
+        one: an_object_having_attributes(
+          y: 2
+        ),
+        things: [
+          an_object_having_attributes(z: 3),
+          an_object_having_attributes(z: 4)
+        ]
+      )
+    end
+
+    context 'with concerns' do
+      nested_concern(:X) { attribute :x, :integer }
+      nested_concern(:Y) do
+        has_one_nested :one, class_name: true do
+          attribute :y, :integer
+        end
+      end
+      nested_concern(:Z) do
+        has_many_nested :things, class_name: true, attributes_writer: { strategy: :rewrite } do
+          attribute :z, :integer
+        end
+      end
+      active_model(:FooXYZ) do
+        nested_accessors from: :bar, class_name: true do
+          include X
+          include Y
+          include Z
+        end
+      end
+
+      it 'delegates methods from included modules' do
+        foo = FooXYZ.new(
+          x: 1,
+          one_attributes: { y: 2 },
+          things_attributes: [{ z: 3 }, { z: 4 }]
+        )
+        expect(foo).to match an_object_having_attributes(
+          x: 1,
+          one: an_object_having_attributes(
+            y: 2
+          ),
+          things: [
+            an_object_having_attributes(z: 3),
+            an_object_having_attributes(z: 4)
+          ]
+        )
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -19,5 +19,5 @@ RSpec.configure do |config|
   config.include TestModel::Build
   config.include TestModel::Erase
 
-  config.after(:example) { erase_test_models }
+  config.after(:example) { erase_test_consts }
 end

data/spec/support/model.rb

@@ -5,18 +5,33 @@ module TestModel
     end
   end
 
+  def nested_concern(name, &block)
+    let!(:"concern_#{name.to_s.gsub('::', '_')}") do
+      test_consts = (@test_consts ||= [])
+      namespace, sname = test_const_dig_name!(name)
+      Module.new do
+        extend NestedRecord::Concern
+
+        namespace.const_set(sname, self)
+        test_consts << self
+
+        class_eval(&block) if block
+      end
+    end
+  end
+
   def nested_model(name, superclass = NestedRecord::Base, &block)
     let!(:"model_#{name.to_s.gsub('::', '_')}") do
-      test_models = (@test_models ||= [])
+      test_consts = (@test_consts ||= [])
       if superclass.is_a?(Symbol) || superclass.is_a?(String)
         sclass = public_send("model_#{superclass.to_s.gsub('::', '_')}")
       else
         sclass = superclass
       end
-      namespace, sname = test_model_dig_name!(name)
+      namespace, sname = test_const_dig_name!(name)
       Class.new(sclass) do
         namespace.const_set(sname, self)
-        test_models << self
+        test_consts << self
 
         class_eval(&block) if block
       end
@@ -25,32 +40,36 @@ module TestModel
 
   module Build
     def new_active_model(name, &block)
-      test_models = (@test_models ||= [])
+      test_consts = (@test_consts ||= [])
 
-      namespace, sname = test_model_dig_name!(name)
+      namespace, sname = test_const_dig_name!(name)
 
       Class.new do
         namespace.const_set(sname, self)
-        test_models << self
+        test_consts << self
 
         include ActiveModel::Model
         include ActiveModel::Attributes
         include NestedRecord::Macro
 
+        def read_attribute(attr)
+          attribute(attr)
+        end
+
         class_eval(&block) if block
       end
     end
   end
 
   module Erase
-    def erase_test_models
-      Array(@test_models).reverse_each do |klass|
+    def erase_test_consts
+      Array(@test_consts).reverse_each do |klass|
         ActiveSupport::Dependencies.remove_constant(klass.name)
       end
       ActiveSupport::Dependencies.clear
     end
 
-    def test_model_dig_name!(name)
+    def test_const_dig_name!(name)
       parts = name.to_s.split('::')
       name = parts.pop
       namespace = Object
@@ -60,7 +79,7 @@ module TestModel
           namespace = namespace.const_get(part, false)
         else
           sub = Module.new
-          (@test_models ||= []) << sub
+          (@test_consts ||= []) << sub
           namespace = namespace.const_set(part, sub)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladimir Kochnev
@@ -84,16 +84,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   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: 
 email:
 - hashtable@yandex.ru
@@ -105,21 +111,27 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/nested_record.rb
 - lib/nested_record/base.rb
 - lib/nested_record/collection.rb
+- lib/nested_record/collection_proxy.rb
+- lib/nested_record/concern.rb
 - lib/nested_record/errors.rb
 - lib/nested_record/lookup_const.rb
 - lib/nested_record/macro.rb
+- lib/nested_record/macro_recorder.rb
 - lib/nested_record/methods.rb
 - lib/nested_record/methods/many.rb
 - lib/nested_record/methods/one.rb
+- lib/nested_record/nested_accessors_setup.rb
+- lib/nested_record/primary_key_check.rb
 - lib/nested_record/setup.rb
 - lib/nested_record/type.rb
 - lib/nested_record/type/many.rb
@@ -128,6 +140,7 @@ files:
 - nested_record.gemspec
 - spec/nested_record/base_spec.rb
 - spec/nested_record/collection_spec.rb
+- spec/nested_record/concern_spec.rb
 - spec/nested_record/type/many_spec.rb
 - spec/nested_record/type/one_spec.rb
 - spec/nested_record_spec.rb
@@ -148,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/Gemfile.lock

@@ -1,152 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nested_record (1.0.0.beta)
-      rails (~> 5.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
-      globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    byebug (11.0.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
-    diff-lcs (1.3)
-    erubi (1.9.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.7.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.3.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    sprockets (4.0.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0)
-  nested_record!
-  pry
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.0.1