toy-dynamo 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8fb485df6b884149934b10f1b21ad93f878e81
-  data.tar.gz: f16adea5e5212c0de9fcd8acd2491d56e3b1623a
+  metadata.gz: 7a979022e1dc25fa3a291046f2740f298d841964
+  data.tar.gz: d26220e83e7b162126a8e80298609950bc8997fd
 SHA512:
-  metadata.gz: 49019ffbabacdf5bb58a77e0c6d7d074ac1a55503c61259e4954d390ba7c6eac0734c0856465426259b442b1d52da14181897039d8500181b4caa233d42ad9be
-  data.tar.gz: 237007ea96207888288afdfab5121b3a03421533cac41159c5f80a797664dbee3c9ebde03706012e22d53cc786cee35fb2b60a59f7e6e07a040fcdf5f85bfd54
+  metadata.gz: 9b942b853e9b412acf05208360f1fa8bbbf4a0b6ba7d0f480cd1d4ab9f141cdc850f7d085538ff9af15158745b692051af76810c4fbefac1f1016667d2301fcc
+  data.tar.gz: 7655f959d6dd0e993427b717c482557053b9f4ccb4533d7f3de7ce5c950c0f9042516b0a28aeb7e9fee204bb4dcdb366b7295c280caebac52e61d1af1e41f3c8

data/lib/toy/dynamo/extensions/float.rb

@@ -0,0 +1,13 @@
+module Toy
+  module Extensions
+    module Float
+      def to_store(value, *)
+        value.nil? ? nil : value.to_f
+      end
+
+      def from_store(value, *)
+        value.nil? ? nil : value.to_f
+      end
+    end
+  end
+end

data/lib/toy/dynamo/querying.rb

@@ -67,8 +67,8 @@ module Toy
           results = adapter.batch_read(keys, options)
           results[:responses][dynamo_table.table_schema[:table_name]].each do |result|
             attrs = Response.strip_attr_types(result)
-            if dynamo_table.range_keys.present?
-              (results_map[attrs[dynamo_table.hash_key[:attribute_name]]] ||= {})[attrs[dynamo_table.range_keys.find{|rk| rk[:primary_range_key] }[:attribute_name]]] = load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
+            if dynamo_table.range_keys.present? && primary_range_key = dynamo_table.range_keys.find{|rk| rk[:primary_range_key] }
+              (results_map[attrs[dynamo_table.hash_key[:attribute_name]]] ||= {})[attrs[primary_range_key[:attribute_name]]] = load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
             else
               results_map[attrs[dynamo_table.hash_key[:attribute_name]]] = load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
             end

data/lib/toy/dynamo/table.rb

@@ -71,6 +71,7 @@ module Toy
             @hash_key = key_schema_attr
           else
             (@range_keys ||= []) << key_schema_attr.merge(:primary_range_key => true)
+            @primary_range_key = key_schema_attr.merge(:primary_range_key => true)
           end
         end
 
@@ -212,7 +213,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 << primary_range_key[:attribute_name] if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
+          attrs_to_select << @primary_range_key[:attribute_name] if @primary_range_key
           query_request.merge!({
             :select => QUERY_SELECT[:specific],
             :attributes_to_get => attrs_to_select.uniq
@@ -236,7 +237,7 @@ module Toy
         keys_request = []
         keys.each do |k|
           key_request = {}
-          if @range_keys.present?
+          if @primary_range_key
             hash_value = k[:hash_value]
           else
             raise ArgumentError, "expected keys to be in the form of ['hash key here'] for table with no range keys" if hash_value.is_a?(Hash)
@@ -244,10 +245,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? && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
+          if @primary_range_key
             range_value = k[:range_value]
             raise ArgumentError, "every key must include a :range_value" if range_value.blank?
-            key_request[primary_range_key[:attribute_name]] = { primary_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
@@ -274,18 +275,18 @@ module Toy
               @hash_key[:attribute_type] => hash_key_value.to_s
             }
           }
-          if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key]}
-            range_key_value = attributes[primary_range_key[:attribute_name]]
+          if @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!({
-              primary_range_key[:attribute_name] => {
-                primary_range_key[:attribute_type] => primary_range_key.to_s
+              @primary_range_key[:attribute_name] => {
+                @primary_range_key[:attribute_type] => range_key_value.to_s
               }
             })
           end
           attrs_to_update = {}
           attributes.each_pair do |k,v|
-            next if primary_range_key && k == primary_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
@@ -327,11 +328,11 @@ module Toy
             @hash_key[:attribute_type] => hash_key_value.to_s
           }
         }
-        if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key]}
+        if @primary_range_key
           raise ArgumentError, "range_key was not provided to the delete_item command" if options[:range_value].blank?
           key_request.merge!({
-            primary_range_key[:attribute_name] => {
-              primary_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
@@ -380,7 +381,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 << primary_range_key[:attribute_name] if @range_keys && primary_range_key = @range_keys.find{|k| k[:primary_range_key] }
+          attrs_to_select << @primary_range_key[:attribute_name] if @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.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/toy/dynamo.rb

@@ -17,6 +17,7 @@ require "toy/dynamo/extensions/hash"
 require "toy/dynamo/extensions/set"
 require "toy/dynamo/extensions/time"
 require "toy/dynamo/extensions/symbol"
+require "toy/dynamo/extensions/float"
 
 module Toy
   module Dynamo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/toy/dynamo/extensions/array.rb
 - lib/toy/dynamo/extensions/boolean.rb
 - lib/toy/dynamo/extensions/date.rb
+- lib/toy/dynamo/extensions/float.rb
 - lib/toy/dynamo/extensions/hash.rb
 - lib/toy/dynamo/extensions/set.rb
 - lib/toy/dynamo/extensions/symbol.rb