dynamo_record 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b849c11bb6edf1b5b8253df1fa040d92c69775b
-  data.tar.gz: 42857a91944bda388c706c89cf250274b76a7f76
+  metadata.gz: 04dcd3aca07812fad600169cb5a2cdf091b929c3
+  data.tar.gz: 9038222e5ae7bd0f4194c0a39d79b9799c4fd682
 SHA512:
-  metadata.gz: 6d5886affd59ca355e02fb40b92eee7cc4ea74846eeb7e7c81c64217bc8dcb1beb283d6776a7b0adc27996ce62a452f6561b7a3af19887cd054dcd3e7166dbdc
-  data.tar.gz: 2a5f30c5918971220cd20b99d22ed5ceb324418b4429c11ab5c13ec903e1177372f862143d6177cc7146b16ce30dee6e056dc90617764dbb4579616a666b3336
+  metadata.gz: bcdd857a014344fe36eab01004663f7bed7ee496d8d7cbd4238d323a2c8fd0c3ec4a5548a5968bbb64caa9b8a0b88b0e192130ffe10d82159a47b41cd4a33b97
+  data.tar.gz: cd46c302fb57db27b29bfb5539893738b3107dfb9dcae46479f802e64b3c306298db9019d1b0a644e2a6d60e112969f0f1b2f40f71fb9a68769141f6fac312aa

data/lib/dynamo_record/collection.rb

@@ -27,5 +27,9 @@ module DynamoRecord
         yield self.class.new(page, @klass)
       end
     end
+
+    def last_evaluated_key
+      @pager.last_evaluated_key
+    end
   end
 end

data/lib/dynamo_record/query.rb

@@ -11,32 +11,20 @@ module DynamoRecord
         DynamoRecord::Collection.new(response, self)
       end
 
-      def where(condition = {})
-        attribute = condition.first.first.to_s
-        value = condition.first.second
-        key_conditions = {}
-        key_conditions[attribute] = { attribute_value_list: [value], 
-                                           comparison_operator: 'EQ' } 
-        
-        index_name = "#{attribute}-index"
-        options = self.default_options
-        options.merge!(key_conditions: key_conditions, index_name: index_name)
+      def where(opts={})
+        limit = opts.delete(:limit)
+        exclusive_start_key = opts.delete(:exclusive_start_key)
 
-        response = self.client.query(options)
-        DynamoRecord::Collection.new(response, self)
-      end
-
-      def find_by_hash_and_range(hash_key, range_key=nil)
         key_conditions = {}
-        key_conditions[self.hash_key] = { attribute_value_list: [hash_key], 
-                                           comparison_operator: 'EQ' }
-        if range_key
-          key_conditions[self.range_key] = { attribute_value_list: [range_key], 
-                                              comparison_operator: 'EQ' } 
+        opts.each do |key, value|
+          key_conditions[key] = { attribute_value_list: [value], 
+                                   comparison_operator: 'EQ' } 
         end
-        
+
         options = self.default_options
         options.merge!(key_conditions: key_conditions)
+        options.merge!(limit: limit) if limit
+        options.merge!(exclusive_start_key: exclusive_start_key) if exclusive_start_key
 
         response = self.client.query(options)
         DynamoRecord::Collection.new(response, self)

data/lib/dynamo_record/version.rb

@@ -1,3 +1,3 @@
 module DynamoRecord
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/spec/dynamo_record/query_spec.rb

@@ -43,23 +43,33 @@ RSpec.describe DynamoRecord::Query, :vcr do
 
   describe 'querying' do
 
-    describe '#find_by_hash_and_range' do
+    describe '#where' do
       it 'returns a record by hash key and range key' do
-        person = PersonRange.find_by_hash_and_range('1', '2015-01-28T14:37:01+08:00')
-        expect(person.count).to eq(1)
+        result = PersonRange.where(id: '1', created_at: '2015-01-28T14:37:01+08:00')
+        expect(result.count).to eq(1)
       end
 
       it 'returns all records by hash key' do
-        people = PersonRange.find_by_hash_and_range('1')
-        expect(people.count).to eq(2)
+        result = PersonRange.where(id: '1')
+        expect(result.count).to eq(2)
       end
-    end
 
-    describe '#where' do
-      it 'queries by condition' do
-        people = Person.where(name: 'Person 2')
-        expect(people.map(&:name)).to eq(['Person 2'])
+      it 'returns records by limit' do
+        result = PersonRange.where(id: '1', limit: 1)
+        expect(result.count).to eq(1)
+        expect(result.last_evaluated_key).to eq({'id' => '1', 'created_at' => '2015-01-28T14:37:01+08:00'})
       end
+
+      it 'returs records from a exclusive start key' do
+        result = PersonRange.where(id: '1', limit: 1, exclusive_start_key: { id: '1', created_at: '2015-01-28T14:37:01+08:00'})
+        expect(result.count).to eq(1)
+        expect(result.first.created_at).to eq('2015-01-29T14:36:59+08:00')
+      end
+
+      # it 'queries by index' do
+      #   people = Person.where(name: 'Person 2')
+      #   expect(people.map(&:name)).to eq(['Person 2'])
+      # end
     end
   end
 end

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_a_record_by_hash_key_and_range_key.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://dynamodb.us-east-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: '{"TableName":"person_ranges","KeyConditions":{"id":{"AttributeValueList":[{"S":"1"}],"ComparisonOperator":"EQ"},"created_at":{"AttributeValueList":[{"S":"2015-01-28T14:37:01+08:00"}],"ComparisonOperator":"EQ"}}}'
+    headers:
+      Content-Type:
+      - application/x-amz-json-1.0
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.0.21 ruby/2.1.2 x86_64-darwin14.0
+      X-Amz-Target:
+      - DynamoDB_20120810.Query
+      X-Amz-Date:
+      - 20150130T100706Z
+      X-Amz-Content-Sha256:
+      - cb65882116db16faf18fa6cfb02eb793e9952156441a23509c56b3dcc37abd33
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=AKIAJGUSFVPIJ4LHTPCQ/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=f5607d39d690a827090479181c8a2e5a750248cf153058a03b4a9ee1bac83d26
+      Content-Length:
+      - '211'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - G5A2V2VA4B1KG5RCJ2L64I9I67VV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '4076139363'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '102'
+      Date:
+      - Fri, 30 Jan 2015 10:07:05 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Count":1,"Items":[{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}}],"ScannedCount":1}'
+    http_version: 
+  recorded_at: Fri, 30 Jan 2015 10:07:07 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_all_records_by_hash_key.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://dynamodb.us-east-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: '{"TableName":"person_ranges","KeyConditions":{"id":{"AttributeValueList":[{"S":"1"}],"ComparisonOperator":"EQ"}}}'
+    headers:
+      Content-Type:
+      - application/x-amz-json-1.0
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.0.21 ruby/2.1.2 x86_64-darwin14.0
+      X-Amz-Target:
+      - DynamoDB_20120810.Query
+      X-Amz-Date:
+      - 20150130T102746Z
+      X-Amz-Content-Sha256:
+      - f04e6fb149222c33132f14b3dd507d21d3deae8d7d2458d4bfd9466dfc628bbb
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=AKIAJGUSFVPIJ4LHTPCQ/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=9dbda708e3aac989811b21e1c0a6b8069c3849f4094f06b9c35e5fff12446e17
+      Content-Length:
+      - '113'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - J514T624ES4EIPC5UT4CD53G83VV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '2876920674'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '166'
+      Date:
+      - Fri, 30 Jan 2015 10:27:46 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Count":2,"Items":[{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}},{"created_at":{"S":"2015-01-29T14:36:59+08:00"},"id":{"S":"1"}}],"ScannedCount":2}'
+    http_version: 
+  recorded_at: Fri, 30 Jan 2015 10:27:48 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_by_limit.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://dynamodb.us-east-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: '{"TableName":"person_ranges","KeyConditions":{"id":{"AttributeValueList":[{"S":"1"}],"ComparisonOperator":"EQ"}},"Limit":1}'
+    headers:
+      Content-Type:
+      - application/x-amz-json-1.0
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.0.21 ruby/2.1.2 x86_64-darwin14.0
+      X-Amz-Target:
+      - DynamoDB_20120810.Query
+      X-Amz-Date:
+      - 20150130T110726Z
+      X-Amz-Content-Sha256:
+      - b4af37d38eefd1f8a6ea35316c1143ed40ac770879fa9925828593c4f2455dca
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=AKIAJGUSFVPIJ4LHTPCQ/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=1f6a2dc7ca9e74c858ccff35aaf93c146d616c4467f2b923ce748259b591fc27
+      Content-Length:
+      - '123'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - K44IKN35TKK5E60D741EOFP6A3VV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '2443797734'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '185'
+      Date:
+      - Fri, 30 Jan 2015 11:07:27 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Count":1,"Items":[{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}}],"LastEvaluatedKey":{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}},"ScannedCount":1}'
+    http_version: 
+  recorded_at: Fri, 30 Jan 2015 11:07:28 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_records_by_limit.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://dynamodb.us-east-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: '{"TableName":"person_ranges","KeyConditions":{"id":{"AttributeValueList":[{"S":"1"}],"ComparisonOperator":"EQ"}},"Limit":1}'
+    headers:
+      Content-Type:
+      - application/x-amz-json-1.0
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.0.21 ruby/2.1.2 x86_64-darwin14.0
+      X-Amz-Target:
+      - DynamoDB_20120810.Query
+      X-Amz-Date:
+      - 20150130T111049Z
+      X-Amz-Content-Sha256:
+      - b4af37d38eefd1f8a6ea35316c1143ed40ac770879fa9925828593c4f2455dca
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=AKIAJGUSFVPIJ4LHTPCQ/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=862d4ed0954b52d2c174e0791703cbbf51ac87571bc7adcbc9d409145579a618
+      Content-Length:
+      - '123'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - EHME68LLV5620M22V46CER32DRVV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '2443797734'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '185'
+      Date:
+      - Fri, 30 Jan 2015 11:10:49 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Count":1,"Items":[{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}}],"LastEvaluatedKey":{"created_at":{"S":"2015-01-28T14:37:01+08:00"},"id":{"S":"1"}},"ScannedCount":1}'
+    http_version: 
+  recorded_at: Fri, 30 Jan 2015 11:10:50 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returs_records_from_a_exclusive_start_key.yml

@@ -0,0 +1,50 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://dynamodb.us-east-1.amazonaws.com/
+    body:
+      encoding: UTF-8
+      string: '{"TableName":"person_ranges","KeyConditions":{"id":{"AttributeValueList":[{"S":"1"}],"ComparisonOperator":"EQ"}},"Limit":1,"ExclusiveStartKey":{"id":{"S":"1"},"created_at":{"S":"2015-01-28T14:37:01+08:00"}}}'
+    headers:
+      Content-Type:
+      - application/x-amz-json-1.0
+      Accept-Encoding:
+      - ''
+      User-Agent:
+      - aws-sdk-ruby2/2.0.21 ruby/2.1.2 x86_64-darwin14.0
+      X-Amz-Target:
+      - DynamoDB_20120810.Query
+      X-Amz-Date:
+      - 20150130T111050Z
+      X-Amz-Content-Sha256:
+      - 3deaf477f931d53e7bee2b2c523632b105e5987b027b9c2d989c8738d3d20711
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=AKIAJGUSFVPIJ4LHTPCQ/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=c32fc1ca3fd87c961d7456c90575939967e477955d996344ab1ac37c4e489492
+      Content-Length:
+      - '207'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - V1P73GS8J7U1UM869OKHNVOF9JVV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '542610492'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '185'
+      Date:
+      - Fri, 30 Jan 2015 11:10:51 GMT
+    body:
+      encoding: UTF-8
+      string: '{"Count":1,"Items":[{"created_at":{"S":"2015-01-29T14:36:59+08:00"},"id":{"S":"1"}}],"LastEvaluatedKey":{"created_at":{"S":"2015-01-29T14:36:59+08:00"},"id":{"S":"1"}},"ScannedCount":1}'
+    http_version: 
+  recorded_at: Fri, 30 Jan 2015 11:10:52 GMT
+recorded_with: VCR 2.9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamo_record
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Nguyen Vu Nguyen
@@ -163,7 +163,11 @@ files:
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_query/queries_by_condition.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/returns_a_record_by_hash_key_and_range_key.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/returns_all_records_by_hash_key.yml
-- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/queries_by_condition.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_a_record_by_hash_key_and_range_key.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_all_records_by_hash_key.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_by_limit.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_records_by_limit.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returs_records_from_a_exclusive_start_key.yml
 - spec/spec_helper.rb
 homepage: https://github.com/yetanothernguyen/dynamo_record
 licenses:
@@ -223,5 +227,9 @@ test_files:
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_query/queries_by_condition.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/returns_a_record_by_hash_key_and_range_key.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/returns_all_records_by_hash_key.yml
-- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/queries_by_condition.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_a_record_by_hash_key_and_range_key.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_all_records_by_hash_key.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_by_limit.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returns_records_by_limit.yml
+- spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/returs_records_from_a_exclusive_start_key.yml
 - spec/spec_helper.rb

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_where/queries_by_condition.yml

@@ -1,53 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://dynamodb.us-east-1.amazonaws.com/
-    body:
-      encoding: UTF-8
-      string: '{"TableName":"people","KeyConditions":{"name":{"AttributeValueList":[{"S":"Person
-        2"}],"ComparisonOperator":"EQ"}},"IndexName":"name-index"}'
-    headers:
-      Content-Type:
-      - application/x-amz-json-1.0
-      Accept-Encoding:
-      - ''
-      User-Agent:
-      - aws-sdk-ruby2/2.0.17 ruby/2.1.2 x86_64-darwin14.0
-      X-Amz-Target:
-      - DynamoDB_20120810.Query
-      X-Amz-Date:
-      - 20141231T085539Z
-      Host:
-      - dynamodb.us-east-1.amazonaws.com
-      X-Amz-Content-Sha256:
-      - ff6d076e5a2413b9a7418bff017d084acec8dd4d4c60130cdec7a10d31bbb509
-      Authorization:
-      - AWS4-HMAC-SHA256 Credential=key/20141231/us-east-1/dynamodb/aws4_request,
-        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
-        Signature=d5f28292bfc3a2fd70c69cbb4db87b15087f92b1b4b4f656036db8005c4a3854
-      Content-Length:
-      - '140'
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      X-Amzn-Requestid:
-      - KSCIU2Q8KNE6JDTJO67BT0FAVFVV4KQNSO5AEMVJF66Q9ASUAAJG
-      X-Amz-Crc32:
-      - '2069429624'
-      Content-Type:
-      - application/x-amz-json-1.0
-      Content-Length:
-      - '114'
-      Date:
-      - Wed, 31 Dec 2014 08:55:40 GMT
-    body:
-      encoding: UTF-8
-      string: '{"Count":1,"Items":[{"name":{"S":"Person 2"},"id":{"S":"611b5bc7-849f-4e0c-b969-5b53b6f2d0e2"}}],"ScannedCount":1}'
-    http_version: 
-  recorded_at: Wed, 31 Dec 2014 08:55:41 GMT
-recorded_with: VCR 2.9.3