dynamini 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109ce4b83dcb67fe1efb7c9396fbfb2b73edf943
-  data.tar.gz: a11d91c67bde8d3e8840290321b881d8876e93c4
+  metadata.gz: 1fdfa96c8bf677260145f5d6bb35de6cf667cf90
+  data.tar.gz: 9044d8ce4cf6dfbaab3daa7003e0c5eab9862d43
 SHA512:
-  metadata.gz: 26e9af4f62032585c3ec8ab3712f079a3a2256312e7ee307a4e33f2152075e25f48dd11cfc5fd981e6ca1ec5f2466bee162faffa99dfd34e6f683ed772b02ae8
-  data.tar.gz: afa9bfc847326989792d6be8d1d7d64e4ca773b0d52d55187cf18419e5eaf79b983618e19576b0f873f3ee83fa409ecf0dbdadad5ed7923aa53dd821fd4e6baa
+  metadata.gz: c73f11b146c731254765292c25a777d77efef22f50298db7e203480d1ac01e6cd58c12a585f777dfdea06fc2526fb21cad65d46198ebada01b8f480709c8f15e
+  data.tar.gz: 6c586d97d5bafa884c5011020cfcd716ce3e8023ab807a51249a44d5cd3d605459f8b1350eac758b0bfdd7671bc50d1bfcfb42eaa7330b8e39fb7bf32e23e968

data/lib/dynamini.rb

@@ -1,3 +1,4 @@
+### Central module for Dynamini.
 module Dynamini
   require 'active_model'
   require 'dynamini/base'
@@ -15,4 +16,4 @@ module Dynamini
   def self.configure
     yield(configuration)
   end
-end
+end

data/lib/dynamini/base.rb

@@ -104,8 +104,10 @@ module Dynamini
       def batch_find(ids = [])
         return [] if ids.length < 1
         objects = []
-        raise StandardError, 'Batch find is limited to 100 items' if ids.length > 100
-        key_structure = ids.map { |i| {hash_key => i.to_s} }
+        if ids.length > 100
+          raise StandardError, 'Batch find is limited to 100 items'
+        end
+        key_structure = ids.map { |i| { hash_key => i.to_s } }
         response = self.dynamo_batch_get(key_structure)
         response.responses[table_name].each do |item|
           objects << self.new(item.symbolize_keys, false)
@@ -192,17 +194,11 @@ module Dynamini
       end
     end
 
-    def increment!(attribute, amount=1, opts = {})
-      if amount.is_a?(Integer) || amount.is_a?(Float)
-        current_value = self.send(attribute)
-        if current_value.nil? || current_value.is_a?(Integer) || current_value.is_a?(Float)
-          increment_to_dynamo(attribute, amount, opts)
-        else
-          raise StandardError, 'You cannot increment! a non-numeric non-nil value. If your current value is a numeric string, use :handle to autocast it as a number.'
-        end
-      else
-        raise StandardError, 'You cannot increment an attribute by a non-numeric value.'
+    def increment!(attribute_increments, opts = {})
+      attribute_increments.each do |a, v|
+        validate_incrementable_attribute(a, v)
       end
+      increment_to_dynamo(attribute_increments, opts)
     end
 
     def delete
@@ -252,19 +248,15 @@ module Dynamini
     end
 
     def touch_to_dynamo
-      self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {updated_at: {value: attributes[:updated_at], action: 'PUT'}})
+      self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {updated_at: {value: Time.now.to_f, action: 'PUT'}})
     end
 
     def delete_from_dynamo
       self.class.client.delete_item(table_name: self.class.table_name, key: key)
     end
 
-    def increment_to_dynamo(attribute, amount, opts={})
-      if opts[:skip_timestamps]
-        self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {attribute => {value: amount, action: 'ADD'}})
-      else
-        self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: {attribute => {value: amount, action: 'ADD'}, updated_at: {value: attributes[:updated_at], action: 'PUT'}})
-      end
+    def increment_to_dynamo(attribute_increments, opts={})
+      self.class.client.update_item(table_name: self.class.table_name, key: key, attribute_updates: increment_updates(attribute_increments, opts))
     end
 
     def self.dynamo_batch_get(key_structure)
@@ -274,10 +266,10 @@ module Dynamini
     def self.dynamo_batch_save(model_array)
       put_requests = []
       model_array.each do |model|
-        put_requests << {put_request: {item: model.attributes.reject{|k, v| v.blank?}.stringify_keys}}
+        put_requests << { put_request: { item: model.attributes.reject{|_k, v| v.blank? }.stringify_keys } }
       end
-      request_options = {request_items: {
-          "#{table_name}" => put_requests}
+      request_options = { request_items: {
+          "#{table_name}" => put_requests }
       }
       client.batch_write_item(request_options)
     end
@@ -301,6 +293,27 @@ module Dynamini
       end
     end
 
+    def increment_updates(attribute_increments, opts={})
+      updates = {}
+      attribute_increments.each do |k,v|
+        updates[k] = {value: v, 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
+    end
+
+    def validate_incrementable_attribute(attribute, value)
+      if value.is_a?(Integer) || value.is_a?(Float)
+        current_value = self.send(attribute)
+        unless current_value.nil? || current_value.is_a?(Integer) || current_value.is_a?(Float)
+          raise StandardError, "You cannot increment a non-numeric non-nil value: #{attribute} is currently #{current_value}. If your current value is a numeric string, use :handle to autocast it as a number."
+        end
+      else
+        raise StandardError, "You cannot increment an attribute by a non-numeric value: #{value}"
+      end
+    end
+
     def clear_changes
       @changed = Set.new
     end

data/lib/dynamini/test_client.rb

@@ -68,7 +68,7 @@ module Dynamini
       attribute_hash = {}
 
       args[:attribute_updates].each do |k, v|
-        if v[:action] == 'ADD'
+        if v[:action] == 'ADD' && @data[args[:table_name]][args[:key][hash_key]] #if record has been saved
           attribute_hash[k] = v[:value] + @data[args[:table_name]][args[:key][hash_key]][k].to_f
         else
           attribute_hash[k] = v[:value]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Greg Ward
@@ -93,8 +93,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-description: Lightweight DynamoDB interface gem designed as a drop-in replacement
-  for ActiveRecord. Built & maintained by the team at yroo.com.
+description: |-
+  Lightweight DynamoDB interface gem designed as a drop-in replacement for ActiveRecord.
+                      Built & maintained by the team at yroo.com.
 email: dev@retailcommon.com
 executables: []
 extensions: []