dynamodb_record 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c0fa26f80217dbc4d6a3f2e3fa0197a485fdcaf4bb845232c276d67c2c678e
-  data.tar.gz: 61d5b4ca06cfb8906902aee1ae6bafc0c4613f03edfb402447514f9877317143
+  metadata.gz: 24d59dadc67c9fe2d0d70b78c5cce8d1af52505f2b49f539ee1cb407be8bff13
+  data.tar.gz: c0de287ed037955f41ccfc29d497ca5299d1efff797a180edb819346b5c9a926
 SHA512:
-  metadata.gz: ea0d8a245f9f6a41c47d4cf0ef9f5ba056c31712588146b9b14f0c0886f36b487fa691c79383e93bbe34e3c87ceebdd5e8b80bb3b4f1a4ed48812944a9970985
-  data.tar.gz: 3c734251bd6e00ebc3ab048e702b9ed133296e0acdc09690b6da12b8c9ec7edb3f13d09a28c837d2393dc637359e228c36e334365e1a497f11890145d8db92e9
+  metadata.gz: 775f99c88ba0aeab51b216cdb0950afc55ac61aec51703a6d406902b7572122299ad878b681332d48c0d554237d7871d520acd0b6e92b246a6e0c5c63a3f6899
+  data.tar.gz: 14257dc2a185a5fb18085d69ecf4b08e0166294c50c9c1fb3991828d252760a802a6d8e774608cec37f2af7a32b336c921d5c88b83e1cd69c01625537339675a

data/lib/dynamodb_record/associations.rb

@@ -17,17 +17,17 @@ module DynamodbRecord
 
       # rubocop:disable Naming/PredicateName
       def has_many(associations)
-        base_model = to_s.downcase
+        base_model = to_s.downcase.split('::').last
         model = associations.to_s.chop
-        # field = self.class.to_s.downcase
-        table = Config.namespace ? "#{Config.namespace}-#{associations}" : associations
-
-        options = {table_name: table}
-        options.merge!(key_condition_expression: "##{base_model}_id = :#{base_model}_id")
-        options.merge!(expression_attribute_names: {"##{base_model}_id": "#{base_model}_id"})
-        options.merge!(index_name: "#{base_model}_id_index")
 
         define_method(associations) do
+          table = Config.namespace ? "#{Config.namespace}-#{associations}" : associations
+
+          options = {table_name: table}
+          options.merge!(key_condition_expression: "##{base_model}_id = :#{base_model}_id")
+          options.merge!(expression_attribute_names: {"##{base_model}_id": "#{base_model}_id"})
+          options.merge!(index_name: "#{base_model}_id_index")
+
           options.merge!(expression_attribute_values: {":#{base_model}_id" => id})
           klass = Object.const_get(model.capitalize)
           query = QueryPager.new(options, klass)
@@ -36,7 +36,7 @@ module DynamodbRecord
       end
 
       def has_many_through(associations, table)
-        base_model = to_s.downcase
+        base_model = to_s.downcase.split('::').last
         relation_model = associations.to_s.chop
         list = []
         list << base_model
@@ -44,16 +44,16 @@ module DynamodbRecord
         sorted_list = list.sort
         options = {table_name: table.to_s}
 
-        field = if sorted_list.first == base_model
-                  sorted_list.first
-                else
-                  sorted_list.last
-                end
-        options.merge!(index_name: "#{field}_id_index")
-        options.merge!(key_condition_expression: "##{field}_id = :#{field}_id")
-        options.merge!(expression_attribute_names: {"##{field}_id": "#{field}_id"})
-
         define_method(associations) do
+          field = if sorted_list.first == base_model
+                    sorted_list.first
+                  else
+                    sorted_list.last
+                  end
+          options.merge!(index_name: "#{field}_id_index")
+          options.merge!(key_condition_expression: "##{field}_id = :#{field}_id")
+          options.merge!(expression_attribute_names: {"##{field}_id": "#{field}_id"})
+
           options.merge!(expression_attribute_values: {":#{field}_id" => id})
           # p options
 
@@ -69,28 +69,28 @@ module DynamodbRecord
       end
 
       def has_and_belongs_to_many(associations)
-        base_model = to_s.downcase
+        base_model = to_s.downcase.split('::').last
         relation_model = associations.to_s.chop
         list = []
         list << base_model
         list << relation_model
         sorted_list = list.sort
-        options = {}
-        pluralize_name = sorted_list.map(&:pluralize).join('-')
-
-        table = Config.namespace ? "#{Config.namespace}-#{pluralize_name}" : pluralize_name
-        options[:table_name] = table
-        if sorted_list.first == base_model
-          field = sorted_list.first
-        else
-          field = sorted_list.last
-          options.merge!(index_name: "#{table}-index")
-        end
-
-        options.merge!(key_condition_expression: "##{field}_id = :#{field}_id")
-        options.merge!(expression_attribute_names: {"##{field}_id": "#{field}_id"})
 
         define_method(associations) do
+          options = {}
+          pluralize_name = sorted_list.map(&:pluralize).join('-')
+          table = Config.namespace ? "#{Config.namespace}-#{pluralize_name}" : pluralize_name
+          options[:table_name] = table
+          if sorted_list.first == base_model
+            field = sorted_list.first
+          else
+            field = sorted_list.last
+            options.merge!(index_name: "#{table}-index")
+          end
+
+          options.merge!(key_condition_expression: "##{field}_id = :#{field}_id")
+          options.merge!(expression_attribute_names: {"##{field}_id": "#{field}_id"})
+
           options.merge!(expression_attribute_values: {":#{field}_id" => id})
 
           klass = Object.const_get(relation_model.capitalize)

data/lib/dynamodb_record/finders.rb

@@ -16,7 +16,6 @@ module DynamodbRecord
         key = {}
         key[hash_key] = id
         key[self.range_key] = range_key if self.range_key
-
         response = client.get_item(
           table_name:,
           key:

data/lib/dynamodb_record/query.rb

@@ -40,6 +40,7 @@ module DynamodbRecord
         options.merge!(filter_expression:) if filter_expression.present?
 
         options.merge!(exclusive_start_key:) if exclusive_start_key
+        # p options
 
         scan_pager = ScanPager.new(options, self)
         Collection.new(scan_pager, self)

data/lib/dynamodb_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamodbRecord
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/lib/dynamodb_record.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bundler/setup'
 require 'securerandom'
 require 'active_support'
 require 'active_support/concern'

data/spec/dynamodb_record/config_spec.rb

@@ -0,0 +1,28 @@
+require_relative '../spec_helper'
+
+RSpec.describe DynamodbRecord::Config, :vcr do
+
+  after do
+    DynamodbRecord::Config.set_defaults
+  end
+
+  it 'has default options' do
+    DynamodbRecord::Config.set_defaults
+    expect(DynamodbRecord::Config.region).to eq('us-east-1')
+    expect(DynamodbRecord::Config.namespace).to eq(nil)
+  end
+
+  it 'sets config options' do
+    DynamodbRecord.configure do |config|
+      config.access_key_id = 'key'
+      config.secret_access_key = 'secret'
+      config.region = 'region'
+      config.namespace = 'fleteo-v2'
+    end
+
+    expect(DynamodbRecord::Config.access_key_id).to eq('key')
+    expect(DynamodbRecord::Config.secret_access_key).to eq('secret')
+    expect(DynamodbRecord::Config.region).to eq('region')
+    expect(DynamodbRecord::Config.namespace).to eq('fleteo-v2')
+  end
+end

data/spec/dynamodb_record/document_spec.rb

@@ -12,10 +12,10 @@ RSpec.describe DynamodbRecord::Document do
     expect(person.attributes).to be_empty
   end
 
-  # it 'initializes from database', :vcr do
-  #   user = User.find('hguzman10@gmail.com')
-  #   expect(user.new_record).to be_falsy
-  # end
+  it 'initializes from database', :vcr do
+    user = User.find('hguzman20@gmail.com')
+    expect(user.new_record).to be_falsy
+  end
 
   it 'raises error on unknown field' do
     expect { User.new({unknown_field: 'unknown'}) }.to raise_error(NoMethodError)

data/spec/dynamodb_record/finders_spec.rb

@@ -5,16 +5,16 @@ require 'spec_helper'
 RSpec.describe DynamodbRecord::Fields, :vcr do
   describe '#find' do
     it 'finds record' do
-      # user = User.find('hguzman10@gmail.com')
-      # expect(user.id).to eq('hguzman10@gmail.com')
-      # expect(user.balance).to eq(0)
+      user = User.find('hguzman10@gmail.com')
+      expect(user.id).to eq('hguzman10@gmail.com')
+      expect(user.balance).to eq(0)
     end
 
     context 'when record doesn\'t exists' do
-      # it 'returns empty object' do
-      #   user = User.find('not here')
-      #   expect(user).to be_nil
-      # end
+      it 'returns empty object' do
+        user = User.find('not here')
+        expect(user).to be_nil
+      end
     end
   end
 end

data/spec/dynamodb_record/persistence_spec.rb

@@ -4,10 +4,10 @@ require 'spec_helper'
 
 RSpec.describe DynamodbRecord::Persistence, :vcr do
   it 'saves record' do
-    user = User.new(id: 'hguzman10@gmail.com')
+    user = User.new(id: 'hguzman60@gmail.com')
     user.save
     expect(user.new_record).to be_falsy
-    expect(user.id).to eq('hguzman10@gmail.com')
+    expect(user.id).to eq('hguzman60@gmail.com')
   end
 
   it 'does not overwrite existing record' do
@@ -29,20 +29,20 @@ RSpec.describe DynamodbRecord::Persistence, :vcr do
   describe '#destroy' do
     context 'when no range key' do
       it 'destroys record' do
-        user = User.find('hguzman10@gmail.com')
+        user = User.find('hguzman50@gmail.com')
         user.destroy
-        user = User.find('hguzman10@gmail.com')
+        user = User.find('hguzman50@gmail.com')
         expect(user).to be_nil
       end
     end
 
-    context 'when there is range key' do
-      it 'destroys record' do
-        authorization = Authorization.find!('hguzman10@gmail.com', '1')
-        authorization.destroy
-        authorization = Authorization.find('hguzman10@gmail.com', '1')
-        expect(authorization).to be_nil
-      end
-    end
+    # context 'when there is range key' do
+    #   it 'destroys record' do
+    #     authorization = Authorization.find!('hguzman10@gmail.com', '1')
+    #     authorization.destroy
+    #     authorization = Authorization.find('hguzman10@gmail.com', '1')
+    #     expect(authorization).to be_nil
+    #   end
+    # end
   end
 end

data/spec/dynamodb_record/query_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe DynamodbRecord::Query, :vcr do
   describe '#all' do
     it 'find all records' do
       user = User.all
-      expect(user.count).to eq(1)
-      expect(user.map(&:id)).to eq(['hguzman20@gmail.com'])
+      expect(user.count).to eq(2)
+      expect(user.map(&:id)).to eq(['hguzman20@gmail.com', 'hguzman30@gmail.com'])
     end
   end
   describe 'querying' do

data/spec/fixtures/vcr_cassettes/DynamodbRecord_Associations/_belongs_to/get_object.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: http://localhost:8000/
     body:
       encoding: UTF-8
-      string: '{"TableName":"insurances","Key":{"id":{"S":"12345"}}}'
+      string: '{"TableName":"fleteo-v2-insurances","Key":{"id":{"S":"12345"}}}'
     headers:
       Accept-Encoding:
       - ''
@@ -19,15 +19,15 @@ http_interactions:
       Host:
       - localhost:8000
       X-Amz-Date:
-      - 20240512T015903Z
+      - 20240514T151341Z
       X-Amz-Content-Sha256:
-      - af4fbab2106a31baca5b683427566e6620dff714a4febf67de21d62fe9aff004
+      - efb57ec65a1d5400e11f2c1d7ef1abae0923c0d84b3e4a442db0abcb6408f474
       Authorization:
-      - AWS4-HMAC-SHA256 Credential=key/20240512/us-east-1/dynamodb/aws4_request,
+      - AWS4-HMAC-SHA256 Credential=key/20240514/us-east-1/dynamodb/aws4_request,
         SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date;x-amz-target,
-        Signature=dc0c15194ac1d51a4ad8984e48a0cc3114c900a6b00e2f4dbe13d1a32a53e894
+        Signature=ee626915d5626ac0c4f324b1eb64101d695f890fa0ea6af9b35ee366e0ebb764
       Content-Length:
-      - '53'
+      - '63'
       Accept:
       - "*/*"
   response:
@@ -36,9 +36,9 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 12 May 2024 01:59:03 GMT
+      - Tue, 14 May 2024 15:13:41 GMT
       X-Amzn-Requestid:
-      - 20483dcf-8a64-4be9-afd8-a5c35c328725
+      - 2e572970-2362-4c8e-ab2a-9d498be1cedc
       Content-Type:
       - application/x-amz-json-1.0
       X-Amz-Crc32:
@@ -50,13 +50,13 @@ http_interactions:
     body:
       encoding: UTF-8
       string: '{"Item":{"name":{"S":"Colcerautos"},"car_id":{"S":"UVX455"},"id":{"S":"12345"}}}'
-  recorded_at: Sun, 12 May 2024 01:59:03 GMT
+  recorded_at: Tue, 14 May 2024 15:13:41 GMT
 - request:
     method: post
     uri: http://localhost:8000/
     body:
       encoding: UTF-8
-      string: '{"TableName":"cars","Key":{"id":{"S":"UVX455"}}}'
+      string: '{"TableName":"fleteo-v2-cars","Key":{"id":{"S":"UVX455"}}}'
     headers:
       Accept-Encoding:
       - ''
@@ -70,15 +70,15 @@ http_interactions:
       Host:
       - localhost:8000
       X-Amz-Date:
-      - 20240512T015903Z
+      - 20240514T151341Z
       X-Amz-Content-Sha256:
-      - 53644a2bbab903704867eb87df0fdfe6dd8cb8ac9e1dae5715033d0f636fd592
+      - 3f40080fdb7ac1732232c14b86645a9ffbd3f94cf8ecda6b3c584d105288bb8d
       Authorization:
-      - AWS4-HMAC-SHA256 Credential=key/20240512/us-east-1/dynamodb/aws4_request,
+      - AWS4-HMAC-SHA256 Credential=key/20240514/us-east-1/dynamodb/aws4_request,
         SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date;x-amz-target,
-        Signature=436e2db7a75c43c788be0473b6806936b97b7398f33009895010fa5a3eaee5c4
+        Signature=6efa4f968328b726cd30c758f09068bad22f44524d301b0bbc9d198a873aac06
       Content-Length:
-      - '48'
+      - '58'
       Accept:
       - "*/*"
   response:
@@ -87,9 +87,9 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sun, 12 May 2024 01:59:03 GMT
+      - Tue, 14 May 2024 15:13:41 GMT
       X-Amzn-Requestid:
-      - b464ed64-837b-4632-9b14-93a788d62b8d
+      - 25132fc8-9bae-4ed1-86e4-09bb515d7d51
       Content-Type:
       - application/x-amz-json-1.0
       X-Amz-Crc32:
@@ -101,5 +101,5 @@ http_interactions:
     body:
       encoding: UTF-8
       string: '{"Item":{"marca":{"S":"Chvrolet"},"created_at":{"S":"2024-05-07T14:09:25-05:00"},"id":{"S":"UVX455"},"updated_at":{"S":"2024-05-07T14:09:25-05:00"}}}'
-  recorded_at: Sun, 12 May 2024 01:59:03 GMT
+  recorded_at: Tue, 14 May 2024 15:13:41 GMT
 recorded_with: VCR 6.2.0