protobuf-activerecord 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd165bad09c99c5b394865faaaa00efaffcb3fb
-  data.tar.gz: 88c7bb55c4408f66397ffb8ca5f4fda21c0e4a64
+  metadata.gz: b38ffa80f940e4ac8d5fc3fb2872977bb85db233
+  data.tar.gz: 0341aad5a468926b8bca0ac43586ad44f26d8ff7
 SHA512:
-  metadata.gz: 5b89216c06f6a28dc2f0af37bacf0e5cad14b104305a545241a867086458d7f6b60610566e22dbd2010c0e91468647bcc2b437cfd63c0fc99229518d5f61826a
-  data.tar.gz: 5cbdf81b2078d11c22d05d9924dc819ad7bbaf4739efad1dd60a37298544aab140474d2a00aea2e91cfa9af61f63c47b18674f587839f75b49a47439898a1781
+  metadata.gz: 0522e4d8d8fafaf3addbc02323b5bfc60266ce647b233c9e3b8450e024d860c4abc2fd8f9cdadc53e52ca466a8ec336306a397dc6c9d180ed85a54ecc81cbbc3
+  data.tar.gz: 7a228a59050acdfa65e8862a24893ef08e10330a00f9ad0cd3584de214ac0ead7a1fbbd8dc5a01cdba3a4e9fd5c4f202207a3524281984d9641b313382c09ffc

data/lib/protobuf/active_record/serialization.rb

@@ -24,6 +24,7 @@ module Protobuf
         # :nodoc:
         def _protobuf_convert_attributes_to_fields(key, value)
           return value unless _protobuf_date_datetime_time_or_timestamp_column?(key)
+          return nil if value.nil?
           return value.to_i unless _protobuf_date_column?(key)
 
           value.to_time(:utc).to_i

data/lib/protobuf/active_record/transformation.rb

@@ -59,21 +59,18 @@ module Protobuf
 
         # :nodoc:
         def _protobuf_convert_fields_to_attributes(key, value)
-          return value if value.nil?
+          return nil if value.nil?
+          return value unless _protobuf_date_datetime_time_or_timestamp_column?(key)
 
           value = case
-                  when !_protobuf_date_datetime_time_or_timestamp_column?(key) then
-                    value
-                  when _protobuf_date_column?(key) then
-                    convert_int64_to_date(value)
                   when _protobuf_datetime_column?(key) then
                     convert_int64_to_datetime(value)
-                  when _protobuf_time_column?(key) then
-                    convert_int64_to_time(value)
                   when _protobuf_timestamp_column?(key) then
                     convert_int64_to_time(value)
-                  else
-                    value
+                  when _protobuf_time_column?(key) then
+                    convert_int64_to_time(value)
+                  when _protobuf_date_column?(key) then
+                    convert_int64_to_date(value)
                   end
 
           return value

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.3.2"
+    VERSION = "3.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Adam Hutchison
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record