rasti-model 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69fc7d6502deb7e66837ef4fdd561b1ac56b9125c3420612e0574b28122dcac0
-  data.tar.gz: 83a974c72689d66b70ed7cbe7d50e0dc0ae93ec4acabc471333124b21d3d0d2e
+  metadata.gz: 5d85d0034827688a0aea67f255e2ac0ea95a273da7a38dc66c823f032cf95830
+  data.tar.gz: 63fed2869a50ba059f73f878c1eace99b00068df719a1d373bcbe627edac7e16
 SHA512:
-  metadata.gz: e9dc23d735dee6c67b37a789cd2146b65dcfd2eaa3bc811cd937d7e80d3361bca87760eb2a49a23d3b94941386eab1cc34e4fdffc06fdd9deba4b86730b93af1
-  data.tar.gz: dd9c2d798a13065f2825a9b3a988b6c2e7de4333e1a198a052fe24848d2dd96c54e55c187ecd7da2b60dc181adc81f2fbc97434af6f61cb2a5e0a1d2c1e07a84
+  metadata.gz: 8934c038b6dabbf06f6c6405751fe9691a75495089ba3c2c177f82dd5c486dbd14954a39a757232774fe6e36b6a631529286db3a9427d79bc857ddddd8852596
+  data.tar.gz: 4b967d4b0cfae3cd0b1cf4c405a8422230f01836554108bd4f3e27756d2d50c7bcea46ead161b7066c570296fc3aa2799faafba636d1c8f54ccdc48a7655ebb4

data/lib/rasti/model.rb

@@ -175,22 +175,28 @@ module Rasti
       @serialized_attributes ||= begin
         cast_attributes!
 
-        __cache__.each_with_object({}) do |(attr_name, value), hash|
-          hash[attr_name] = serialize_value value
+        self.class.attributes.each_with_object({}) do |attribute, hash|
+          if __cache__.key? attribute.name
+            hash[attribute.name] = serialize_value __cache__[attribute.name], attribute.type
+          end
         end
       end
     end
 
-    def serialize_value(value)
+    def serialize_value(value, type=nil)
       case value
         when Model
           value.to_h
         when Array
-          value.map { |v| serialize_value v }
+          t = type.is_a?(Rasti::Types::Array) ? type.type : nil
+          value.map { |v| serialize_value v, t }
         when Hash
+          t = type.is_a?(Rasti::Types::Hash) ? type.value_type : nil
           value.each_with_object({}) do |(k,v), h|
-            h[k.to_sym] = serialize_value v
+            h[k.to_sym] = serialize_value v, t
           end
+        when Time
+          type.is_a?(Rasti::Types::Time) ? value.strftime(type.format) : value
         else
           value
       end

data/lib/rasti/model/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class Model
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/model_spec.rb

@@ -164,12 +164,14 @@ describe Rasti::Model do
 
     let :contact_class do
       Rasti::Model[
-        id:        T::Integer,
-        name:      T::String,
-        birthday:  T::Model[birthday_class],
-        phones:    T::Hash[T::Symbol, T::Integer],
-        addresses: T::Array[T::Model[address_class]],
-        labels:    T::Array[T::String]
+        id:         T::Integer,
+        name:       T::String,
+        birthday:   T::Model[birthday_class],
+        phones:     T::Hash[T::Symbol, T::Integer],
+        addresses:  T::Array[T::Model[address_class]],
+        labels:     T::Array[T::String],
+        created_at: T::Time['%d/%m/%Y %H:%M:%S %z'],
+        updated_at: nil
       ]
     end
 
@@ -190,7 +192,9 @@ describe Rasti::Model do
           {street: 'Lexington Avenue', number: 123},
           {street: 'Park Avenue',      number: 456}
         ],
-        labels: ['Friend', 'Work']
+        labels: ['Friend', 'Work'],
+        created_at: '16/03/2021 09:30:10 -0300',
+        updated_at: Time.parse('2021-03-16T11:45:20-03:00')
       }
     end
 
@@ -209,11 +213,13 @@ describe Rasti::Model do
     it 'Except' do
       contact = contact_class.new attributes
 
-      contact.to_h(except: [:age, :addresses]).must_equal id: attributes[:id],
-                                                          name: attributes[:name],
-                                                          birthday: attributes[:birthday],
-                                                          phones: attributes[:phones],
-                                                          labels: attributes[:labels]
+      excluded_attributes = [:age, :addresses, :created_at, :updated_at]
+
+      contact.to_h(except: excluded_attributes).must_equal id: attributes[:id],
+                                                           name: attributes[:name],
+                                                           birthday: attributes[:birthday],
+                                                           phones: attributes[:phones],
+                                                           labels: attributes[:labels]
     end
 
     it 'Ignore not assigned attributes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require