dynamo_record 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd63307555e1ae2fe549ff6881afac14b7967bc
-  data.tar.gz: bf8bdd27acfe11301789f1de5410eb7157aded69
+  metadata.gz: 9b849c11bb6edf1b5b8253df1fa040d92c69775b
+  data.tar.gz: 42857a91944bda388c706c89cf250274b76a7f76
 SHA512:
-  metadata.gz: c0ea8f49c85a9a7ab830491a6c3d010688cb0f4607bf6efb25bd44188fbb22922979d945f673f229bd4c4b1d45aa07d970fd29e9534340d149a2adc6f4c8c642
-  data.tar.gz: 2223d8a200ac4d0f5518dcb0a6fffc6dabd816f72aff59ad016874d0c10e0d09b4e7e94365fff57168e2c117fb24dde90199495bcfc56a178ffc9b20f59e0d00
+  metadata.gz: 6d5886affd59ca355e02fb40b92eee7cc4ea74846eeb7e7c81c64217bc8dcb1beb283d6776a7b0adc27996ce62a452f6561b7a3af19887cd054dcd3e7166dbdc
+  data.tar.gz: 2a5f30c5918971220cd20b99d22ed5ceb324418b4429c11ab5c13ec903e1177372f862143d6177cc7146b16ce30dee6e056dc90617764dbb4579616a666b3336

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.env

data/lib/dynamo_record/fields.rb

@@ -70,9 +70,9 @@ module DynamoRecord
         end
       end
 
-      # def hash_key
-      #   @hash_key ||= self.attributes.select { |k,v| v[:options][:hash_key] }.keys.first rescue nil
-      # end
+      def hash_key
+        :id # default hash key
+      end
 
       def range_key
         @range_key ||= self.attributes.select { |k,v| v[:options][:range_key] }.keys.first rescue nil

data/lib/dynamo_record/query.rb

@@ -17,6 +17,7 @@ module DynamoRecord
         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)
@@ -24,6 +25,22 @@ module DynamoRecord
         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' } 
+        end
+        
+        options = self.default_options
+        options.merge!(key_conditions: key_conditions)
+
+        response = self.client.query(options)
+        DynamoRecord::Collection.new(response, self)
+      end
     end
   end
 end

data/lib/dynamo_record/version.rb

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

data/spec/dynamo_record/query_spec.rb

@@ -42,6 +42,19 @@ RSpec.describe DynamoRecord::Query, :vcr do
   end
 
   describe 'querying' do
+
+    describe '#find_by_hash_and_range' 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)
+      end
+
+      it 'returns all records by hash key' do
+        people = PersonRange.find_by_hash_and_range('1')
+        expect(people.count).to eq(2)
+      end
+    end
+
     describe '#where' do
       it 'queries by condition' do
         people = Person.where(name: 'Person 2')

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/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:
+      - 20150130T064846Z
+      X-Amz-Content-Sha256:
+      - cb65882116db16faf18fa6cfb02eb793e9952156441a23509c56b3dcc37abd33
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=key/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=499914a63276dd30775dfba66cfde46cc359679fdc6434d9bcdfe7193e487720
+      Content-Length:
+      - '211'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - GN2UG13P0SNIKC2RF5OKIH5JTJVV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '4076139363'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '102'
+      Date:
+      - Fri, 30 Jan 2015 06:48:48 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 06:48:49 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/DynamoRecord_Query/querying/_find_by_hash_and_range/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:
+      - 20150130T064849Z
+      X-Amz-Content-Sha256:
+      - f04e6fb149222c33132f14b3dd507d21d3deae8d7d2458d4bfd9466dfc628bbb
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=key/20150130/us-east-1/dynamodb/aws4_request,
+        SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-amz-target,
+        Signature=24eb78d623265f915ae3567662a823c5ad3401f27a63467a96a7a6d4eb3dc042
+      Content-Length:
+      - '113'
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Amzn-Requestid:
+      - 3PN8EO8AOFQ287VT9AB45UUPV7VV4KQNSO5AEMVJF66Q9ASUAAJG
+      X-Amz-Crc32:
+      - '2876920674'
+      Content-Type:
+      - application/x-amz-json-1.0
+      Content-Length:
+      - '166'
+      Date:
+      - Fri, 30 Jan 2015 06:48:49 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 06:48:50 GMT
+recorded_with: VCR 2.9.3

data/spec/spec_helper.rb

@@ -13,6 +13,6 @@ VCR.configure do |c|
 end
 
 DynamoRecord.configure do |config|
-  config.access_key_id = 'key'
-  config.secret_access_key = 'secret'
+  config.access_key_id = ENV['DYNAMODB_KEY'] || 'key'
+  config.secret_access_key = ENV['DYNAMODB_SECRET'] || 'secret'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamo_record
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Nguyen Vu Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,6 +161,8 @@ files:
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_all/pagination/navigates_to_next_page.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_all/pagination/tells_if_there_is_a_next_page.yml
 - 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/spec_helper.rb
 homepage: https://github.com/yetanothernguyen/dynamo_record
@@ -219,5 +221,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_all/pagination/navigates_to_next_page.yml
 - spec/fixtures/vcr_cassettes/DynamoRecord_Query/_all/pagination/tells_if_there_is_a_next_page.yml
 - 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/spec_helper.rb