ocean-dynamo 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5ae28e5e708104d6732e25bcda4af633b69570d
-  data.tar.gz: 002e58e877f964d1a547b330fb5bf3cceadfcabe
+  metadata.gz: 4bb66981fe7a08584a0a51f81e8cc458a354cac7
+  data.tar.gz: d3ee6d39bfac9fe8622b91e7e485dbcbca16c8d3
 SHA512:
-  metadata.gz: 4b2065e46adad9805f0fa494a627aad7d1f577156d195309cd7ba4cf719638f7ded898d57c782576a20f08d621020a93269abc00e66cfb8d8c5103582dc6abd3
-  data.tar.gz: 892ce7432d451aae76b8ded119501c973961a5ee0d2cbb3b9a6ca4fd5027540ffb2f89d7c66f706a5d7c78d9b326f1b28bb721f749845d7b68c5b5b7b95a0c07
+  metadata.gz: 4408c7038ebb322f96fd12d65b399f2dc7fdd59708a7f8d13659bba56b4996bb4987e9d052004e7cc0fa35c41e16548364ae87e7df9823adb5d2c03c0dc1ed29
+  data.tar.gz: 29d4cdabc73cd9f84895cd9000c10099f001d56d5bffdfc92d0aab2dee4a4e1b66316e405945f38228814d40224e8ae91aabdcfbc9342da5ab57d51f297d13f5

data/lib/ocean-dynamo/dynamo.rb

@@ -240,18 +240,21 @@ module OceanDynamo
     attr_reader :dynamo_item
 
 
-    def initialize(attributes={})
+    def initialize(attrs={})
       run_callbacks :initialize do
         @attributes = HashWithIndifferentAccess.new
-        fields.each do |name, v| 
-          write_attribute(name, evaluate_default(v[:default])) unless read_attribute(name)
+        fields.each do |name, md| 
+          write_attribute(name, evaluate_default(md[:default], md[:type]))
           self.class.class_eval "def #{name}; read_attribute('#{name}'); end"
           self.class.class_eval "def #{name}=(value); write_attribute('#{name}', value); end"
           if fields[name][:type] == :boolean
             self.class.class_eval "def #{name}?; read_attribute('#{name}'); end"
           end
         end
-        super
+        if attrs
+          attrs.delete_if { |k, v| !fields.has_key?(k) }
+        end
+        super(attrs)
         @dynamo_item = nil
         @destroyed = false
         @new_record = true
@@ -352,8 +355,8 @@ module OceanDynamo
     def deserialize_attribute(value, metadata, 
                               type: metadata[:type], 
                               default: metadata[:default])
-      if value == nil && default != nil && type != :string
-        return evaluate_default(default)
+      if value == nil && type != :string
+        return evaluate_default(default, type)
       end
       case type
       when :string
@@ -445,7 +448,8 @@ module OceanDynamo
       run_callbacks :commit do
         run_callbacks :save do
           run_callbacks :create do
-            write_attribute(table_hash_key, SecureRandom.uuid) if read_attribute(table_hash_key) == nil
+            k = read_attribute(table_hash_key)
+            write_attribute(table_hash_key, SecureRandom.uuid) if k == "" || k == nil
             t = Time.now
             self.created_at ||= t
             self.updated_at ||= t
@@ -516,10 +520,11 @@ module OceanDynamo
 
     protected
 
-    def evaluate_default(v)
-      return v.call if v.is_a?(Proc)
-      return v.clone if v.is_a?(Array) || v.is_a?(String)   # Instances need their own copy
-      v
+    def evaluate_default(default, type)
+      return default.call if default.is_a?(Proc)
+      return "" if default == nil && type == :string
+      return default.clone if default.is_a?(Array) || default.is_a?(String)   # Instances need their own copy
+      default
     end
 
 

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Peter Bengtson