dynamini 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381c96977138b58d80f888d2fc090d9b409269c3
-  data.tar.gz: 612144e090649f6ca6788031d56a10d9148cc542
+  metadata.gz: 2c2c8f93d74ca1c4ef61073edd3858699e8db375
+  data.tar.gz: c1fa1dbebd43de5f85f4035f2cd360b1c26bb21b
 SHA512:
-  metadata.gz: 2fbb94b77c41b5a740a56675e34475e5bcb89080c68d971c7b1218a354b8309635dc9e523f3663a851089f20e6b9df4523750f7e1d7291f5bdaa1ebe80544706
-  data.tar.gz: 42a6ee7785bd4476de41eb8e5f44f853db4c7592be93e3ec38f1eba9b6eff42c6015d060b9f31aafb364f4bf1961aed9d1b61cad52264f8cca740e09a4682593
+  metadata.gz: cac32c4a8a7a9c1346e990733e66574c33602b8253a4f40f5c79eed2ed88bd3ec4f941b8acb895d76835d43b9f357829fed29c79bc06ad9ac79aaf54ebab8607
+  data.tar.gz: de7b259c5169f8874e515f124b902531b6cd2b34d3d037aec89954355cc81089bfd515ea3fc7edba7192903abfef431d1da81173b3d142e036021888620e1d0c

data/lib/dynamini/base.rb

@@ -144,15 +144,23 @@ module Dynamini
     #### Instance Methods
 
     def initialize(attributes = {}, new_record = true)
-      @changed = Set.new
       @new_record = new_record
       @attributes = {}
-
+      clear_changes
       attributes.each do |k, v|
         write_attribute(k, v, new_record)
       end
     end
 
+    def changes
+      @changes.delete_if { |attr, value| [self.class.hash_key, self.class.range_key].include?(attr) }
+              .stringify_keys
+    end
+
+    def changed
+      changes.keys.map(&:to_s)
+    end
+
     def ==(other)
       hash_key == other.hash_key if other.is_a?(self.class)
     end
@@ -175,13 +183,13 @@ module Dynamini
     end
 
     def save(options = {})
-      @changed.empty? || (valid? && trigger_save(options))
+      @changes.empty? || (valid? && trigger_save(options))
     end
 
     def save!(options = {})
       options[:validate] = true if options[:validate].nil?
 
-      unless @changed.empty?
+      unless @changes.empty?
         if (options[:validate] && valid?) || !options[:validate]
           trigger_save(options)
         else
@@ -199,11 +207,11 @@ module Dynamini
       end
     end
 
-    def increment!(attribute_increments, opts = {})
-      attribute_increments.each do |a, v|
-        validate_incrementable_attribute(a, v)
+    def increment!(attributes, opts = {})
+      attributes.each do |attr, value|
+        validate_incrementable_attribute(attr, value)
       end
-      increment_to_dynamo(attribute_increments, opts)
+      increment_to_dynamo(attributes, opts)
     end
 
     def delete
@@ -211,16 +219,6 @@ module Dynamini
       self
     end
 
-    def changes
-      @attributes.select { |attribute| @changed.include?(attribute.to_s) &&
-          attribute != self.class.hash_key &&
-          attribute != self.class.range_key
-      }
-    end
-
-    def changed
-      @changed.to_a
-    end
 
     def new_record?
       @new_record
@@ -228,10 +226,6 @@ module Dynamini
 
     private
 
-    def add_changed(attributes)
-      @changed += attributes.keys.map(&:to_s)
-    end
-
     def trigger_save(options = {})
       generate_timestamps! unless options[:skip_timestamps]
       save_to_dynamo
@@ -276,11 +270,11 @@ module Dynamini
       self.class.client.delete_item(table_name: self.class.table_name, key: key)
     end
 
-    def increment_to_dynamo(attribute_increments, opts = {})
+    def increment_to_dynamo(attributes, opts = {})
       self.class.client.update_item(
           table_name: self.class.table_name,
           key: key,
-          attribute_updates: increment_updates(attribute_increments, opts)
+          attribute_updates: increment_updates(attributes, opts)
       )
     end
 
@@ -319,19 +313,20 @@ module Dynamini
 
     def attribute_updates
       changes.reduce({}) do |updates, (key, value)|
-        updates[key] = {value: value, action: 'PUT'} unless value.blank?
+        current_value = value[1]
+        updates[key] = {value: current_value, action: 'PUT'} unless current_value.blank?
         updates
       end
     end
 
-    def increment_updates(attribute_increments, opts = {})
+    def increment_updates(attributes, opts = {})
       updates = {}
-      attribute_increments.each do |k,v|
-        updates[k] = { value: v, action: 'ADD' }
+      attributes.each do |attr,value|
+        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
+      updates.stringify_keys
     end
 
     def validate_incrementable_attribute(attribute, value)
@@ -348,7 +343,7 @@ module Dynamini
     end
 
     def clear_changes
-      @changed = Set.new
+      @changes = Hash.new { |hash, key| hash[key] = Array.new(2) }
     end
 
     def method_missing(name, *args, &block)
@@ -407,12 +402,12 @@ module Dynamini
 
     def write_attribute(attribute, new_value, record_change = true)
       old_value = @attributes[attribute]
-      @attributes[attribute] = (new_value.nil? ? nil : new_value)
+      @attributes[attribute] = new_value
       record_change(attribute, new_value, old_value) if record_change
     end
 
     def record_change(attribute, new_value, old_value)
-      @changed << attribute.to_s if new_value != old_value
+      @changes[attribute] = [old_value, new_value]
     end
 
     def read_attribute(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors:
 - Greg Ward
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: DynamoDB interface