dynamoid 3.7.1 → 3.9.0

data/LICENSE.txt

@@ -1,7 +1,7 @@
-MIT License
+The MIT License (MIT)
 
 Copyright (c) 2012 Josh Symonds
-Copyright (c) 2013 - 2018 Dynamoid, https://github.com/Dynamoid
+Copyright (c) 2013 - 2022 Dynamoid, https://github.com/Dynamoid
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,12 +1,18 @@
 # Dynamoid
 
-[![Build Status](https://travis-ci.org/Dynamoid/dynamoid.svg?branch=master)](https://travis-ci.org/Dynamoid/dynamoid)
-[![Code Climate](https://codeclimate.com/github/Dynamoid/dynamoid.svg)](https://codeclimate.com/github/Dynamoid/dynamoid)
-[![Coverage Status](https://coveralls.io/repos/github/Dynamoid/dynamoid/badge.svg?branch=master)](https://coveralls.io/github/Dynamoid/dynamoid?branch=master)
-[![CodeTriage Helpers](https://www.codetriage.com/dynamoid/dynamoid/badges/users.svg)](https://www.codetriage.com/dynamoid/dynamoid)
-[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](https://www.rubydoc.info/github/Dynamoid/dynamoid/frames)
-[![Inline docs](http://inch-ci.org/github/Dynamoid/Dynamoid.svg?branch=master)](http://inch-ci.org/github/Dynamoid/Dynamoid)
-![GitHub](https://img.shields.io/github/license/Dynamoid/dynamoid.svg)
+[![Gem Version][⛳️version-img]][⛳️gem]
+[![Supported Build Status][🏘sup-wf-img]][🏘sup-wf]
+[![Maintainability][⛳cclim-maint-img♻️]][⛳cclim-maint]
+[![Coveralls][🏘coveralls-img]][🏘coveralls]
+[![CodeCov][🖇codecov-img♻️]][🖇codecov]
+[![Helpers][🖇triage-help-img]][🖇triage-help]
+[![Contributors][🖐contributors-img]][🖐contributors]
+[![RubyDoc.info][🚎yard-img]][🚎yard]
+[![License][🖇src-license-img]][🖇src-license]
+[![GitMoji][🖐gitmoji-img]][🖐gitmoji]
+[![SemVer 2.0.0][🧮semver-img]][🧮semver]
+[![Keep-A-Changelog 1.0.0][📗keep-changelog-img]][📗keep-changelog]
+[![Sponsor Project][🖇sponsor-img]][🖇sponsor]
 
 Dynamoid is an ORM for Amazon's DynamoDB for Ruby applications. It
 provides similar functionality to ActiveRecord and improves on Amazon's
@@ -62,9 +68,9 @@ Create `config/initializers/aws.rb` as follows:
 
 ```ruby
 Aws.config.update({
-  region: 'us-west-2',
+                    region: 'us-west-2',
   credentials: Aws::Credentials.new('REPLACE_WITH_ACCESS_KEY_ID', 'REPLACE_WITH_SECRET_ACCESS_KEY'),
-})
+                  })
 ```
 
 Alternatively, if you don't want Aws connection settings to be
@@ -88,16 +94,16 @@ elsewhere in your project, etc.), you may do so:
 require 'dynamoid'
 
 credentials = Aws::AssumeRoleCredentials.new(
-    region: region,
-    access_key_id: key,
-    secret_access_key: secret,
-    role_arn: role_arn,
-    role_session_name: 'our-session'
-  )
+  region: region,
+  access_key_id: key,
+  secret_access_key: secret,
+  role_arn: role_arn,
+  role_session_name: 'our-session'
+)
 
 Dynamoid.configure do |config|
   config.region = 'us-west-2',
-  config.credentials = credentials
+                  config.credentials = credentials
 end
 ```
 
@@ -126,8 +132,8 @@ end
 Dynamoid supports Ruby >= 2.3 and Rails >= 4.2.
 
 Its compatibility is tested against following Ruby versions: 2.3, 2.4,
-2.5, 2.6, 2.7 and 3.0, JRuby 9.2.x and against Rails versions: 4.2, 5.0, 5.1,
-5.2, 6.0 and 6.1.
+2.5, 2.6, 2.7, 3.0, 3.1 and 3.2, JRuby 9.4.x and against Rails versions: 4.2, 5.0, 5.1,
+5.2, 6.0, 6.1 and 7.0.
 
 ## Setup
 
@@ -351,7 +357,6 @@ class User
   field :number, :number
   field :joined_at, :datetime
   field :hash, :serialized
-
 end
 ```
 
@@ -397,7 +402,7 @@ class Money
     'serialized representation as a string'
   end
 
-  def self.dynamoid_load(serialized_str)
+  def self.dynamoid_load(_serialized_str)
     # parse serialized representation and return a Money instance
     Money.new(1.23)
   end
@@ -422,7 +427,7 @@ serializing. Example:
 class Money; end
 
 class MoneyAdapter
-  def self.dynamoid_load(money_serialized_str)
+  def self.dynamoid_load(_money_serialized_str)
     Money.new(1.23)
   end
 
@@ -468,6 +473,10 @@ Second argument, type, is optional. Default type is `string`.
 Just like in ActiveRecord (or your other favorite ORM), Dynamoid uses
 associations to create links between models.
 
+**WARNING:** Associations are not supported for models with compound
+primary key. If a model declares a range key it should not declare any
+association itself and be referenced by an association in another model.
+
 The only supported associations (so far) are `has_many`, `has_one`,
 `has_and_belongs_to_many`, and `belongs_to`. Associations are very
 simple to create: just specify the type, the name, and then any options
@@ -537,9 +546,18 @@ model.save(validate: false)
 
 ### Callbacks
 
-Dynamoid also employs ActiveModel callbacks. Right now, callbacks are
-defined on `save`, `update`, `destroy`, which allows you to do `before_`
-or `after_` any of those.
+Dynamoid also employs ActiveModel callbacks. Right now the following
+callbacks are supported:
+- `save` (before, after, around)
+- `create` (before, after, around)
+- `update` (before, after, around)
+- `validation` (before, after)
+- `destroy` (before, after, around)
+- `after_touch`
+- `after_initialize`
+- `after_find`
+
+Example:
 
 ```ruby
 class User
@@ -671,14 +689,14 @@ address.save
 To create multiple documents at once:
 
 ```ruby
-User.create([{name: 'Josh'}, {name: 'Nick'}])
+User.create([{ name: 'Josh' }, { name: 'Nick' }])
 ```
 
 There is an efficient and low-level way to create multiple documents
 (without validation and callbacks running):
 
 ```ruby
-users = User.import([{name: 'Josh'}, {name: 'Nick'}])
+users = User.import([{ name: 'Josh' }, { name: 'Nick' }])
 ```
 
 ### Querying
@@ -783,8 +801,8 @@ for requesting documents in batches:
 
 ```ruby
 # Do some maintenance on the entire table without flooding DynamoDB
-Address.batch(100).each { |address| address.do_some_work; sleep(0.01) }
-Address.record_limit(10_000).batch(100).each { … } # Batch specified as part of a chain
+Address.batch(100).each { |addr| addr.do_some_work && sleep(0.01) }
+Address.record_limit(10_000).batch(100).each { |addr| addr.do_some_work && sleep(0.01) } # Batch specified as part of a chain
 ```
 
 The implication of batches is that the underlying requests are done in
@@ -836,13 +854,13 @@ operators are available: `gt`, `lt`, `gte`, `lte`, `begins_with`,
 `between` as well as equality:
 
 ```ruby
-Address.where(latitude: 10212)
-Address.where('latitude.gt': 10212)
-Address.where('latitude.lt': 10212)
-Address.where('latitude.gte': 10212)
-Address.where('latitude.lte': 10212)
+Address.where(latitude: 10_212)
+Address.where('latitude.gt': 10_212)
+Address.where('latitude.lt': 10_212)
+Address.where('latitude.gte': 10_212)
+Address.where('latitude.lte': 10_212)
 Address.where('city.begins_with': 'Lon')
-Address.where('latitude.between': [10212, 20000])
+Address.where('latitude.between': [10_212, 20_000])
 ```
 
 You are able to filter results on the DynamoDB side and specify
@@ -850,7 +868,7 @@ conditions for non-key fields. Following additional operators are
 available: `in`, `contains`, `not_contains`, `null`, `not_null`:
 
 ```ruby
-Address.where('city.in': ['London', 'Edenburg', 'Birmingham'])
+Address.where('city.in': %w[London Edenburg Birmingham])
 Address.where('city.contains': ['on'])
 Address.where('city.not_contains': ['ing'])
 Address.where('postcode.null': false)
@@ -952,6 +970,14 @@ Address.upsert(id, city: 'Chicago')
 Address.upsert(id, { city: 'Chicago' }, if: { deliverable: true })
 ```
 
+By default, `#upsert` will update all attributes of the document if it already exists.
+To idempotently create-but-not-update a record, apply the `unless_exists` condition
+to its keys when you upsert.
+
+```ruby
+Address.upsert(id, { city: 'Chicago' }, if: { unless_exists: [:id] })
+```
+
 ### Deleting
 
 In order to delete some items `delete_all` method should be used. Any
@@ -1033,6 +1059,21 @@ resolving the fields with a second query against the table since a query
 against GSI then a query on base table is still likely faster than scan
 on the base table*
 
+### PartiQL
+
+To run PartiQL statements `Dynamoid.adapter.execute` method should be
+used:
+
+```ruby
+Dynamoid.adapter.execute("UPDATE users SET name = 'Mike' WHERE id = '1'")
+```
+
+Parameters are also supported:
+
+```ruby
+Dynamoid.adapter.execute('SELECT * FROM users WHERE id = ?', ['1'])
+```
+
 ## Configuration
 
 Listed below are all configuration options.
@@ -1073,7 +1114,7 @@ Listed below are all configuration options.
   when referring to them. Isn't thread safe. Default is `false`.
   `Use Dynamoid::Middleware::IdentityMap` to clear identity map for each HTTP request
 * `timestamps` - by default Dynamoid sets `created_at` and `updated_at`
-  fields for model creation and updating. You can disable this
+  fields at model creation and updating. You can disable this
   behavior by setting `false` value
 * `sync_retry_max_times` - when Dynamoid creates or deletes table
   synchronously it checks for completion specified times. Default is 60
@@ -1269,6 +1310,7 @@ accidentally by adding the following to your test environment setup:
 
 ```ruby
 raise "Tests should be run in 'test' environment only" if Rails.env != 'test'
+
 Dynamoid.configure do |config|
   config.namespace = "#{Rails.application.railtie_name}_#{Rails.env}"
 end
@@ -1335,7 +1377,7 @@ DynamoDB running locally. Follow these steps to setup your test
 environment.
 
  * First download and unpack the latest version of DynamoDB. We have a
-   script that will do this for you if you use homebrew on a Mac.
+   script that will do this for you if you use bash, and homebrew on a Mac.
 
     ```shell
     bin/setup
@@ -1360,25 +1402,62 @@ environment.
     bin/stop_dynamodblocal
     ```
 
-If you want to run all the specs that travis runs, use `bundle exec
-wwtd`, but first you will need to setup all the rubies, for each of `%w(
-2.3.8 2.4.6 2.5.5 2.6.3 2.7.0 3.0.0 9.2.14.0)`. When you run
-`bundle exec wwtd` it will take care of starting and stopping the local
-dynamodb instance.
-
+If you run into issues, please try these steps first.
+NOTE: You can use any version manager: rvm, rbenv, chruby, asdf-ruby
 ```shell
-rvm use 3.0.0
-gem install rubygems-update
-gem install bundler
+asdf install ruby 3.1.1
+asdf local ruby 3.1.1
+gem update --system
 bundle install
 ```
 
-## Copyright
-
-Copyright (c) 2012 Josh Symonds.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Security
+
+See [SECURITY.md][security].
+
+## Related links
+
+This documentation may be useful for the contributors:
+- <https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/welcome.html>
+- <https://docs.aws.amazon.com/sdk-for-ruby/v3/api/index.html>
+
+## License
+
+The gem is available as open source under the terms of
+the [MIT License][license] [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)][license-ref].
+See [LICENSE][license] for the official [Copyright Notice][copyright-notice-explainer].
+
+[copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year
+
+[license]: https://github.com/Dynamoid/dynamoid/blob/master/LICENSE.txt
+
+[license-ref]: https://opensource.org/licenses/MIT
+
+[security]: https://github.com/Dynamoid/dynamoid/blob/master/SECURITY.md
+
+[⛳️gem]: https://rubygems.org/gems/dynamoid
+[⛳️version-img]: http://img.shields.io/gem/v/dynamoid.svg
+[⛳cclim-maint]: https://codeclimate.com/github/Dynamoid/dynamoid/maintainability
+[⛳cclim-maint-img♻️]: https://api.codeclimate.com/v1/badges/27fd8b6b7ff338fa4914/maintainability
+[🏘coveralls]: https://coveralls.io/github/Dynamoid/dynamoid?branch=master
+[🏘coveralls-img]: https://coveralls.io/repos/github/Dynamoid/dynamoid/badge.svg?branch=master
+[🖇codecov]: https://codecov.io/gh/Dynamoid/dynamoid
+[🖇codecov-img♻️]: https://codecov.io/gh/Dynamoid/dynamoid/branch/master/graph/badge.svg?token=84WeeoxaN9
+[🖇src-license]: https://github.com/Dynamoid/dynamoid/blob/master/LICENSE.txt
+[🖇src-license-img]: https://img.shields.io/badge/License-MIT-green.svg
+[🖐gitmoji]: https://gitmoji.dev
+[🖐gitmoji-img]: https://img.shields.io/badge/gitmoji-3.9.0-FFDD67.svg?style=flat
+[🚎yard]: https://www.rubydoc.info/gems/dynamoid
+[🚎yard-img]: https://img.shields.io/badge/yard-docs-blue.svg?style=flat
+[🧮semver]: http://semver.org/
+[🧮semver-img]: https://img.shields.io/badge/semver-2.0.0-FFDD67.svg?style=flat
+[🖐contributors]: https://github.com/Dynamoid/dynamoid/graphs/contributors
+[🖐contributors-img]: https://img.shields.io/github/contributors-anon/Dynamoid/dynamoid
+[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
+[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-FFDD67.svg?style=flat
+[🖇sponsor-img]: https://img.shields.io/opencollective/all/dynamoid
+[🖇sponsor]: https://opencollective.com/dynamoid
+[🖇triage-help]: https://www.codetriage.com/dynamoid/dynamoid
+[🖇triage-help-img]: https://www.codetriage.com/dynamoid/dynamoid/badges/users.svg
+[🏘sup-wf]: https://github.com/Dynamoid/dynamoid/actions/workflows/ci.yml?query=branch%3Amaster
+[🏘sup-wf-img]: https://github.com/Dynamoid/dynamoid/actions/workflows/ci.yml/badge.svg?branch=master

data/SECURITY.md

@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported |
+|---------|-----------|
+| 3.7.x   | ✅         |
+| <= 3.6  | ❌         |
+| 2.x     | ❌         |
+| 1.x     | ❌         |
+| 0.x     | ❌         |
+
+## Reporting a Vulnerability
+
+Peter Boling is responsible for the security maintenance of this gem. Please find a way
+to [contact him directly](https://railsbling.com/contact) to report the issue. Include as much relevant information as
+possible.

data/dynamoid.gemspec

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'dynamoid/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'dynamoid'
+  spec.version = Dynamoid::VERSION
+
+  # Keep in sync with README
+  spec.authors = [
+    'Josh Symonds',
+    'Logan Bowers',
+    'Craig Heneveld',
+    'Anatha Kumaran',
+    'Jason Dew',
+    'Luis Arias',
+    'Stefan Neculai',
+    'Philip White',
+    'Peeyush Kumar',
+    'Sumanth Ravipati',
+    'Pascal Corpet',
+    'Brian Glusman',
+    'Peter Boling',
+    'Andrew Konchin'
+  ]
+  spec.email = ['andry.konchin@gmail.com', 'peter.boling@gmail.com', 'brian@stellaservice.com']
+
+  spec.description = "Dynamoid is an ORM for Amazon's DynamoDB that supports offline development, associations, querying, and everything else you'd expect from an ActiveRecord-style replacement."
+  spec.summary = "Dynamoid is an ORM for Amazon's DynamoDB"
+  # Ignore not commited files
+  spec.files = Dir[
+    'CHANGELOG.md',
+    'dynamoid.gemspec',
+    'lib/**/*',
+    'LICENSE.txt',
+    'README.md',
+    'SECURITY.md'
+  ]
+  spec.homepage = 'http://github.com/Dynamoid/dynamoid'
+  spec.licenses = ['MIT']
+  spec.require_paths = ['lib']
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = "https://github.com/Dynamoid/dynamoid/tree/v#{spec.version}"
+  spec.metadata['changelog_uri'] = "https://github.com/Dynamoid/dynamoid/blob/v#{spec.version}/CHANGELOG.md"
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/Dynamoid/dynamoid/issues'
+  spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/dynamoid/#{spec.version}"
+  spec.metadata['funding_uri'] = 'https://opencollective.com/dynamoid'
+  spec.metadata['wiki_uri'] = 'https://github.com/Dynamoid/dynamoid/wiki'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.add_runtime_dependency 'activemodel', '>=4'
+  spec.add_runtime_dependency 'aws-sdk-dynamodb', '~> 1.0'
+  spec.add_runtime_dependency 'concurrent-ruby', '>= 1.0'
+
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry', '~> 0.14'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  # 'rubocop-lts' is for Ruby 2.3+, see https://rubocop-lts.gitlab.io/
+  spec.add_development_dependency 'rubocop-lts', '~> 10.0'
+  spec.add_development_dependency 'yard'
+end

data/lib/dynamoid/adapter.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-# require only 'concurrent/atom' once this issue is resolved:
-#   https://github.com/ruby-concurrency/concurrent-ruby/pull/377
-require 'concurrent'
+require 'concurrent/atom'
 require 'dynamoid/adapter_plugin/aws_sdk_v3'
 
-# encoding: utf-8
 module Dynamoid
   # Adapter's value-add:
   # 1) For the rest of Dynamoid, the gateway to DynamoDB.
@@ -44,7 +41,7 @@ module Dynamoid
 
     # Shows how long it takes a method to run on the adapter. Useful for generating logged output.
     #
-    # @param [Symbol] method the name of the method to appear in the log
+    # @param [Symbol|String] method the name of the method to appear in the log
     # @param [Array] args the arguments to the method to appear in the log
     # @yield the actual code to benchmark
     #
@@ -78,7 +75,7 @@ module Dynamoid
     # that the batch get will acquire the correct record.
     #
     # @param [String] table the name of the table to write the object to
-    # @param [Array] ids to fetch, can also be a string of just one id
+    # @param [String, Array] ids to fetch; can also be a string of just one id
     # @param [Hash] options Passed to the underlying query. The :range_key option is required whenever the table has a range key,
     #                       unless multiple ids are passed in.
     #
@@ -94,7 +91,7 @@ module Dynamoid
     # Delete an item from a table.
     #
     # @param [String] table the name of the table to write the object to
-    # @param [Array] ids to delete, can also be a string of just one id
+    # @param [String, Array] ids to delete; can also be a string of just one id
     # @param [Hash] options allowed only +range_key+ - range key or array of
     #                       range keys of the record to delete, can also be
     #                       a string of just one range_key, and +conditions+
@@ -145,12 +142,12 @@ module Dynamoid
       end
     end
 
-    %i[batch_get_item delete_item get_item list_tables put_item truncate batch_write_item batch_delete_item].each do |m|
+    %i[batch_get_item delete_item get_item list_tables put_item truncate batch_write_item batch_delete_item execute].each do |m|
       # Method delegation with benchmark to the underlying adapter. Faster than relying on method_missing.
       #
       # @since 0.2.0
       define_method(m) do |*args, &blk|
-        benchmark(m.to_s, *args) { adapter.send(m, *args, &blk) }
+        benchmark(m, *args) { adapter.send(m, *args, &blk) }
       end
     end
 
@@ -166,6 +163,7 @@ module Dynamoid
       # https://eregon.me/blog/2019/11/10/the-delegation-challenge-of-ruby27.html
 
       return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
+
       super
     end
 

data/lib/dynamoid/adapter_plugin/aws_sdk_v3/batch_get_item.rb

@@ -87,8 +87,8 @@ module Dynamoid
             # unprocessed_keys Hash contains as values instances of
             # Aws::DynamoDB::Types::KeysAndAttributes
             @api_response.unprocessed_keys[table.name].keys.map do |h|
-              # If a table has a composite key then we need to return an array
-              # of [hash_key, composite_key]. Otherwise just return hash key's
+              # If a table has a composite primary key then we need to return an array
+              # of [hash key, range key]. Otherwise just return hash key's
               # value.
               if table.range_key.nil?
                 h[table.hash_key.to_s]

data/lib/dynamoid/adapter_plugin/aws_sdk_v3/execute_statement.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Dynamoid
+  # @private
+  module AdapterPlugin
+    class AwsSdkV3
+      # Excecute a PartiQL query
+      #
+      # Documentation:
+      # - https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ExecuteStatement.html
+      # - https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#execute_statement-instance_method
+      #
+      # NOTE: For reads result may be paginated. Only pagination with NextToken
+      # is implemented. Currently LastEvaluatedKey in response cannot be fed to
+      # ExecuteStatement to get the next page.
+      #
+      # See also:
+      # - https://repost.aws/questions/QUgNPbBYWiRoOlMsJv-XzrWg/how-to-use-last-evaluated-key-in-execute-statement-request
+      # - https://stackoverflow.com/questions/71438439/aws-dynamodb-executestatement-pagination
+      class ExecuteStatement
+        attr_reader :client, :statement, :parameters, :options
+
+        def initialize(client, statement, parameters, options)
+          @client = client
+          @statement = statement
+          @parameters = parameters
+          @options = options.symbolize_keys.slice(:consistent_read)
+        end
+
+        def call
+          request = {
+            statement: @statement,
+            parameters: @parameters,
+            consistent_read: @options[:consistent_read],
+          }
+
+          response = client.execute_statement(request)
+
+          unless response.next_token
+            return response_to_items(response)
+          end
+
+          Enumerator.new do |yielder|
+            yielder.yield(response_to_items(response))
+
+            while response.next_token
+              request[:next_token] = response.next_token
+              response = client.execute_statement(request)
+              yielder.yield(response_to_items(response))
+            end
+          end
+        end
+
+        private
+
+        def response_to_items(response)
+          response.items.map(&:symbolize_keys)
+        end
+      end
+    end
+  end
+end

data/lib/dynamoid/adapter_plugin/aws_sdk_v3/item_updater.rb

@@ -6,6 +6,10 @@ module Dynamoid
     class AwsSdkV3
       # Mimics behavior of the yielded object on DynamoDB's update_item API (high level).
       class ItemUpdater
+        ADD    = 'ADD'
+        DELETE = 'DELETE'
+        PUT    = 'PUT'
+
         attr_reader :table, :key, :range_key
 
         def initialize(table, key, range_key = nil)
@@ -31,11 +35,15 @@ module Dynamoid
         #
         # Removes values from the sets of the given columns
         #
-        # @param [Hash] values keys of the hash are the columns, values are Arrays/Sets of items
-        #               to remove
+        # @param [Hash|Symbol|String] values keys of the hash are the columns, values are Arrays/Sets of items
+        #                                    to remove
         #
         def delete(values)
-          @deletions.merge!(sanitize_attributes(values))
+          if values.is_a?(Hash)
+            @deletions.merge!(sanitize_attributes(values))
+          else
+            @deletions.merge!(values.to_s => nil)
+          end
         end
 
         #
@@ -48,42 +56,48 @@ module Dynamoid
         #
         # Returns an AttributeUpdates hash suitable for passing to the V2 Client API
         #
-        def to_h
-          ret = {}
+        def attribute_updates
+          result = {}
 
           @additions.each do |k, v|
-            ret[k.to_s] = {
+            result[k] = {
               action: ADD,
               value: v
             }
           end
+
           @deletions.each do |k, v|
-            ret[k.to_s] = {
+            result[k] = {
               action: DELETE
             }
-            ret[k.to_s][:value] = v unless v.nil?
+            result[k][:value] = v unless v.nil?
           end
+
           @updates.each do |k, v|
-            ret[k.to_s] = {
+            result[k] = {
               action: PUT,
               value: v
             }
           end
 
-          ret
+          result
         end
 
         private
 
         def sanitize_attributes(attributes)
           attributes.transform_values do |v|
-            v.is_a?(Hash) ? v.stringify_keys : v
+            if v.is_a?(Hash)
+              v.stringify_keys
+            elsif v.is_a?(Set) && v.empty?
+              nil
+            elsif v.is_a?(String) && v.empty?
+              nil
+            else
+              v
+            end
           end
         end
-
-        ADD    = 'ADD'
-        DELETE = 'DELETE'
-        PUT    = 'PUT'
       end
     end
   end

data/lib/dynamoid/adapter_plugin/aws_sdk_v3/middleware/limit.rb

@@ -21,14 +21,17 @@ module Dynamoid
             # lower to obey limits. We can assume the difference won't be
             # negative due to break statements below but choose smaller limit
             # which is why we have 2 separate if statements.
+            #
             # NOTE: Adjusting based on record_limit can cause many HTTP requests
             # being made. We may want to change this behavior, but it affects
             # filtering on data with potentially large gaps.
+            #
             # Example:
             #    User.where('created_at.gte' => 1.day.ago).record_limit(1000)
             #    Records 1-999 User's that fit criteria
             #    Records 1000-2000 Users's that do not fit criteria
             #    Record 2001 fits criteria
+            #
             # The underlying implementation will have 1 page for records 1-999
             # then will request with limit 1 for records 1000-2000 (making 1000
             # requests of limit 1) until hit record 2001.