dynamini 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 356f8de542ea075c952843efbed411bbd65f223d
-  data.tar.gz: 97f98ccc45f1e5dcf93ed8f66628cc647c1018fb
+  metadata.gz: 0b81e47262cde9752334d99b56bbc0b06d7ad3b2
+  data.tar.gz: 3026a65ee631076b6785012b4cbcebc4aa1c07cd
 SHA512:
-  metadata.gz: 7cc1c405737dc4e50018be9b2141aab9d1af70263a929c2d18c3d274b92266b8c10feec881f5a7121a307a1f22032121020b6fca5441a9a13966d7d43315c593
-  data.tar.gz: e8a6743e11f1fc7ff9a3cb8e17795a273b45ce0ac4cd30b9a2f0324746b68cbdbe53cd9f048cc415adf445637d8ed8470fb8bfac0db93ab000f06f3491c5ca0c
+  metadata.gz: 03425cecdc1791ee2bb432b418275cd28af320275c6d7ed1a9bc60d4330989ea3fcf894aad2cef706698cf10487c1ac0ff20fde7466ba6227dbdb93903cd2ed7
+  data.tar.gz: 1826bf61ccb602299e4a1d8a9b426384bef196a3d238b8b86f7f4301a501c89934846408d418f153b260e6486fb7e9dea5d5dd374238c23e3c5de9346d95406f

data/Gemfile.lock

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

data/dynamini.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dynamini'
-  s.version = '1.9.1'
+  s.version = '1.10.0'
   s.date = '2015-12-14'
   s.summary = 'DynamoDB interface'
   s.description = 'Lightweight DynamoDB interface gem designed as

data/lib/dynamini/batch_operations.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Dynamini
   module BatchOperations
 
@@ -13,15 +15,16 @@ module Dynamini
     end
 
     def batch_find(ids = [])
-      return [] if ids.length < 1
+      return OpenStruct.new(found: [], not_found: []) if ids.length < 1
       objects = []
-      fail StandardError, 'Batch is limited to 100 items' if ids.length > 100
-      key_structure = ids.map { |i| {hash_key => i.to_s} }
-      response = dynamo_batch_get(key_structure)
-      response.responses[table_name].each do |item|
-        objects << new(item.symbolize_keys, false)
+      key_structure = ids.map { |i| {hash_key => i} }
+      key_structure.each_slice(100) do |keys|
+        response = dynamo_batch_get(keys)
+        response.responses[table_name].each do |item|
+          objects << new(item.symbolize_keys, false)
+        end
       end
-      objects
+      OpenStruct.new(found: objects, not_found: ids - objects.map(&hash_key))
     end
 
     def dynamo_batch_save(model_array)

data/lib/dynamini/test_client.rb

@@ -61,6 +61,7 @@ module Dynamini
       OpenStruct.new(item: attributes_hash)
     end
 
+    #FIXME Add range key support
     def batch_get_item(args = {})
       responses = {}
 
@@ -68,7 +69,7 @@ module Dynamini
         responses[k] = []
         v[:keys].each do |key_hash|
           item = @data[k][key_hash.values.first]
-          responses[k] << item
+          responses[k] << item unless item.nil?
         end
       end
 

data/spec/dynamini/batch_operations_spec.rb

@@ -52,23 +52,43 @@ describe Dynamini::BatchOperations do
     end
     context 'when requesting 0 items' do
       it 'should return an empty array' do
-        expect(Dynamini::Base.batch_find).to eq []
+        expect(Dynamini::Base.batch_find.found).to eq []
+        expect(Dynamini::Base.batch_find.not_found).to eq []
       end
     end
-    context 'when requesting 2 items' do
-      it 'should return a 2-length array containing each item' do
+
+    context 'when requesting multiple items' do
+      let(:result) { Dynamini::Base.batch_find(%w(abcd1234 4321 foo)) }
+      before do
         Dynamini::Base.create(id: '4321')
-        objects = Dynamini::Base.batch_find(['abcd1234', '4321'])
-        expect(objects.length).to eq 2
-        expect(objects.first.id).to eq model.id
-        expect(objects.last.id).to eq '4321'
+      end
+
+      it 'should return the found items' do
+        expect(result.found.length).to eq 2
+        expect(result.found.first.id).to eq model.id
+        expect(result.found.last.id).to eq '4321'
+      end
+
+      it 'should return the hash keys of the items not found' do
+        expect(result.not_found).to eq(['foo'])
       end
     end
-    context 'when requesting too many items' do
-      it 'should raise an error' do
-        a = []
-        150.times { a << 'foo' }
-        expect { Dynamini::Base.batch_find(a) }.to raise_error StandardError
+
+    context 'when requesting over 100 items' do
+      let(:ids) { Array.new(50, 'foo') +  Array.new(51, '4321')}
+      before do
+        Dynamini::Base.create(id: '4321')
+      end
+
+      it 'should call dynamo once for each 100 items' do
+        expect(Dynamini::Base).to receive(:dynamo_batch_get).twice.and_call_original
+        Dynamini::Base.batch_find(ids)
+      end
+
+      it 'should return the combined responses of multiple dynamo calls' do
+        result = Dynamini::Base.batch_find(ids)
+        expect(result.found.length).to eq(51)
+        expect(result.not_found.length).to eq(50)
       end
     end
   end

data/spec/dynamini/test_client_spec.rb

@@ -184,4 +184,21 @@ describe Dynamini::TestClient do
       expect(test_client.data[table_name][2]).to eq(item2)
     end
   end
+
+  describe '#batch_get_item' do
+    let(:test_client) { Dynamini::TestClient.new(:id) }
+
+    before do
+      test_client.data[table_name] = {}
+      test_client.data[table_name]['foo'] = {id: 'foo', price: 1}
+    end
+
+    it 'should only return the items found' do
+      keys = [{id: 'foo'}, {id: 'bar'}]
+      request = {request_items: {table_name => {keys: keys}}}
+      result = test_client.batch_get_item(request)
+      expect(result.responses[table_name].length).to eq(1)
+      expect(result.responses[table_name].first[:id]).to eq('foo')
+    end
+  end
 end

metadata

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