duck_record 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fffce17ba17b6f56bb65f12a64cd4a62a297e0b
-  data.tar.gz: fc5f292b1eb03dfa856b4776df57b0535052b80f
+  metadata.gz: 94d686747e67e2fd89839e277156b05e45bae20a
+  data.tar.gz: aedff996d41cc23adf9686041eb0817e2db29f65
 SHA512:
-  metadata.gz: bfa5e099a22e92992d90381854708f43a2890c6dd7730bc9be4ee43c112b11b7d7554fe5b3a4420c32b2bf9446b67eb60d809873076021fb1a65cbbb1fe5f7e9
-  data.tar.gz: bff27304fdbf8e7bad4ebaac002e9210ac79a0a41157e58d754d5a11eaa5a0f1b3a53c6d547c02957269e60d194e38196b93a756101c74c1963fda3eb3af0882
+  metadata.gz: 59898083c6f86b92da56fb15b990c1df664647319def15335f56b414a1fe41133f2fde382eec4738f2eaa29e32cfd4f2f5cf6207559dc1f9be14e14a25abbf31
+  data.tar.gz: b1dd8db43eb6f791bc4c0671202ec0e36a9b59b3a28e5db43b45a1b75a5a53c45a7dcba324aa6697dcfc3160f7e4bcf2ae3985b3fa04c65cd5ecbd3a61a5edb1

data/lib/duck_record/associations/association.rb

@@ -77,7 +77,7 @@ module DuckRecord
             unless fresh_class && record.is_a?(fresh_class)
               message = "#{reflection.class_name}(##{reflection.klass.object_id}) expected, "\
                 "got #{record.inspect} which is an instance of #{record.class}(##{record.class.object_id})"
-              raise ActiveRecord::AssociationTypeMismatch, message
+              raise DuckRecord::AssociationTypeMismatch, message
             end
           end
         end

data/lib/duck_record/associations/builder/association.rb

@@ -85,7 +85,8 @@ module DuckRecord::Associations::Builder # :nodoc:
 
     def self.define_writers(mixin, name)
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{name}=(value)
+        def #{name}=(value, force_write_readonly: false)
+          return if !force_write_readonly && self.class.readonly_attributes.include?("#{name}")
           association(:#{name}).writer(value)
         end
       CODE

data/lib/duck_record/associations/collection_association.rb

@@ -40,7 +40,11 @@ module DuckRecord
       end
 
       def build(attributes = {}, &block)
-        if attributes.is_a?(Array)
+        if attributes.is_a?(klass)
+          add_to_target(attributes) do |record|
+            yield(record) if block_given?
+          end
+        elsif attributes.is_a?(Array)
           attributes.collect { |attr| build(attr, &block) }
         else
           add_to_target(build_record(attributes)) do |record|
@@ -53,8 +57,13 @@ module DuckRecord
       # be chained. Since << flattens its argument list and inserts each record,
       # +push+ and +concat+ behave identically.
       def concat(*records)
-        records = records.flatten
-        @target.concat records
+        records.flatten.each do |r|
+          begin
+            build(r)
+          rescue
+            raise_on_type_mismatch!(r)
+          end
+        end
       end
 
       # Removes all records from the association without calling callbacks
@@ -130,7 +139,14 @@ module DuckRecord
       # Replace this collection with +other_array+. This will perform a diff
       # and delete/add only records that have changed.
       def replace(other_array)
-        @target = other_array
+        delete_all
+        other_array.each do |item|
+          begin
+            build(item)
+          rescue
+            raise_on_type_mismatch!(r)
+          end
+        end
       end
 
       def include?(record)

data/lib/duck_record/associations/has_one_association.rb

@@ -3,9 +3,14 @@ module DuckRecord
   module Associations
     class HasOneAssociation < SingularAssociation #:nodoc:
       def replace(record)
-        raise_on_type_mismatch!(record) if record
-
-        self.target = 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
     end
   end

data/lib/duck_record/errors.rb

@@ -22,6 +22,21 @@ module DuckRecord
   class ConfigurationError < DuckRecordError
   end
 
+  # Raised when an object assigned to an association has an incorrect type.
+  #
+  #   class Ticket < ActiveRecord::Base
+  #     has_many :patches
+  #   end
+  #
+  #   class Patch < ActiveRecord::Base
+  #     belongs_to :ticket
+  #   end
+  #
+  #   # Comments are not patches, this assignment raises AssociationTypeMismatch.
+  #   @ticket.patches << Comment.new(content: "Please attach tests to your patch.")
+  class AssociationTypeMismatch < DuckRecordError
+  end
+
   # Raised when unknown attributes are supplied via mass assignment.
   UnknownAttributeError = ActiveModel::UnknownAttributeError
 

data/lib/duck_record/reflection.rb

@@ -149,14 +149,14 @@ module DuckRecord
       # <tt>has_many :clients</tt> returns <tt>{}</tt>
       attr_reader :options
 
-      attr_reader :active_record
+      attr_reader :duck_record
 
       attr_reader :plural_name # :nodoc:
 
-      def initialize(name, options, active_record)
+      def initialize(name, options, duck_record)
         @name          = name
         @options       = options
-        @active_record = active_record
+        @duck_record   = duck_record
         @klass         = options[:anonymous_class]
         @plural_name   = name.to_s.pluralize
       end
@@ -200,12 +200,12 @@ module DuckRecord
       end
 
       def compute_class(name)
-        active_record.send(:compute_type, name)
+        duck_record.send(:compute_type, name)
       end
 
       attr_accessor :parent_reflection # Reflection
 
-      def initialize(name, options, active_record)
+      def initialize(name, options, duck_record)
         super
         @constructable = calculate_constructable(macro, options)
 

data/lib/duck_record/version.rb

@@ -1,3 +1,3 @@
 module DuckRecord
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_record
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Used for creating virtual models like ActiveType or ModelAttribute does