items#at handles nil range_key properly

ananthakumaran · May 11, 2012 · 80bfbd8 · 80bfbd8
1 parent 4c9c3c3
commit 80bfbd8
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/lib/dynamoid/adapter/aws_sdk.rb b/lib/dynamoid/adapter/aws_sdk.rb
@@ -82,11 +82,7 @@ def create_table(table_name, key = :id, options = {})
       def delete_item(table_name, key, options = {})
         range_key = options.delete(:range_key)
         table = get_table(table_name)
-        result = if table.composite_key?
-          table.items.at(key, range_key)
-        else
-          table.items[key]
-        end
+        result = table.items.at(key, range_key)
         result.delete unless result.attributes.to_h.empty?
         true
       end
@@ -119,11 +115,8 @@ def get_item(table_name, key, options = {})
         range_key = options.delete(:range_key)
         table = get_table(table_name)
 
-        result = if table.composite_key?
-          table.items.at(key, range_key)
-        else
-          table.items[key]
-        end.attributes.to_h(options)
+        result = table.items.at(key, range_key).attributes.to_h(options)
+
         if result.empty?
           nil
         else