dynamini 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4b13372c015a7e191e88361d9b9ea0568ac70d
-  data.tar.gz: 83afd9ecb74c668480cb0665fdd4d13686054625
+  metadata.gz: 1727f60201fa441d0e568f95a23efb08a0df1f37
+  data.tar.gz: 07e1b0f75e2c7393e729fd5d617060f74bca3390
 SHA512:
-  metadata.gz: 8d3a994dffe9fda84d9c51487198f32b92ba3910d00bfa3c094ec88573cd2210a365599286ff946104ea34471f1e271cfa3d9cf32f3fea4e3001d2052b8695a8
-  data.tar.gz: 6bb3d9a6e5612727ce9226a96f38c7f97b873da29c0059ea296a5168372fdba5af816466b40cb6528297c1d9418daa945f46ef50f7eb700e0f9e573e690ea7e9
+  metadata.gz: 4548219d95dae93ac2ad42e49403254f19e30bdaf8c778bb05f40da19122246732322f9c4c7f708c099f53aad7a98df9427613cfc3009de950657375c8d3c9f2
+  data.tar.gz: 2c85b46246e7c15348574e2e95ad54f19e4384023eccbc1c099425d49341cf5e6a8c41eddd043c63aafa84d7db272b3d9fe4f4bee1e10d304040afdda0339cb2

data/lib/dynamini/test_client.rb

@@ -4,66 +4,61 @@ module Dynamini
   # In-memory database client for test purposes.
   class TestClient
 
-    attr_reader :hash_key, :data, :range_key
+    attr_reader :hash_key_attr, :data, :range_key_attr
 
-    def initialize(hash_key, range_key=nil)
+    def initialize(hash_key_attr, range_key_attr = nil)
       @data = {}
-      @hash_key = hash_key
-      @range_key = range_key
+      @hash_key_attr = hash_key_attr
+      @range_key_attr = range_key_attr
     end
 
-    def update_item(args = {})
-      table = args[:table_name]
-      arg_keys = args[:key]
-      arg_hash_key_str = arg_keys[hash_key]
-      arg_range_key_str = arg_keys[range_key]
-
-      updates = flatten_attribute_updates(args).merge(
-          hash_key => arg_hash_key_str
-      )
-
-      @data[table] ||= {}
+    def get_table(table_name)
+      @data[table_name] ||= {}
+    end
 
-      #existing record for hash && range
-      if @data[table][arg_hash_key_str].present? && arg_keys[hash_key].present? && @range_key.present? && arg_keys[range_key].present?
-        updates.merge!(range_key => arg_range_key_str)
+    def update_item(args = {})
+      table = get_table(args[:table_name])
 
-        @data[table][arg_hash_key_str][arg_range_key_str].merge! updates
+      keys = args[:key]
 
-      #new record for hash & range ONLY
-      elsif arg_keys[hash_key].present? && arg_keys[range_key].present?
-        updates.merge!(range_key => arg_range_key_str)
+      hash_key_value = keys[hash_key_attr]
+      range_key_value = keys[range_key_attr]
 
-        @data[table][arg_hash_key_str] ||= {}
-        @data[table][arg_hash_key_str][arg_range_key_str] = updates
+      updates = flatten_attribute_updates(args).merge(
+          hash_key_attr => hash_key_value
+      )
 
-      #existing record for hash ONLY
-      elsif @data[table][arg_hash_key_str].present?
-        @data[table][arg_hash_key_str].merge!(updates)
+      if hash_key_value
+        if range_key_value
+          updates.merge!(range_key_attr => range_key_value)
+          if table[hash_key_value] && table[hash_key_value][range_key_value]
+            table[hash_key_value][range_key_value].merge! updates
+          else
+            table[hash_key_value] ||= {}
+            table[hash_key_value][range_key_value] = updates
+          end
 
-      #new record for hash ONLY
-      elsif arg_keys[hash_key].present?
-        @data[table][arg_hash_key_str] = updates
+        else
+          if table[hash_key_value]
+            table[hash_key_value].merge!(updates)
+          else
+            table[hash_key_value] = updates
+          end
+        end
       end
 
     end
 
     def get_item(args = {})
-      table = args[:table_name]
-      hash_key_value = args[:key][hash_key]
-      range_key_value = args[:key][range_key]
+      table = get_table(args[:table_name])
 
-      @data[table] ||= {}
+      hash_key_value = args[:key][hash_key_attr]
+      range_key_value = args[:key][range_key_attr]
 
-      if hash_key_value && range_key_value
-        attributes_hash = @data[table][hash_key_value]
-        attributes_hash = attributes_hash[range_key_value] if attributes_hash
-      else
-        attributes_hash = @data[table][hash_key_value]
-      end
+      attributes_hash = table[hash_key_value]
+      attributes_hash = attributes_hash[range_key_value] if attributes_hash && range_key_value
 
-      item = attributes_hash.nil? ? nil : attributes_hash
-      OpenStruct.new(item: item)
+      OpenStruct.new(item: attributes_hash)
     end
 
     def batch_get_item(args = {})
@@ -85,14 +80,14 @@ module Dynamini
         @data[k] ||= {}
         v.each do |request_hash|
           item = request_hash[:put_request][:item]
-          key = item[hash_key]
+          key = item[hash_key_attr]
           @data[k][key] = item
         end
       end
     end
 
     def delete_item(args = {})
-      @data[args[:table_name]].delete(args[:key][hash_key])
+      @data[args[:table_name]].delete(args[:key][hash_key_attr])
     end
 
     def reset
@@ -104,8 +99,8 @@ module Dynamini
     def flatten_attribute_updates(args = {})
       attribute_hash = {}
 
-      hash_key_value = args[:key][hash_key]
-      range_key_value = args[:key][range_key]
+      hash_key_value = args[:key][hash_key_attr]
+      range_key_value = args[:key][range_key_attr]
 
       if args[:attribute_updates]
         args[:attribute_updates].each do |k, v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Greg Ward