ocean-dynamo 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22735c29c5d86fdee39e4df6a952453bc2005e2
-  data.tar.gz: 975e59447cc5671db3daf7e80f58b2940dc64671
+  metadata.gz: a2c4edf837d81606bd36e398ac37902c46e46244
+  data.tar.gz: 6edba057816d06a0e065e2f532c5136cb2bcf6d5
 SHA512:
-  metadata.gz: 6590b4b1aa5ba1810ec1835f95a38c2db30125f9a70cc89e87971dd7ebca789d6e0eded17c7e7e1588b7d006679ef8b14f12f30ae37371ba2ae2c2da4ff47ddf
-  data.tar.gz: d1664e362cf1018638e037d34a618edad903aa9fccf3a2cf9c34f96d0255f67912a344237aa892a7a981e88d3d1ba5fd7ec5694e2e2558828300876100e7b739
+  metadata.gz: 58638ca486e8e02fedd8c0cb12987721626be0054173e0a86e834076e0c296a314b91a8dcc5088ea7ffdaf3eb5984f3fe31ef77d5c92fc92370cc72655f76500
+  data.tar.gz: b12f97133c8d592525601ecb043ab97540ba5efceade64af9e8f53ec85105f8f74fe63e74986ed9720994946b6778e01dd49b0f8ed3e8c406a41b5ba83744e54

data/lib/ocean-dynamo/attributes.rb

@@ -171,11 +171,11 @@ module OceanDynamo
         return value.collect(&:to_s) if value.is_a?(Array)
         value
       when :integer
-        return nil if value == nil
+        return nil if value == nil || value == false || value.is_a?(String) && value.blank?
         return value.collect(&:to_i) if value.is_a?(Array)
         value.to_i
       when :float
-        return nil if value == nil
+        return nil if value == nil || value == false || value.is_a?(String) && value.blank?
         return value.collect(&:to_f) if value.is_a?(Array)
         value.to_f
       when :boolean

data/lib/ocean-dynamo/persistence.rb

@@ -39,6 +39,7 @@ module OceanDynamo
 
 
       def delete_all
+        return nil unless dynamo_items
         dynamo_items.each() do |item|
           item.delete
         end
@@ -47,6 +48,7 @@ module OceanDynamo
 
 
       def destroy_all
+        return nil unless dynamo_items
         dynamo_items.select() do |item_data|
           new._setup_from_dynamo(item_data).destroy
         end

data/lib/ocean-dynamo/queries.rb

@@ -11,6 +11,7 @@ module OceanDynamo
       return hash.collect {|elem| find elem, range, consistent: consistent } if hash.is_a?(Array)
       _late_connect?
       hash = hash.id if hash.kind_of?(Table)    # TODO: We have (innocuous) leakage, fix!
+      range = range.to_i if range.is_a?(Time)
       item = dynamo_items[hash, range]
       unless item.exists?
         raise RecordNotFound, "can't find a #{self} with primary key ['#{hash}', #{range.inspect}]" 

data/lib/ocean-dynamo/tables.rb

@@ -89,7 +89,7 @@ module OceanDynamo
         dynamo_table.hash_key = [table_hash_key, hash_key_type]
 
         if table_range_key
-          range_key_type = fields[table_range_key][:type]
+          range_key_type = generalise_range_key_type
           dynamo_table.range_key = [table_range_key, range_key_type]
         end
       end
@@ -98,8 +98,7 @@ module OceanDynamo
       def create_table
         hash_key_type = fields[table_hash_key][:type]
         hash_key_type = :string if hash_key_type == :reference
-
-        range_key_type = table_range_key && fields[table_range_key][:type]
+        range_key_type = generalise_range_key_type
 
         self.dynamo_table = dynamo_client.tables.create(table_full_name, 
           table_read_capacity_units, table_write_capacity_units,
@@ -112,6 +111,17 @@ module OceanDynamo
       end
 
 
+      def generalise_range_key_type
+        return false unless table_range_key
+        t = fields[table_range_key][:type]
+        return :string if t == :string
+        return :number if t == :integer
+        return :number if t == :float
+        return :number if t == :datetime
+        raise "Unsupported range key type: #{t}"
+      end
+
+
       def delete_table
         return false unless dynamo_table.exists? && dynamo_table.status == :active
         dynamo_table.delete

data/lib/ocean-dynamo/version.rb

@@ -1,3 +1,3 @@
 module OceanDynamo
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk