dynamini 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c2c8f93d74ca1c4ef61073edd3858699e8db375
-  data.tar.gz: c1fa1dbebd43de5f85f4035f2cd360b1c26bb21b
+  metadata.gz: 9d4b13372c015a7e191e88361d9b9ea0568ac70d
+  data.tar.gz: 83afd9ecb74c668480cb0665fdd4d13686054625
 SHA512:
-  metadata.gz: cac32c4a8a7a9c1346e990733e66574c33602b8253a4f40f5c79eed2ed88bd3ec4f941b8acb895d76835d43b9f357829fed29c79bc06ad9ac79aaf54ebab8607
-  data.tar.gz: de7b259c5169f8874e515f124b902531b6cd2b34d3d037aec89954355cc81089bfd515ea3fc7edba7192903abfef431d1da81173b3d142e036021888620e1d0c
+  metadata.gz: 8d3a994dffe9fda84d9c51487198f32b92ba3910d00bfa3c094ec88573cd2210a365599286ff946104ea34471f1e271cfa3d9cf32f3fea4e3001d2052b8695a8
+  data.tar.gz: 6bb3d9a6e5612727ce9226a96f38c7f97b873da29c0059ea296a5168372fdba5af816466b40cb6528297c1d9418daa945f46ef50f7eb700e0f9e573e690ea7e9

data/lib/dynamini/base.rb

@@ -2,9 +2,18 @@ module Dynamini
   # Core db interface class.
   class Base
     include ActiveModel::Validations
+
     attr_reader :attributes
 
+    class_attribute :handles
+
+    self.handles = {
+          created_at: { format: :time, options: {} },
+          updated_at: { format: :time, options: {} }
+        }
+
     BATCH_SIZE = 25
+
     GETTER_PROCS = {
         integer:  proc { |v| v.to_i },
         date:     proc { |v| v.is_a?(Date) ? v : Time.at(v).to_date },
@@ -17,7 +26,7 @@ module Dynamini
 
     SETTER_PROCS = {
         integer:  proc { |v| v.to_i },
-        time:     proc { |v| v.to_f },
+        time:     proc { |v| (v.is_a?(Date) ? v.to_time : v).to_f },
         float:    proc { |v| v.to_f },
         symbol:   proc { |v| v.to_s },
         string:   proc { |v| v },
@@ -46,6 +55,8 @@ module Dynamini
       end
 
       def handle(column, format_class, options = {})
+        self.handles = self.handles.merge(column => { format: format_class, options: options })
+
         define_handled_getter(column, format_class, options)
         define_handled_setter(column, format_class)
       end
@@ -152,8 +163,12 @@ module Dynamini
       end
     end
 
+    def keys
+      [self.class.hash_key, self.class.range_key]
+    end
+
     def changes
-      @changes.delete_if { |attr, value| [self.class.hash_key, self.class.range_key].include?(attr) }
+      @changes.delete_if { |attr, value| keys.include?(attr) }
               .stringify_keys
     end
 
@@ -325,7 +340,7 @@ module Dynamini
         updates[attr] = { value: value, action: 'ADD' }
       end
       updates[:updated_at] = { value: Time.now.to_f, action: 'PUT' } unless opts[:skip_timestamps]
-      updates[:created_at] = { value: Time.now.to_f, action: 'PUT' } unless attributes[:created_at]
+      updates[:created_at] = { value: Time.now.to_f, action: 'PUT' } unless @attributes[:created_at]
       updates.stringify_keys
     end
 
@@ -369,30 +384,18 @@ module Dynamini
     def self.define_handled_getter(column, format_class, options = {})
       proc = GETTER_PROCS[format_class]
       fail 'Unsupported data type: ' + format_class.to_s if proc.nil?
+
       define_method(column) do
-        if @attributes.key?(column)
-          v = read_attribute(column)
-          if v.is_a? Array
-            v.map{ |e| proc.call(e) }
-          else
-            proc.call(read_attribute(column))
-          end
-        else
-          options[:default] || nil
-        end
+        read_attribute(column)
       end
     end
 
     def self.define_handled_setter(column, format_class)
-      setter_symbol = (column.to_s + '=').to_sym
+      method_name = (column.to_s + '=')
       proc = SETTER_PROCS[format_class]
       fail 'Unsupported data type: ' + format_class.to_s if proc.nil?
-      define_method(setter_symbol) do |value|
-        if value.is_a? Array
-          write_attribute(column, value.map{ |e| proc.call(e) })
-        else
-          write_attribute(column, proc.call(value))
-        end
+      define_method(method_name) do |value|
+        write_attribute(column, value)
       end
     end
 
@@ -401,7 +404,10 @@ module Dynamini
     end
 
     def write_attribute(attribute, new_value, record_change = true)
-      old_value = @attributes[attribute]
+      old_value = read_attribute(attribute)
+      if (handle = handles[attribute.to_sym]) && !new_value.nil?
+        new_value = attribute_callback(SETTER_PROCS, handle, new_value)
+      end
       @attributes[attribute] = new_value
       record_change(attribute, new_value, old_value) if record_change
     end
@@ -411,12 +417,22 @@ module Dynamini
     end
 
     def read_attribute(name)
-      @attributes[name]
+      value = @attributes[name]
+      if (handle = handles[name.to_sym])
+        value = handle[:options][:default] if value.nil?
+        value = attribute_callback(GETTER_PROCS, handle, value) unless value.nil?
+      end
+      value
+    end
+
+    def attribute_callback(procs, handle, value)
+      callback = procs[handle[:format]]
+      value.is_a?(Array) ? value.map { |e| callback.call(e) } : callback.call(value)
     end
 
-    #### Default class macros
+    def handles
+      self.class.handles
+    end
 
-    handle :updated_at, :time
-    handle :created_at, :time
   end
 end

data/lib/dynamini/test_client.rb

@@ -104,12 +104,17 @@ module Dynamini
     def flatten_attribute_updates(args = {})
       attribute_hash = {}
 
+      hash_key_value = args[:key][hash_key]
+      range_key_value = args[:key][range_key]
+
       if args[:attribute_updates]
         args[:attribute_updates].each do |k, v|
 
-          if v[:action] == 'ADD' && @data[args[:table_name]][args[:key][hash_key]]
+          if v[:action] == 'ADD' && @data[args[:table_name]][hash_key_value]
             # if record has been saved
-            attribute_hash[k] = (v[:value] + @data[args[:table_name]][args[:key][hash_key]][k].to_f)
+            data = @data[args[:table_name]][hash_key_value]
+            data = data[range_key_value] if range_key_value
+            attribute_hash[k] = (v[:value] + data[k].to_f)
           else
             attribute_hash[k] = v[:value]
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Greg Ward