duck_record 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50cfc614adaa1a3af48769d41305d88b4ace7149
-  data.tar.gz: ba8306b2ac4d88f8e7e69600e6398f6312132746
+  metadata.gz: e9bf46dd431abd8476ad8351490c70739b7ad33a
+  data.tar.gz: 0c2c4c633293dce041e0a1f1d0cf33b8c941197f
 SHA512:
-  metadata.gz: d8249209d1c8315953b4b5404b4f591bc9138a24d04fc4af0c9c8c7d75b277a827721b5a2431695baea747b3a0fffe1be460e814b979180853ab3c4f7255769d
-  data.tar.gz: f7a092d53c15c85a5938d6558f66d93c4b9f01d1db23e561b76fedfa764d2bfd054270fd622d987c6a740b0994ffa22063ab336c490bf943abef5e554d8acc17
+  metadata.gz: ade0bf78d799f87febbaacd5a5616547f61e767a0ea5da8ce22a3c2e37869cd41349888c0ecf13ad8865e7945dfd3cc9f526d8fec7cdaec2469fd87bd540ad58
+  data.tar.gz: a74a31a095e4d0db122c11c2bbf403191d15ca854c9fc8e55ab6382bfb6128ea8365490071a56bec1a3cb54c72179926cb3ca0e8c763bd9998a71a61d3a319ba

data/README.md

@@ -21,10 +21,10 @@ class Comment < DuckRecord::Base
 end
 
 class Book < DuckRecord::Base
-  has_one :author, class_name: 'Person', validate: true
+  embeds_one :author, class_name: 'Person', validate: true
   accepts_nested_attributes_for :author
 
-  has_many :comments, validate: true
+  embeds_many :comments, validate: true
   accepts_nested_attributes_for :comments
 
   attribute :title,     :string

data/lib/duck_record/associations/builder/{association.rb → embeds_association.rb}

@@ -10,7 +10,7 @@
 #      - HasManyAssociation
 
 module DuckRecord::Associations::Builder # :nodoc:
-  class Association #:nodoc:
+  class EmbedsAssociation #:nodoc:
     class << self
       attr_accessor :extensions
     end
@@ -46,7 +46,7 @@ module DuckRecord::Associations::Builder # :nodoc:
     end
 
     def self.valid_options(options)
-      VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
+      VALID_OPTIONS + EmbedsAssociation.extensions.flat_map(&:valid_options)
     end
 
     def self.validate_options(options)
@@ -57,7 +57,7 @@ module DuckRecord::Associations::Builder # :nodoc:
     end
 
     def self.define_callbacks(model, reflection)
-      Association.extensions.each do |extension|
+      EmbedsAssociation.extensions.each do |extension|
         extension.build model, reflection
       end
     end
@@ -85,8 +85,8 @@ module DuckRecord::Associations::Builder # :nodoc:
 
     def self.define_writers(mixin, name)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{name}=(value, force_write_readonly: false)
-          return if !force_write_readonly && self.class.readonly_attributes.include?("#{name}")
+        def #{name}=(value)
+          return if self.class.readonly_attributes.include?("#{name}")
           association(:#{name}).writer(value)
         end
       CODE

data/lib/duck_record/associations/builder/{collection_association.rb → embeds_many.rb}

@@ -3,11 +3,15 @@
 require "duck_record/associations"
 
 module DuckRecord::Associations::Builder # :nodoc:
-  class CollectionAssociation < Association #:nodoc:
+  class EmbedsMany < EmbedsAssociation #:nodoc:
     CALLBACKS = [:before_add, :after_add]
 
+    def self.macro
+      :embeds_many
+    end
+
     def self.valid_options(options)
-      super + [:before_add, :after_add]
+      super + CALLBACKS
     end
 
     def self.define_callbacks(model, reflection)

data/lib/duck_record/associations/builder/{singular_association.rb → embeds_one.rb}

@@ -1,7 +1,19 @@
 # This class is inherited by the has_one and belongs_to association classes
 
 module DuckRecord::Associations::Builder # :nodoc:
-  class SingularAssociation < Association #:nodoc:
+  class EmbedsOne < EmbedsAssociation #:nodoc:
+    def self.macro
+      :embeds_one
+    end
+
+    def self.define_validations(model, reflection)
+      super
+
+      if reflection.options[:required]
+        model.validates_presence_of reflection.name, message: :required
+      end
+    end
+
     def self.define_accessors(model, reflection)
       super
       mixin = model.generated_association_methods

data/lib/duck_record/associations/{association.rb → embeds_association.rb}

@@ -15,7 +15,7 @@ module DuckRecord
     #     CollectionAssociation
     #       HasManyAssociation + ForeignAssociation
     #         HasManyThroughAssociation + ThroughAssociation
-    class Association #:nodoc:
+    class EmbedsAssociation #:nodoc:
       attr_reader :owner, :target, :reflection
 
       delegate :options, to: :reflection

data/lib/duck_record/associations/{collection_association.rb → embeds_many_association.rb}

@@ -23,10 +23,10 @@ module DuckRecord
     #
     # If you need to work on all current children, new and existing records,
     # +load_target+ and the +loaded+ flag are your friends.
-    class CollectionAssociation < Association #:nodoc:
+    class EmbedsManyAssociation < EmbedsAssociation #:nodoc:
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       def reader
-        @_reader ||= CollectionProxy.new(klass, self)
+        @_reader ||= EmbedsManyProxy.new(klass, self)
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items

data/lib/duck_record/associations/{collection_proxy.rb → embeds_many_proxy.rb}

@@ -27,7 +27,7 @@ module DuckRecord
     #
     # is computed directly through SQL and does not trigger by itself the
     # instantiation of the actual post records.
-    class CollectionProxy
+    class EmbedsManyProxy
       include Enumerable
 
       delegate :to_xml, :encode_with, :length, :collect, :map, :each, :all?, :include?, :to_ary, :join,

data/lib/duck_record/associations/{singular_association.rb → embeds_one_association.rb}

@@ -1,6 +1,6 @@
 module DuckRecord
   module Associations
-    class SingularAssociation < Association #:nodoc:
+    class EmbedsOneAssociation < EmbedsAssociation #:nodoc:
       # Implements the reader method, e.g. foo.bar for Foo.has_one :bar
       def reader
         target
@@ -27,8 +27,15 @@ module DuckRecord
 
       private
 
-        def replace(_record)
-          raise NotImplementedError, "Subclasses must implement a replace(record) method"
+        def replace(record)
+          self.target =
+            if record.is_a? klass
+              record
+            elsif record.respond_to?(:to_h)
+              build_record(record.to_h)
+            end
+        rescue
+          raise_on_type_mismatch!(record)
         end
 
         def set_new_record(record)