aws-record 2.10.0 → 2.11.0

data/lib/aws-record/record/attributes.rb

@@ -1,28 +1,14 @@
-# Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
     module Attributes
-
       def self.included(sub_class)
         sub_class.extend(ClassMethods)
         model_attributes = ModelAttributes.new(self)
-        sub_class.instance_variable_set("@attributes", model_attributes)
-        sub_class.instance_variable_set("@keys", KeyAttributes.new(model_attributes))
-        if Aws::Record.extends_record?(sub_class)
-          inherit_attributes(sub_class)
-        end
+        sub_class.instance_variable_set('@attributes', model_attributes)
+        sub_class.instance_variable_set('@keys', KeyAttributes.new(model_attributes))
+        inherit_attributes(sub_class) if Aws::Record.extends_record?(sub_class)
       end
 
       # Base initialization method for a new item. Optionally, allows you to
@@ -32,6 +18,7 @@ module Aws
       # === Inheritance Support
       # Child models will inherit the attributes and keys defined in the parent
       # model. Child models can override attribute keys if defined in their own model.
+      #
       # See examples below to see the feature in action.
       # @example Usage Example
       #   class MyModel
@@ -90,29 +77,24 @@ module Aws
         @data.hash_copy
       end
 
-      private
       def self.inherit_attributes(klass)
-        superclass_attributes = klass.superclass.instance_variable_get("@attributes")
+        superclass_attributes = klass.superclass.instance_variable_get('@attributes')
 
         superclass_attributes.attributes.each do |name, attribute|
-          subclass_attributes = klass.instance_variable_get("@attributes")
+          subclass_attributes = klass.instance_variable_get('@attributes')
           subclass_attributes.register_superclass_attribute(name, attribute)
         end
 
-        superclass_keys = klass.superclass.instance_variable_get("@keys")
-        subclass_keys = klass.instance_variable_get("@keys")
-
-        if superclass_keys.hash_key
-          subclass_keys.hash_key = superclass_keys.hash_key
-        end
+        superclass_keys = klass.superclass.instance_variable_get('@keys')
+        subclass_keys = klass.instance_variable_get('@keys')
 
-        if superclass_keys.range_key
-          subclass_keys.range_key = superclass_keys.range_key
-        end
+        subclass_keys.hash_key = superclass_keys.hash_key if superclass_keys.hash_key
+        subclass_keys.range_key = superclass_keys.range_key if superclass_keys.range_key
       end
 
-      module ClassMethods
+      private_class_method :inherit_attributes
 
+      module ClassMethods
         # Define an attribute for your model, providing your own attribute type.
         #
         # @param [Symbol] name Name of this attribute.  It should be a name that
@@ -137,7 +119,8 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         # @option opts [Boolean] :hash_key Set to true if this attribute is
         #   the hash key for the table.
         # @option opts [Boolean] :range_key Set to true if this attribute is
@@ -163,9 +146,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def string_attr(name, opts = {})
-          opts[:dynamodb_type] = "S"
+          opts[:dynamodb_type] = 'S'
           attr(name, Marshalers::StringMarshaler.new(opts), opts)
         end
 
@@ -184,9 +168,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def boolean_attr(name, opts = {})
-          opts[:dynamodb_type] = "BOOL"
+          opts[:dynamodb_type] = 'BOOL'
           attr(name, Marshalers::BooleanMarshaler.new(opts), opts)
         end
 
@@ -205,9 +190,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def integer_attr(name, opts = {})
-          opts[:dynamodb_type] = "N"
+          opts[:dynamodb_type] = 'N'
           attr(name, Marshalers::IntegerMarshaler.new(opts), opts)
         end
 
@@ -226,9 +212,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def float_attr(name, opts = {})
-          opts[:dynamodb_type] = "N"
+          opts[:dynamodb_type] = 'N'
           attr(name, Marshalers::FloatMarshaler.new(opts), opts)
         end
 
@@ -247,9 +234,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option options [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def date_attr(name, opts = {})
-          opts[:dynamodb_type] = "S"
+          opts[:dynamodb_type] = 'S'
           attr(name, Marshalers::DateMarshaler.new(opts), opts)
         end
 
@@ -268,9 +256,10 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def datetime_attr(name, opts = {})
-          opts[:dynamodb_type] = "S"
+          opts[:dynamodb_type] = 'S'
           attr(name, Marshalers::DateTimeMarshaler.new(opts), opts)
         end
 
@@ -289,14 +278,15 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def time_attr(name, opts = {})
-          opts[:dynamodb_type] = "S"
+          opts[:dynamodb_type] = 'S'
           attr(name, Marshalers::TimeMarshaler.new(opts), opts)
         end
 
         # Define a time-type attribute for your model which persists as
-        #   epoch-seconds.
+        # epoch-seconds.
         #
         # @param [Symbol] name Name of this attribute.  It should be a name
         #   that is safe to use as a method.
@@ -311,16 +301,17 @@ module Aws
         #   nil values will be ignored and not persisted. By default, is false.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def epoch_time_attr(name, opts = {})
-          opts[:dynamodb_type] = "N"
+          opts[:dynamodb_type] = 'N'
           attr(name, Marshalers::EpochTimeMarshaler.new(opts), opts)
         end
 
         # Define a list-type attribute for your model.
         #
         # Lists do not have to be homogeneous, but they do have to be types that
-        # the AWS SDK for Ruby V2's DynamoDB client knows how to marshal and
+        # the AWS SDK for Ruby V3's DynamoDB client knows how to marshal and
         # unmarshal. Those types are:
         #
         # * Hash
@@ -346,16 +337,17 @@ module Aws
         #   the range key for the table.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def list_attr(name, opts = {})
-          opts[:dynamodb_type] = "L"
+          opts[:dynamodb_type] = 'L'
           attr(name, Marshalers::ListMarshaler.new(opts), opts)
         end
 
         # Define a map-type attribute for your model.
         #
         # Maps do not have to be homogeneous, but they do have to use types that
-        # the AWS SDK for Ruby V2's DynamoDB client knows how to marshal and
+        # the AWS SDK for Ruby V3's DynamoDB client knows how to marshal and
         # unmarshal. Those types are:
         #
         # * Hash
@@ -381,9 +373,10 @@ module Aws
         #   the range key for the table.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def map_attr(name, opts = {})
-          opts[:dynamodb_type] = "M"
+          opts[:dynamodb_type] = 'M'
           attr(name, Marshalers::MapMarshaler.new(opts), opts)
         end
 
@@ -406,9 +399,10 @@ module Aws
         #   the range key for the table.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time. Additionally, lambda
+        #   can be used as a default value.
         def string_set_attr(name, opts = {})
-          opts[:dynamodb_type] = "SS"
+          opts[:dynamodb_type] = 'SS'
           attr(name, Marshalers::StringSetMarshaler.new(opts), opts)
         end
 
@@ -431,9 +425,10 @@ module Aws
         #   the range key for the table.
         # @option opts [Object] :default_value Optional attribute used to
         #   define a "default value" to be used if the attribute's value on an
-        #   item is nil or not set at persistence time.
+        #   item is nil or not set at persistence time.  Additionally, lambda
+        #   can be used as a default value.
         def numeric_set_attr(name, opts = {})
-          opts[:dynamodb_type] = "NS"
+          opts[:dynamodb_type] = 'NS'
           attr(name, Marshalers::NumericSetMarshaler.new(opts), opts)
         end
 
@@ -449,8 +444,8 @@ module Aws
         # * None of the attributes have dirty changes.
         # * If there is a value passed in, it must be an integer.
         # For more information, see
-        # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithItems.html#WorkingWithItems.AtomicCounters Atomic counter}
-        # in the Amazon DynamoDB Developer Guide.
+        # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithItems.html#WorkingWithItems.AtomicCounters
+        # Atomic counter} in the Amazon DynamoDB Developer Guide.
         #
         # @param [Symbol] name Name of this attribute.  It should be a name that
         #   is safe to use as a method.
@@ -473,14 +468,13 @@ module Aws
         #   record.increment_counter!(2) #=> 3
         # @see #attr #attr method for additional hash options.
         def atomic_counter(name, opts = {})
-          opts[:dynamodb_type] = "N"
+          opts[:dynamodb_type] = 'N'
           opts[:default_value] ||= 0
           attr(name, Marshalers::IntegerMarshaler.new(opts), opts)
 
-          define_method("increment_#{name}!") do |increment=1|
-
+          define_method("increment_#{name}!") do |increment = 1|
             if dirty?
-              msg = "Attributes need to be saved before atomic counter can be incremented"
+              msg = 'Attributes need to be saved before atomic counter can be incremented'
               raise Errors::RecordError, msg
             end
 
@@ -489,23 +483,22 @@ module Aws
               raise ArgumentError, msg
             end
 
-            resp = dynamodb_client.update_item({
+            resp = dynamodb_client.update_item(
               table_name: self.class.table_name,
               key: key_values,
               expression_attribute_values: {
-                ":i" => increment
+                ':i' => increment
               },
               expression_attribute_names: {
-                "#n" => name
+                '#n' => name
               },
-              update_expression: "SET #n = #n + :i",
-              return_values: "UPDATED_NEW"
-            })
+              update_expression: 'SET #n = #n + :i',
+              return_values: 'UPDATED_NEW'
+            )
             assign_attributes(resp[:attributes])
             @data.clean!
             @data.get_attribute(name)
           end
-
         end
 
         # @return [Symbol,nil] The symbolic name of the table's hash key.
@@ -513,7 +506,7 @@ module Aws
           @keys.hash_key
         end
 
-        # @return [Symbol,nil] The symbloc name of the table's range key, or nil if there is no range key.
+        # @return [Symbol,nil] The symbolic name of the table's range key, or nil if there is no range key.
         def range_key
           @keys.range_key
         end
@@ -529,6 +522,7 @@ module Aws
         end
 
         private
+
         def _define_attr_methods(name)
           define_method(name) do
             @data.get_attribute(name)
@@ -541,18 +535,14 @@ module Aws
 
         def _key_attributes(id, opts)
           if opts[:hash_key] == true && opts[:range_key] == true
-            raise ArgumentError.new(
-              "Cannot have the same attribute be a hash and range key."
-            )
+            raise ArgumentError, 'Cannot have the same attribute be a hash and range key.'
           elsif opts[:hash_key] == true
             @keys.hash_key = id
           elsif opts[:range_key] == true
             @keys.range_key = id
           end
         end
-
       end
-
     end
   end
 end

data/lib/aws-record/record/batch.rb

@@ -7,10 +7,10 @@ module Aws
 
       class << self
         # Provides a thin wrapper to the
-        # {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#batch_write_item-instance_method Aws::DynamoDB::Client#batch_write_item}
-        # method. Up to 25 +PutItem+ or +DeleteItem+ operations are supported.
-        # A single request may write up to 16 MB of data, with each item having a
-        # write limit of 400 KB.
+        # {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#batch_write_item-instance_method
+        # Aws::DynamoDB::Client#batch_write_item} method. Up to 25 +PutItem+ or +DeleteItem+
+        # operations are supported. A single request may write up to 16 MB of data, with each
+        # item having a write limit of 400 KB.
         #
         # *Note*: this operation does not support dirty attribute handling,
         # nor does it enforce safe write operations (i.e. update vs new record
@@ -25,8 +25,9 @@ module Aws
         # when all operations have been completed.
         #
         # Please see
-        # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Programming.Errors.html#Programming.Errors.BatchOperations Batch Operations and Error Handling}
-        # in the DynamoDB Developer Guide for more details.
+        # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Programming.Errors.html#Programming.Errors.BatchOperations
+        # Batch Operations and Error Handling} in the DynamoDB Developer Guide for
+        # more details.
         #
         # @example Usage Example
         #   class Breakfast
@@ -54,15 +55,16 @@ module Aws
         # @param [Hash] opts the options you wish to use to create the client.
         #  Note that if you include the option +:client+, all other options
         #  will be ignored. See the documentation for other options in the
-        #  {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#initialize-instance_method AWS SDK for Ruby}.
+        #  {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#initialize-instance_method
+        #  AWS SDK for Ruby}.
         # @option opts [Aws::DynamoDB::Client] :client allows you to pass in your
         #  own pre-configured client.
         #
         # @return [Aws::Record::BatchWrite] An instance that contains any
         #   unprocessed items and allows for a retry strategy.
-        def write(opts = {}, &block)
+        def write(opts = {})
           batch = BatchWrite.new(client: _build_client(opts))
-          block.call(batch)
+          yield(batch)
           batch.execute!
         end
 
@@ -133,13 +135,12 @@ module Aws
         # @return [Aws::Record::BatchRead] An instance that contains modeled items
         #  from the +BatchGetItem+ result and stores unprocessed keys to be
         #  manually processed later.
-        def read(opts = {}, &block)
+        def read(opts = {})
           batch = BatchRead.new(client: _build_client(opts))
-          block.call(batch)
+          yield(batch)
           batch.execute!
           batch
         end
-
       end
     end
   end

data/lib/aws-record/record/batch_read.rb

@@ -64,7 +64,10 @@ module Aws
       def each
         return enum_for(:each) unless block_given?
 
-        @items.each { |item| yield item }
+        @items.each do |item|
+          yield(item)
+        end
+
         until complete?
           new_items = execute!
           new_items.each { |new_item| yield new_item }
@@ -156,7 +159,7 @@ module Aws
 
       def update_unprocessed_keys(keys)
         keys.each do |table_name, table_values|
-          table_values.keys.each do |key|
+          table_values.keys.each do |key| # rubocop:disable Style/HashEachMethods
             unprocessed_keys << { keys: key, table_name: table_name }
           end
         end

data/lib/aws-record/record/batch_write.rb

@@ -1,15 +1,4 @@
-# Copyright 2015-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record

data/lib/aws-record/record/buildable_search.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Aws
   module Record
     class BuildableSearch
-      SUPPORTED_OPERATIONS = [:query, :scan]
+      SUPPORTED_OPERATIONS = %i[query scan].freeze
 
       # This should never be called directly, rather it is called by the
       # #build_query or #build_scan methods of your aws-record model class.
@@ -11,12 +13,12 @@ module Aws
         if SUPPORTED_OPERATIONS.include?(operation)
           @operation = operation
         else
-          raise ArgumentError.new("Unsupported operation: #{operation}")
+          raise ArgumentError, "Unsupported operation: #{operation}"
         end
         @model = model
         @params = {}
-        @next_name = "BUILDERA"
-        @next_value = "buildera"
+        @next_name = 'BUILDERA'
+        @next_value = 'buildera'
       end
 
       # If you are querying or scanning on an index, you can specify it with
@@ -40,10 +42,10 @@ module Aws
       # the :segment number of this scan.
       def parallel_scan(opts)
         unless @operation == :scan
-          raise ArgumentError.new("parallel_scan is only supported for scans")
+          raise ArgumentError, 'parallel_scan is only supported for scans'
         end
         unless opts[:total_segments] && opts[:segment]
-          raise ArgumentError.new("Must specify :total_segments and :segment in a parallel scan.")
+          raise ArgumentError, 'Must specify :total_segments and :segment in a parallel scan.'
         end
         @params[:total_segments] = opts[:total_segments]
         @params[:segment] = opts[:segment]
@@ -55,7 +57,7 @@ module Aws
       # run in ascending order.
       def scan_ascending(b)
         unless @operation == :query
-          raise ArgumentError.new("scan_ascending is only supported for queries.")
+          raise ArgumentError, 'scan_ascending is only supported for queries.'
         end
         @params[:scan_index_forward] = b
         self
@@ -89,7 +91,7 @@ module Aws
       #   q.to_a # You can use this like any other query result in aws-record
       def key_expr(statement_str, *subs)
         unless @operation == :query
-          raise ArgumentError.new("key_expr is only supported for queries.")
+          raise ArgumentError, 'key_expr is only supported for queries.'
         end
         names = @params[:expression_attribute_names]
         if names.nil?
@@ -143,10 +145,10 @@ module Aws
 
       # Allows you to define a projection expression for the values returned by
       # a query or scan. See
-      # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.ProjectionExpressions.html the Amazon DynamoDB Developer Guide}
-      # for more details on projection expressions. You can use the symbols from
-      # your aws-record model class in a projection expression. Keys are always
-      # retrieved.
+      # {https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.ProjectionExpressions.html
+      # the Amazon DynamoDB Developer Guide} for more details on projection expressions.
+      # You can use the symbols from your aws-record model class in a projection expression.
+      # Keys are always retrieved.
       #
       # @example Scan with a projection expression:
       #   # Example model class
@@ -231,30 +233,33 @@ module Aws
       end
 
       private
+
       def _key_pass(statement, names)
         statement.gsub(/:(\w+)/) do |match|
-          key = match.gsub(':','').to_sym
+          key = match.gsub(':', '').to_sym
           key_name = @model.attributes.storage_name_for(key)
-          if key_name
-            sub_name = _next_name
-            raise "Substitution collision!" if names[sub_name]
-            names[sub_name] = key_name
-            sub_name
-          else
-            raise "No such key #{key}"
-          end
+
+          raise "No such key #{key}" unless key_name
+
+          sub_name = _next_name
+
+          raise 'Substitution collision!' if names[sub_name]
+
+          names[sub_name] = key_name
+          sub_name
         end
       end
 
       def _apply_values(statement, subs, values)
         count = 0
-        statement.gsub(/[?]/) do |match|
+        result = statement.gsub(/[?]/) do ||
           sub_value = _next_value
-          raise "Substitution collision!" if values[sub_value]
+          raise 'Substitution collision!' if values[sub_value]
           values[sub_value] = subs[count]
           count += 1
           sub_value
-        end.tap do
+        end
+        result.tap do
           unless count == subs.size
             raise "Expected #{count} values in the substitution set, but found #{subs.size}"
           end
@@ -262,14 +267,14 @@ module Aws
       end
 
       def _next_name
-        ret = "#" + @next_name
-        @next_name.next!
+        ret = '#' + @next_name
+        @next_name = @next_name.next
         ret
       end
 
       def _next_value
-        ret = ":" + @next_value
-        @next_value.next!
+        ret = ':' + @next_value
+        @next_value = @next_value.next
         ret
       end
     end

data/lib/aws-record/record/client_configuration.rb

@@ -1,15 +1,4 @@
-# Copyright 2015-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You may not
-# use this file except in compliance with the License. A copy of the License is
-# located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is distributed on
-# an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions
-# and limitations under the License.
+# frozen_string_literal: true
 
 module Aws
   module Record
@@ -31,16 +20,19 @@ module Aws
       # @param [Hash] opts the options you wish to use to create the client.
       #  Note that if you include the option +:client+, all other options
       #  will be ignored. See the documentation for other options in the
-      #  {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#initialize-instance_method AWS SDK for Ruby}.
+      #  {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#initialize-instance_method
+      #  AWS SDK for Ruby}.
       # @option opts [Aws::DynamoDB::Client] :client allows you to pass in your
       #  own pre-configured client.
       def configure_client(opts = {})
+        # rubocop:disable Style/RedundantSelf
         if self.class != Module && Aws::Record.extends_record?(self) && opts.empty? &&
-          self.superclass.instance_variable_get('@dynamodb_client')
-            @dynamodb_client = self.superclass.instance_variable_get('@dynamodb_client')
+           self.superclass.instance_variable_get('@dynamodb_client')
+          @dynamodb_client = self.superclass.instance_variable_get('@dynamodb_client')
         else
           @dynamodb_client = _build_client(opts)
         end
+        # rubocop:enable Style/RedundantSelf
       end
 
       # Gets the
@@ -61,12 +53,9 @@ module Aws
 
       def _build_client(opts = {})
         provided_client = opts.delete(:client)
-        opts[:user_agent_suffix] = _user_agent(opts.delete(:user_agent_suffix))
-        provided_client || Aws::DynamoDB::Client.new(opts)
-      end
-
-      def _user_agent(custom)
-        custom || " aws-record/#{VERSION}"
+        client = provided_client || Aws::DynamoDB::Client.new(opts)
+        client.config.user_agent_frameworks << 'aws-record'
+        client
       end
     end
   end