store_model 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272a27d0773295eeb4628b0cfd205ecd78bb0d53c9abad4f195a26a00582c465
-  data.tar.gz: dd1709b12b83f49f2a67ea0d92bd5db7cb61be8699433630a17c22d6d6fccec2
+  metadata.gz: 56c80c30cd987d635b40bcd5863401d5ca45644078eaafbc4f0d4278e6ed29fb
+  data.tar.gz: e17b443b615750a1b87b35a0bda3acb6a287b267dbb6e3f3f4b7677e4ec0e11e
 SHA512:
-  metadata.gz: 1beb4e1bcc06a983e68db54be1d692023f2e56e82824893d5f918c84056ccf23f49d0768219191fb40869850717ffca8a69d36bc1aa0128056ced6efdeed91c1
-  data.tar.gz: c9f82ef6a68c480408cb176fe7817a61b8dd069df808f7450c9df3e54059a62a42866989728685af0cb2cdae8b68eeacfa98fbb1a36d324d6e76e6e76e5fe3d1
+  metadata.gz: 94605281aeead99bbdff837e4211f019bb4038754a3205b541adb5e76e58089ba1cbb202b22ec4c076dd4e842d2b12044cf28757fee7781b4fd4497851c35cee
+  data.tar.gz: 99f12655273e0a70158541723d5314c2b73a76eb21da79ea5ebc58c8d4375646e1ad092570031a7e75932d994f75f9d95720bd48bc8d1321b2c808eab2fcb9d9

data/lib/store_model/model.rb

@@ -10,10 +10,10 @@ module StoreModel
     def self.included(base)
       base.include ActiveModel::Model
       base.include ActiveModel::Attributes
+      base.include StoreModel::NestedAttributes
 
       base.extend StoreModel::Enum
       base.extend StoreModel::TypeBuilders
-      base.extend StoreModel::NestedAttributes
     end
 
     def as_json(options = {})
@@ -35,5 +35,9 @@ module StoreModel
       attribute_string = attributes.map { |name, value| "#{name}: #{value || 'nil'}" }.join(", ")
       "#<#{self.class.name} #{attribute_string}>"
     end
+
+    def type_for_attribute(attribute)
+      self.class.attribute_types[attribute.to_s]
+    end
   end
 end

data/lib/store_model/nested_attributes.rb

@@ -2,10 +2,30 @@
 
 module StoreModel
   module NestedAttributes
-    def accepts_nested_attributes_for(*associations)
-      associations.each do |association|
-        alias_method "#{association}_attributes=", "#{association}="
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def accepts_nested_attributes_for(*associations)
+        associations.each do |association|
+          case attribute_types[association.to_s]
+          when Types::JsonType
+            alias_method "#{association}_attributes=", "#{association}="
+          when Types::ArrayType
+            define_method "#{association}_attributes=" do |attributes|
+              assign_nested_attributes_for_collection_association(association, attributes)
+            end
+          end
+        end
       end
     end
+
+    private
+
+    def assign_nested_attributes_for_collection_association(association, attributes)
+      attributes = attributes.values if attributes.is_a?(Hash)
+      send "#{association}=", attributes
+    end
   end
 end

data/lib/store_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoreModel
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: store_model
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails