toy-dynamo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a081dc7fc7b298bb5a17919dc56688f9aa504d4
-  data.tar.gz: 97616bc8ba2f9443c7915d9ea250ef5e50b0306c
+  metadata.gz: 4d8fb485df6b884149934b10f1b21ad93f878e81
+  data.tar.gz: f16adea5e5212c0de9fcd8acd2491d56e3b1623a
 SHA512:
-  metadata.gz: c6d12a4a8cbd03bbb98f8d1ba283d28771e1896b73c9b5480ef750c3b17865c9bb75ae32f654863aa3ee023a4816b37b9f34aead2bf55f29f92802c5a8daacc9
-  data.tar.gz: 8a345618f030321fc03c0695a35467d6e79166ba7bc22e06eb1f71079462b5d4ec882c4ab018f84b871d1d9bee9651d6d25ab579cde485b643fe9d40fe7d5069
+  metadata.gz: 49019ffbabacdf5bb58a77e0c6d7d074ac1a55503c61259e4954d390ba7c6eac0734c0856465426259b442b1d52da14181897039d8500181b4caa233d42ad9be
+  data.tar.gz: 237007ea96207888288afdfab5121b3a03421533cac41159c5f80a797664dbee3c9ebde03706012e22d53cc786cee35fb2b60a59f7e6e07a040fcdf5f85bfd54

data/lib/toy/dynamo/persistence.rb

@@ -10,7 +10,7 @@ module Toy
       else
         attributes_to_persist = self.class.persisted_attributes.select { |a|
           # Persist changed attributes and always the range key if applicable (for lookup)
-          self.changed_attributes.keys.include?(a.name) || (self.class.dynamo_table.range_keys && self.class.dynamo_table.range_keys.find{|k| k[:primary_range_key]}[:attribute_name] == a.name)
+          self.changed_attributes.keys.include?(a.name) || (self.class.dynamo_table.range_keys && (primary_range_key = self.class.dynamo_table.range_keys.find{|k| k[:primary_range_key]}) && primary_range_key[:attribute_name] == a.name)
         }
       end
 
@@ -28,9 +28,8 @@ module Toy
     def delete
       @_destroyed = true
       options = {}
-      if self.class.dynamo_table.range_keys
-        range_key = self.class.dynamo_table.range_keys.find{|k| k[:primary_range_key]}
-        options[:range_value] = read_attribute(range_key[:attribute_name])
+      if self.class.dynamo_table.range_keys && primary_range_key = self.class.dynamo_table.range_keys.find{|k| k[:primary_range_key]}
+        options[:range_value] = read_attribute(primary_range_key[:attribute_name])
       end
       adapter.delete(persisted_id, options)
     end

data/lib/toy/dynamo/querying.rb

@@ -126,6 +126,10 @@ module Toy
           else
             aggregated_results
           end
+        end # scan
+
+        def read_first(hash_value, options={})
+          self.read_range(hash_value, options).first
         end
 
       end # ClassMethods

data/lib/toy/dynamo/table.rb

@@ -212,7 +212,7 @@ module Toy
         if options[:select].is_a?(Array)
           attrs_to_select = [options[:select].map(&:to_s)].flatten
           attrs_to_select << @hash_key[:attribute_name]
-          attrs_to_select << @range_keys.find{|k| k[:primary_range_key] }[:attribute_name] if @range_keys
+          attrs_to_select << primary_range_key[:attribute_name] if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
           query_request.merge!({
             :select => QUERY_SELECT[:specific],
             :attributes_to_get => attrs_to_select.uniq
@@ -244,11 +244,10 @@ module Toy
           end
           raise ArgumentError, "every key must include a :hash_value" if hash_value.blank?
           key_request[@hash_key[:attribute_name]] = { @hash_key[:attribute_type] => hash_value.to_s }
-          if @range_keys.present?
+          if @range_keys.present? && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
             range_value = k[:range_value]
             raise ArgumentError, "every key must include a :range_value" if range_value.blank?
-            range_key = @range_keys.find{|k| k[:primary_range_key] }
-            key_request[range_key[:attribute_name]] = { range_key[:attribute_type] => range_value.to_s }
+            key_request[primary_range_key[:attribute_name]] = { primary_range_key[:attribute_type] => range_value.to_s }
           end
           keys_request << key_request
         end
@@ -275,19 +274,18 @@ module Toy
               @hash_key[:attribute_type] => hash_key_value.to_s
             }
           }
-          if @range_keys
-            range_key = @range_keys.find{|k| k[:primary_range_key]}
-            range_key_value = attributes[range_key[:attribute_name]]
+          if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key]}
+            range_key_value = attributes[primary_range_key[:attribute_name]]
             raise ArgumentError, "range_key was not provided to the write command" if range_key_value.blank?
             key_request.merge!({
-              range_key[:attribute_name] => {
-                range_key[:attribute_type] => range_key_value.to_s
+              primary_range_key[:attribute_name] => {
+                primary_range_key[:attribute_type] => primary_range_key.to_s
               }
             })
           end
           attrs_to_update = {}
           attributes.each_pair do |k,v|
-            next if @range_keys && k == range_key[:attribute_name]
+            next if primary_range_key && k == primary_range_key[:attribute_name]
             if v.blank?
               attrs_to_update.merge!({ k => { :action => "DELETE" } })
             else
@@ -329,12 +327,11 @@ module Toy
             @hash_key[:attribute_type] => hash_key_value.to_s
           }
         }
-        if @range_keys
-          range_key = @range_keys.find{|k| k[:primary_range_key]}
+        if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key]}
           raise ArgumentError, "range_key was not provided to the delete_item command" if options[:range_value].blank?
           key_request.merge!({
-            range_key[:attribute_name] => {
-              range_key[:attribute_type] => options[:range_value].to_s
+            primary_range_key[:attribute_name] => {
+              primary_range_key[:attribute_type] => options[:range_value].to_s
             }
           })
         end
@@ -383,7 +380,7 @@ module Toy
         if options[:select].is_a?(Array)
           attrs_to_select = [options[:select].map(&:to_s)].flatten
           attrs_to_select << @hash_key[:attribute_name]
-          attrs_to_select << @range_keys.find{|k| k[:primary_range_key] }[:attribute_name] if @range_keys
+          attrs_to_select << primary_range_key[:attribute_name] if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
           scan_request.merge!({
             :select => QUERY_SELECT[:specific],
             :attributes_to_get => attrs_to_select.uniq

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler