activeentity 0.0.1.beta5 → 0.0.1.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d43e6dccb1db0de377c261da5f86acff871334f69200c08915f519318f914f
-  data.tar.gz: 81158ddabc97764d38ba151b18009d9f66c952577f1a3e688b43b57c29a79cdd
+  metadata.gz: c154e7165f6bbe5e99ec3996ee46ac4062e09086c8d90e0be769106f16791df4
+  data.tar.gz: 1473e2ea9042d0e8405f97b53d2659c6983c95a5ac462ea9bde7858128cd3f65
 SHA512:
-  metadata.gz: e3e165e0fd16ae6d54426b13d793c3926ea30bede6f3073dbcd37fd9e94cb9bb4f55f589e25b6814ee3b2a7fb442073c58327e8fb24635506a4e56ff7c0a01ef
-  data.tar.gz: 4705fd097c96a368ec65fc5dbe851bf4d2d54ee632e741ee8c5d97bfd2f5e0de152f1a4f795ceb4465b2efaa0fd792929827e6c93412c2ba982640822a720aca
+  metadata.gz: a2daadb48b891c1d71063a3242b9d586a72fd9f20060ae7305e53a2561ac18dc129f523d72236cfd38a37385ee9cb23331fc5029670b833f4322380436fdd368
+  data.tar.gz: 6f9d0d4c1729a206500141afc77a2717652fea6548d0e9b23c68b3ef96184eb57ae25bfd654f0d509d591d5faa4dc00fb4616eda5e9da86c91932894c334a946

data/README.md

@@ -35,7 +35,8 @@ class Holiday < ActiveEntity::Base
 end
 
 class HolidaysForm < ActiveEntity::Base
-  embeds_many :holidays, reject_if: :all_blank
+  embeds_many :holidays
+  accepts_nested_attributes_for :holidays, reject_if: :all_blank
 end
 ```
 

data/lib/active_entity/associations/embedded/builder/association.rb

@@ -34,11 +34,14 @@ module ActiveEntity::Associations::Embedded::Builder # :nodoc:
       reflection
     end
 
-    def self.create_reflection(model, name, options)
+    def self.create_reflection(model, name, options, &block)
       raise ArgumentError, "association names must be a Symbol" unless name.kind_of?(Symbol)
 
       validate_options(options)
 
+      extension = define_extensions(model, name, &block)
+      options[:extend] = [*options[:extend], extension] if extension
+
       ActiveEntity::Reflection.create(macro, name, nil, options, model)
     end
 
@@ -54,6 +57,9 @@ module ActiveEntity::Associations::Embedded::Builder # :nodoc:
       options.assert_valid_keys(valid_options(options))
     end
 
+    def self.define_extensions(model, name)
+    end
+
     def self.define_callbacks(model, reflection)
       Association.extensions.each do |extension|
         extension.build model, reflection
@@ -93,8 +99,7 @@ module ActiveEntity::Associations::Embedded::Builder # :nodoc:
       # noop
     end
 
-    def self.valid_dependent_options
-      raise NotImplementedError
-    end
+    private_class_method :macro, :valid_options, :validate_options, :define_extensions,
+                         :define_callbacks, :define_accessors, :define_readers, :define_writers, :define_validations
   end
 end

data/lib/active_entity/associations/embedded/builder/collection_association.rb

@@ -19,11 +19,11 @@ module ActiveEntity::Associations::Embedded::Builder # :nodoc:
       }
     end
 
-    def self.define_extensions(model, name)
+    def self.define_extensions(model, name, &block)
       if block_given?
-        extension_module_name = "#{model.name.demodulize}#{name.to_s.camelize}AssociationExtension"
-        extension = Module.new(&Proc.new)
-        model.module_parent.const_set(extension_module_name, extension)
+        extension_module_name = "#{name.to_s.camelize}AssociationExtension"
+        extension = Module.new(&block)
+        model.const_set(extension_module_name, extension)
       end
     end
 
@@ -65,5 +65,7 @@ module ActiveEntity::Associations::Embedded::Builder # :nodoc:
         end
       CODE
     end
+
+    private_class_method :valid_options, :define_callback, :define_extensions, :define_readers, :define_writers
   end
 end

data/lib/active_entity/associations/embedded/collection_association.rb

@@ -147,8 +147,18 @@ module ActiveEntity
 
           def concat_records(records)
             records.each do |record|
+              r =
+                if record.is_a? reflection.klass
+                  record
+                elsif record.nil?
+                  nil
+                elsif record.respond_to?(:to_h)
+                  build_record(record.to_h)
+                end
+              add_to_target(r)
+            rescue => ex
               raise_on_type_mismatch!(record)
-              add_to_target(record)
+              raise ex
             end
 
             records

data/lib/active_entity/associations/embedded/embeds_one_association.rb

@@ -7,11 +7,17 @@ module ActiveEntity
       class EmbedsOneAssociation < SingularAssociation #:nodoc:
         private
           def replace(record)
-            raise_on_type_mismatch!(record) if record
-
-            return target unless record
-
-            self.target = record
+            self.target =
+              if record.is_a? reflection.klass
+                record
+              elsif record.nil?
+                nil
+              elsif record.respond_to?(:to_h)
+                build_record(record.to_h)
+              end
+          rescue => ex
+            raise_on_type_mismatch!(record)
+            raise ex
           end
       end
     end

data/lib/active_entity/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveEntity
     MAJOR = 0
     MINOR = 0
     TINY  = 1
-    PRE   = "beta5"
+    PRE   = "beta6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_entity/reflection.rb

@@ -15,8 +15,11 @@ module ActiveEntity
 
     class << self
       def create(macro, name, scope, options, ar_or_ae)
-        reflection = reflection_class_for(macro).new(name, scope, options, ar_or_ae)
-        options[:through] ? ThroughReflection.new(reflection) : reflection
+        reflection_class_for(macro).new(name, scope, options, ar_or_ae)
+
+        # TODO: Support bridge to Active Record
+        # reflection = reflection_class_for(macro).new(name, scope, options, ar_or_ae)
+        # options[:through] ? ActiveRecord::ThroughReflection.new(reflection) : reflection
       end
 
       def add_reflection(ar_or_ae, name, reflection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeentity
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta5
+  version: 0.0.1.beta6
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport