dynamini 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661e45e76eaaaa1e48e12e3a8dfdd79013f1092d
-  data.tar.gz: eabe1c032f334bbb0a6b5249f525a2b18436d5b6
+  metadata.gz: 109ce4b83dcb67fe1efb7c9396fbfb2b73edf943
+  data.tar.gz: a11d91c67bde8d3e8840290321b881d8876e93c4
 SHA512:
-  metadata.gz: b773405d0e13858b136a44a8f19135a6b00a5dbf9823d7569cfcc0f034a75287940cc59ea087ce4de2e698f981ba401afd130be3548ed66265d927cb42150ab3
-  data.tar.gz: c9e5b0ceeba1269af53ddd7e596a1a0c5b29684b9e85b9a6d92f1cdd14cbcfd5e8bbad2d2b75c99887174a1cf3a7a0910fbdb1e167293d74b59326368a7f732f
+  metadata.gz: 26e9af4f62032585c3ec8ab3712f079a3a2256312e7ee307a4e33f2152075e25f48dd11cfc5fd981e6ca1ec5f2466bee162faffa99dfd34e6f683ed772b02ae8
+  data.tar.gz: afa9bfc847326989792d6be8d1d7d64e4ca773b0d52d55187cf18419e5eaf79b983618e19576b0f873f3ee83fa409ecf0dbdadad5ed7923aa53dd821fd4e6baa

data/lib/dynamini/base.rb

@@ -19,10 +19,11 @@ module Dynamini
     }
 
     class << self
+
       attr_writer :batch_write_queue, :in_memory
 
       def table_name
-        @table_name || name.demodulize.downcase.pluralize
+        @table_name ||= name.demodulize.tableize
       end
 
       def set_table_name(name)
@@ -33,6 +34,10 @@ module Dynamini
         @hash_key = key
       end
 
+      def set_range_key(key)
+        @range_key = key
+      end
+
       def handle(column, format_class, options={})
         define_handled_getter(column, format_class, options)
         define_handled_setter(column, format_class)
@@ -42,6 +47,10 @@ module Dynamini
         @hash_key || :id
       end
 
+      def range_key
+        @range_key
+      end
+
       def in_memory
         @in_memory || false
       end
@@ -71,8 +80,9 @@ module Dynamini
         model if model.save!(options)
       end
 
-      def find(key)
-        response = client.get_item(table_name: table_name, key: {hash_key => key.to_s})
+      def find(hash_value, range_value = nil)
+        raise "Range key can not be blank" if range_key && range_value.nil?
+        response = client.get_item(table_name: table_name, key: create_key_hash(hash_value, range_value))
         raise 'Item not found.' unless response.item
         self.new(response.item.symbolize_keys, false)
       end
@@ -157,7 +167,7 @@ module Dynamini
     end
 
     def save(options = {})
-      @changed.empty? || valid? && trigger_save(options)
+      @changed.empty? || (valid? && trigger_save(options))
     end
 
     def save!(options = {})
@@ -182,11 +192,11 @@ module Dynamini
       end
     end
 
-    def increment!(attribute, amount=1)
+    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)
+          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
@@ -201,7 +211,7 @@ module Dynamini
     end
 
     def changes
-      @attributes.select { |attribute| @changed.include?(attribute.to_s) && attribute != self.class.hash_key }
+      @attributes.select { |attribute| @changed.include?(attribute.to_s) && attribute != self.class.hash_key && attribute != self.class.range_key }
     end
 
     def changed
@@ -249,8 +259,12 @@ module Dynamini
       self.class.client.delete_item(table_name: self.class.table_name, key: key)
     end
 
-    def increment_to_dynamo(attribute, amount)
-      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'}})
+    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
     end
 
     def self.dynamo_batch_get(key_structure)
@@ -269,7 +283,15 @@ module Dynamini
     end
 
     def key
-      {self.class.hash_key => @attributes[self.class.hash_key]}
+      key_hash = { self.class.hash_key => @attributes[self.class.hash_key] }
+      key_hash[self.class.range_key] = @attributes[self.class.range_key] if self.class.range_key
+      key_hash
+    end
+
+    def self.create_key_hash(hash_value, range_value = nil)
+      key_hash = { self.hash_key => hash_value }
+      key_hash[self.range_key] = range_value if self.range_key
+      key_hash
     end
 
     def attribute_updates
@@ -352,4 +374,4 @@ module Dynamini
     handle :updated_at, :datetime
     handle :created_at, :datetime
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Greg Ward
@@ -9,10 +9,13 @@ authors:
 - Alishan Ladhani
 - Emily Fan
 - Justine Jones
+- Gillian Chesnais
+- Scott Chu
+- Jeff Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -121,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DynamoDB interface