dynamini 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58fb603731e3efd1d91be0295a9f9c6bb9ab563
-  data.tar.gz: 914d82aa5c7e4c923e1f5d14552043bfab6f966b
+  metadata.gz: 5f49e721fd627858b268479539065b3f62ded837
+  data.tar.gz: 296511c0cf83bb00155e21cd78e6a5c05da93ec0
 SHA512:
-  metadata.gz: 35cef4e720792c20f78a3e9db934fc7fc020de29d06c377641fc4a4484b0874822394c391f0bc1dfb7a39a2310054efe68d665171c7900d523bd21fe92276cf1
-  data.tar.gz: c39c01e1d41bbceade9bf3eac3561766389e0763b308dd841e750e7e0440802809d1bcee273abc6d6b618e854aa8aa7f5377aab69b943ac4c6377d0783575591
+  metadata.gz: 6785712ac96112bf8e78cc551a6dc1b378968ee90d1e4fd4cd2d0294c0290d9b26b777deb50e45143801eb4567263628f5cc37676fb932dcc7e1231e8a7da2e1
+  data.tar.gz: 8fd0a91480de7a1a3a815c22db84cf2a783e2aefb68a8f47da958bf9e8d76c9d8399dfec093735f1494eec8212a0b6308899d46eab99b45be7b099849952dcc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamini (2.6.5)
+    dynamini (2.6.6)
       activemodel (>= 3, < 5.0)
       aws-sdk (~> 2)
 

data/dynamini.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dynamini'
-  s.version = '2.6.5'
+  s.version = '2.6.6'
   s.summary = 'DynamoDB interface'
   s.description = 'Lightweight DynamoDB interface gem designed as
                    a drop-in replacement for ActiveRecord.

data/lib/dynamini/test_client.rb

@@ -82,23 +82,32 @@ module Dynamini
       OpenStruct.new(responses: responses)
     end
 
-    # TODO add range key support
+    # TODO add range key support for delete, not currently implemented batch_operations.batch_delete
     def batch_write_item(request_options)
       request_options[:request_items].each do |table_name, requests|
+        table = get_table(table_name)
+
         requests.each do |request_hash|
           if request_hash[:put_request]
-            item = request_hash[:put_request][:item]
-            key = item[hash_key_attr.to_s]
-            get_table(table_name)[key] = item
+            item = request_hash[:put_request][:item].symbolize_keys
+            hash_key_value = item[hash_key_attr]
+            if range_key_attr.present?
+              range_key_value = item[range_key_attr]
+              table[hash_key_value] = {} if table[hash_key_value].nil?
+              table[hash_key_value][range_key_value] = item
+            else
+              table[hash_key_value] = item
+            end
           else
             item = request_hash[:delete_request][:key]
             id = item[hash_key_attr]
-            get_table(table_name).delete(id)
+            table.delete(id)
           end
         end
       end
     end
 
+
     def delete_item(args = {})
       get_table(args[:table_name]).delete(args[:key][hash_key_attr])
     end

data/spec/dynamini/test_client_spec.rb

@@ -367,41 +367,82 @@ describe Dynamini::TestClient do
   end
 
   describe '#batch_write_item' do
-    let(:test_client) { Dynamini::TestClient.new(:id) }
+    context 'with only hash key' do
+      let(:test_client) { Dynamini::TestClient.new(:id) }
 
-    it 'should store all items in the table correctly' do
-      item1 = {'foo' => 'bar', 'id' => 1}
-      item2 = {'foo' => 'bar', 'id' => 2}
-      put_requests = [{put_request: {item: item1}},
-                      {put_request: {item: item2}}]
+      it 'should store all items in the table correctly' do
+        item1 = {'foo' => 'bar', 'id' => 1}
+        item2 = {'foo' => 'bar', 'id' => 2}
+        put_requests = [{put_request: {item: item1}},
+                        {put_request: {item: item2}}]
 
-      request_options = {request_items: {table_name => put_requests}}
+        request_options = {request_items: {table_name => put_requests}}
 
-      test_client.batch_write_item(request_options)
-      expect(test_client.data[table_name][1]).to eq(item1)
-      expect(test_client.data[table_name][2]).to eq(item2)
-    end
+        test_client.batch_write_item(request_options)
+        expect(test_client.data[table_name][1]).to eq({foo: 'bar', id: 1})
+        expect(test_client.data[table_name][2]).to eq({foo: 'bar', id: 2})
+      end
 
-    context 'batch deleting' do
-      before do
-        test_client.data[table_name] = {}
-        test_client.data[table_name]['one'] = {name: 'item1'}
-        test_client.data[table_name]['two'] = {name: 'item2'}
+      context 'batch deleting' do
+        before do
+          test_client.data[table_name] = {}
+          test_client.data[table_name]['one'] = {name: 'item1'}
+          test_client.data[table_name]['two'] = {name: 'item2'}
+        end
+
+        it 'should remove all items from the table' do
+
+          delete_requests = [
+              {delete_request: {key: {id: 'one'}}},
+              {delete_request: {key: {id: 'two'}}}
+          ]
+
+          request_options = {request_items: {table_name => delete_requests}}
+          expect(test_client.data[table_name]['one']).to eq({name: 'item1'})
+          expect(test_client.data[table_name]['two']).to eq({name: 'item2'})
+          test_client.batch_write_item(request_options)
+          expect(test_client.data[table_name]['one']).to be_nil
+          expect(test_client.data[table_name]['two']).to be_nil
+        end
       end
+    end
 
-      it 'should remove all items from the table' do
+    context 'with hash key and range key' do
+      let(:test_client) { Dynamini::TestClient.new(:hash_key, :range_key) }
 
-        delete_requests = [
-                            {delete_request: {key: {id: 'one'}}},
-                            {delete_request: {key: {id: 'two'}}}
-                          ]
+      context 'executing put requests' do
+        it 'should store all items in the table correctly' do
+          item1 = {'foo' => 'bar', 'hash_key' => 1, 'range_key' => 'a'}
+          item2 = {'foo' => 'bar', 'hash_key' => 2, 'range_key' => 'b'}
+          put_requests = [{put_request: {item: item1}},
+                          {put_request: {item: item2}}]
+
+          request_options = {request_items: {table_name => put_requests}}
+
+          test_client.batch_write_item(request_options)
+          expect(test_client.data[table_name][1]['a']).to eq({foo: 'bar', hash_key: 1, range_key: 'a'})
+          expect(test_client.data[table_name][2]['b']).to eq({foo: 'bar', hash_key: 2, range_key: 'b'})
+        end
+
+        it 'should add a new record to the hash key if it is a new range key' do
+          item1 = {'foo' => 'bar', 'hash_key' => 1, 'range_key' => 'a'}
+          item2 = {'foo' => 'bar', 'hash_key' => 1, 'range_key' => 'b'}
+
+          put_requests1 = [{put_request: {item: item1}}]
+          request_options1 = {request_items: {table_name => put_requests1}}
+
+          put_requests2 = [{put_request: {item: item2}}]
+          request_options2 = {request_items: {table_name => put_requests2}}
+
+          test_client.batch_write_item(request_options1)
+          test_client.batch_write_item(request_options2)
+          expect(test_client.data[table_name][1]['a']).to eq({foo: 'bar', hash_key: 1, range_key: 'a'})
+          expect(test_client.data[table_name][1]['b']).to eq({foo: 'bar', hash_key: 1, range_key: 'b'})
+        end
+      end
+
+      context 'executing delete requests' do
 
-        request_options = {request_items: {table_name => delete_requests}}
-        expect(test_client.data[table_name]['one']).to eq({name: 'item1'})
-        expect(test_client.data[table_name]['two']).to eq({name: 'item2'})
-        test_client.batch_write_item(request_options)
-        expect(test_client.data[table_name]['one']).to be_nil
-        expect(test_client.data[table_name]['two']).to be_nil
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Greg Ward
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel