data_steroid 0.5.0.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f1a3f092625528df6c6a71056745fbd11cc4e3
-  data.tar.gz: 8f686ad9f09c221e565576152f84a51024873ce3
+  metadata.gz: 417fc8643cd58e294b41e4e398f2d396926433fa
+  data.tar.gz: ae03ebb310a2ea626a9f632e0588fc191aebdaeb
 SHA512:
-  metadata.gz: 8caece4d2590ceb2a30cee2d4450897af324a66551e1ad59303b41ccd1fce3007b563df7a61b6986d240f71325ac84654beaa8e5d93936b159a4996e9a0919ff
-  data.tar.gz: b62725cac2fdb839df65bf88fdd4cdd0aa75be3fceb036385dbcde49e42b8c9814ac59741ad7d370674ca10865d9e5c089c4c55c30523a3b769914a81200e0f1
+  metadata.gz: e8f27753c9ba2a3955736aa1e63b1e778ce3d26fbcf4c320172757ab5f143bdf90f9c258859947f509cfaaf380ddc5047eb570921e5f04882103a4cb617fe33a
+  data.tar.gz: a52d9ce78d4294f353483cf699218617ac215f1fcb29bf5604302ab5c39a1857c430bd59fd894ae48b87594600680c2217eb0f253a74485a15c8e9d60b0e9513

data/lib/data_steroid/entity.rb

@@ -27,19 +27,18 @@ module DataSteroid
       end
 
       def to_gcloud
-        hash = {}
-        properties_names.each do |property|
-          hash[property] = send(property)
+        properties_names.each_with_object({}) do |property, hash|
+          hash[property] = type_cast_for_storage send(property)
         end
-        hash.sort.to_h
       end
 
       def to_csv
-        values = to_gcloud.sort.to_h.values.map! do |v| 
-          if v.class == Time
-            v.to_formatted_s(:db)
+        values = to_gcloud.sort.to_h.values.map! do |value|
+          case value
+          when Time
+            value.to_formatted_s(:db)
           else
-            v.to_s.gsub(',', '')
+            value.to_s.gsub(',', '')
           end
         end
         values.join(',')
@@ -48,6 +47,18 @@ module DataSteroid
       def self.kind(kind_name)
         self.kind = kind_name
       end
+
+      protected
+
+      # Based on https://github.com/rails/rails/blob/v5.0.0.1/activerecord/lib/active_record/type_caster/map.rb
+      def type_cast_for_storage(value)
+        case value
+        when Symbol
+          value.to_s
+        else
+          value
+        end
+      end
     end
 
     class_methods do

data/lib/data_steroid/persistable/savable.rb

@@ -16,29 +16,31 @@ module DataSteroid
             send(name)
           end
 
-          @gcloud_entity ||= self.class.datastore_entity
-
           to_gcloud.each_pair do |key, value|
             if key == 'id' && value.present?
-              @gcloud_entity.key = gcloud_key unless @gcloud_entity.persisted?
-              next
-            end
-            if value.present?
-              @gcloud_entity[key] = value
-            elsif @gcloud_entity.properties.exist? key
-              @gcloud_entity.properties.delete key
+              gcloud_entity.key = gcloud_key unless gcloud_entity.persisted?
+            elsif value.present?
+              gcloud_entity[key] = value
+            elsif gcloud_entity.properties.exist? key
+              gcloud_entity.properties.delete key
             end
           end
 
-          if (result = self.class.datastore.save(@gcloud_entity).first)
+          if (result = self.class.datastore.save(gcloud_entity).first)
             send('id=', result.key.id) if id.nil?
             true
           else
             false
           end
         end
+
+        protected
+
+        def gcloud_entity
+          @gcloud_entity ||= self.class.datastore_entity
+        end
       end
-      
+
       class_methods do
         def before_save(method)
           before_save_methods << method

data/lib/data_steroid/properties.rb

@@ -66,7 +66,7 @@ module DataSteroid
 
         define_method("#{name}=") do |value| # Define set method
           coerced_value =
-            if options[:type]
+            if options[:type] && !value.nil?
               coercer[value.class].send("to_#{options[:type].to_s.downcase}", value)
             else
               value

data/lib/data_steroid/version.rb

@@ -1,5 +1,5 @@
 module DataSteroid
   # version string
   # @api public
-  VERSION = '0.5.0.1'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_steroid
 version: !ruby/object:Gem::Version
-  version: 0.5.0.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Fabio Tomio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Google Datastore ODM