dynamoid 2.2.0 → 3.0.0

data/Rakefile

@@ -1,32 +1,32 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
-require "bundler/setup"
+require 'bundler/gem_tasks'
+
+require 'bundler/setup'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
-if defined?(Rails)
-  load "./lib/dynamoid/tasks/database.rake"
-end
+load './lib/dynamoid/tasks/database.rake' if defined?(Rails)
 
-require "rake"
-require "rspec/core/rake_task"
+require 'rake'
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList["spec/**/*_spec.rb"]
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-require "yard"
+require 'yard'
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ["lib/**/*.rb", "README", "LICENSE"]   # optional
-  t.options = ["-m", "markdown"] # optional
+  t.files   = ['lib/**/*.rb', 'README', 'LICENSE'] # optional
+  t.options = ['-m', 'markdown'] # optional
 end
 
-desc "Publish documentation to gh-pages"
+desc 'Publish documentation to gh-pages'
 task :publish do
-  Rake::Task["yard"].invoke
+  Rake::Task['yard'].invoke
   `git add .`
   `git commit -m 'Regenerated documentation'`
   `git checkout gh-pages`
@@ -41,6 +41,6 @@ task :publish do
   `git checkout master`
 end
 
-require "wwtd/tasks"
+require 'wwtd/tasks'
 
-task :default => :spec
+task default: :spec

data/Vagrantfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Vagrant.configure('2') do |config|
   # Choose base box
   config.vm.box = 'bento/ubuntu-16.04'
@@ -16,11 +18,11 @@ Vagrant.configure('2') do |config|
     salt.minion_config = '.dev/vagrant/minion'
 
     # Pillars
-    salt.pillar({
+    salt.pillar(
       'ruby' => {
-        'version' => '2.4.1',
+        'version' => '2.4.1'
       }
-    })
+    )
 
     salt.run_highstate = true
   end

data/dynamoid.gemspec

@@ -1,62 +1,56 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "dynamoid/version"
+require 'dynamoid/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "dynamoid"
+  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"
+    '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 = ["peter.boling@gmail.com", "brian@stellaservice.com"]
+  spec.email = ['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"
   spec.extra_rdoc_files = [
-      "LICENSE.txt",
-      "README.md"
+    'LICENSE.txt',
+    'README.md'
   ]
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features|.dev|Vagrantfile)/}) }
-  spec.homepage = "http://github.com/Dynamoid/Dynamoid"
-  spec.licenses = ["MIT"]
-  spec.bindir = "exe"
+  spec.homepage = 'http://github.com/Dynamoid/Dynamoid'
+  spec.licenses = ['MIT']
+  spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'activemodel', '>=4'
+  spec.add_runtime_dependency 'aws-sdk-dynamodb', '~> 1'
+  spec.add_runtime_dependency 'concurrent-ruby', '>= 1.0'
 
-  # This form of switching the gem dependencies is not compatible with wwtd & appraisal
-  # if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.2")
-  #   spec.add_runtime_dependency(%q<activemodel>, [">= 4", "< 5.1.0"])
-  #   spec.add_development_dependency(%q<activesupport>, [">= 4", "< 5.1.0"])
-  # else
-  #   spec.add_runtime_dependency(%q<activemodel>, ["~> 4"])
-  #   spec.add_development_dependency(%q<activesupport>, ["~> 4"])
-  # end
-  spec.add_runtime_dependency(%q<activemodel>, [">= 4"])
-  spec.add_development_dependency(%q<activesupport>, [">= 4"])
-  spec.add_runtime_dependency(%q<aws-sdk-resources>, ["~> 2"])
-  spec.add_runtime_dependency(%q<concurrent-ruby>, [">= 1.0"])
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "appraisal", "~> 2.1"
-  spec.add_development_dependency "wwtd", "~> 1.3"
-  spec.add_development_dependency(%q<yard>, [">= 0"])
-  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'wwtd'
+  spec.add_development_dependency 'yard'
 end

data/gemfiles/rails_4_2.gemfile

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "pry-byebug", platforms: :ruby
-gem "rails", "~> 4.2.0"
-gem "nokogiri", "~> 1.6.8"
+gem 'nokogiri', '~> 1.6.8'
+gem 'pry-byebug', platforms: :ruby
+gem 'rails', '~> 4.2.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5_0.gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "pry-byebug", platforms: :ruby
-gem "rails", "~> 5.0.0"
+gem 'pry-byebug', platforms: :ruby
+gem 'rails', '~> 5.0.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5_1.gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "pry-byebug", platforms: :ruby
-gem "rails", "~> 5.1.0"
+gem 'pry-byebug', platforms: :ruby
+gem 'rails', '~> 5.1.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5_2.gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "pry-byebug", platforms: :ruby
-gem "rails", "~> 5.2.0"
+gem 'pry-byebug', platforms: :ruby
+gem 'rails', '~> 5.2.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/lib/dynamoid.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-dynamodb'
 require 'delegate'
 require 'time'
 require 'securerandom'
@@ -11,10 +14,16 @@ require 'active_model'
 
 require 'dynamoid/version'
 require 'dynamoid/errors'
+require 'dynamoid/application_time_zone'
+require 'dynamoid/dynamodb_time_zone'
 require 'dynamoid/fields'
 require 'dynamoid/indexes'
 require 'dynamoid/associations'
 require 'dynamoid/persistence'
+require 'dynamoid/dumping'
+require 'dynamoid/undumping'
+require 'dynamoid/type_casting'
+require 'dynamoid/primary_key_type_mapping'
 require 'dynamoid/dirty'
 require 'dynamoid/validations'
 require 'dynamoid/criteria'
@@ -29,9 +38,7 @@ require 'dynamoid/tasks/database'
 
 require 'dynamoid/middleware/identity_map'
 
-if defined?(Rails)
-  require 'dynamoid/railtie'
-end
+require 'dynamoid/railtie' if defined?(Rails)
 
 module Dynamoid
   extend self
@@ -39,7 +46,7 @@ module Dynamoid
   def configure
     block_given? ? yield(Dynamoid::Config) : Dynamoid::Config
   end
-  alias :config :configure
+  alias config configure
 
   def logger
     Dynamoid::Config.logger

data/lib/dynamoid/adapter.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 # require only 'concurrent/atom' once this issue is resolved:
 #   https://github.com/ruby-concurrency/concurrent-ruby/pull/377
 require 'concurrent'
 
 # encoding: utf-8
 module Dynamoid
-
   # Adapter's value-add:
   # 1) For the rest of Dynamoid, the gateway to DynamoDB.
   # 2) Allows switching `config.adapter` to ease development of a new adapter.
@@ -16,8 +17,8 @@ module Dynamoid
     end
 
     def tables
-      if !@tables_.value
-        @tables_.swap{|value, args| benchmark('Cache Tables') { list_tables || [] } }
+      unless @tables_.value
+        @tables_.swap { |_value, _args| benchmark('Cache Tables') { list_tables || [] } }
       end
       @tables_.value
     end
@@ -26,7 +27,7 @@ module Dynamoid
     #
     # @since 0.2.0
     def adapter
-      if !@adapter_.value
+      unless @adapter_.value
         adapter = self.class.adapter_plugin_class.new
         adapter.connect! if adapter.respond_to?(:connect!)
         @adapter_.compare_and_set(nil, adapter)
@@ -36,7 +37,7 @@ module Dynamoid
     end
 
     def clear_cache!
-      @tables_.swap{|value, args| nil}
+      @tables_.swap { |_value, _args| nil }
     end
 
     # Shows how long it takes a method to run on the adapter. Useful for generating logged output.
@@ -51,8 +52,8 @@ module Dynamoid
     def benchmark(method, *args)
       start = Time.now
       result = yield
-      Dynamoid.logger.debug "(#{((Time.now - start) * 1000.0).round(2)} ms) #{method.to_s.split('_').collect(&:upcase).join(' ')}#{ " - #{args.inspect}" unless args.nil? || args.empty? }"
-      return result
+      Dynamoid.logger.debug "(#{((Time.now - start) * 1000.0).round(2)} ms) #{method.to_s.split('_').collect(&:upcase).join(' ')}#{" - #{args.inspect}" unless args.nil? || args.empty?}"
+      result
     end
 
     # Write an object to the adapter.
@@ -81,13 +82,9 @@ module Dynamoid
     #
     # @since 0.2.0
     def read(table, ids, options = {}, &blk)
-      range_key = options.delete(:range_key)
-
       if ids.respond_to?(:each)
-        ids = ids.collect{|id| range_key ? [id, range_key] : id}
-        batch_get_item({table => ids}, options, &blk)
+        batch_get_item({ table => ids }, options, &blk)
       else
-        options[:range_key] = range_key if range_key
         get_item(table, ids, options)
       end
     end
@@ -101,12 +98,12 @@ module Dynamoid
     def delete(table, ids, options = {})
       range_key = options[:range_key] # array of range keys that matches the ids passed in
       if ids.respond_to?(:each)
-        if range_key.respond_to?(:each)
-          # turn ids into array of arrays each element being hash_key, range_key
-          ids = ids.each_with_index.map{|id, i| [id, range_key[i]]}
-        else
-          ids = range_key ? ids.map { |id| [id, range_key] } : ids
-        end
+        ids = if range_key.respond_to?(:each)
+                # turn ids into array of arrays each element being hash_key, range_key
+                ids.each_with_index.map { |id, i| [id, range_key[i]] }
+              else
+                range_key ? ids.map { |id| [id, range_key] } : ids
+              end
 
         batch_delete_item(table => ids)
       else
@@ -121,11 +118,11 @@ module Dynamoid
     #
     # @since 0.2.0
     def scan(table, query = {}, opts = {})
-      benchmark('Scan', table, query) {adapter.scan(table, query, opts)}
+      benchmark('Scan', table, query) { adapter.scan(table, query, opts) }
     end
 
     def create_table(table_name, key, options = {})
-      if !tables.include?(table_name)
+      unless tables.include?(table_name)
         benchmark('Create Table') { adapter.create_table(table_name, key, options) }
         tables << table_name
       end
@@ -140,15 +137,15 @@ module Dynamoid
       end
     end
 
-    [: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].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|
         if blk.present?
-          benchmark("#{m.to_s}", *args) { adapter.send(m, *args, &blk) }
+          benchmark(m.to_s, *args) { adapter.send(m, *args, &blk) }
         else
-          benchmark("#{m.to_s}", *args) { adapter.send(m, *args) }
+          benchmark(m.to_s, *args) { adapter.send(m, *args) }
         end
       end
     end
@@ -157,7 +154,7 @@ module Dynamoid
     #
     # @since 0.2.0
     def method_missing(method, *args, &block)
-      return benchmark(method, *args) {adapter.send(method, *args, &block)} if adapter.respond_to?(method)
+      return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
       super
     end
 
@@ -180,8 +177,6 @@ module Dynamoid
       adapter.query(table_name, opts)
     end
 
-    private
-
     def self.adapter_plugin_class
       unless Dynamoid.const_defined?(:AdapterPlugin) && Dynamoid::AdapterPlugin.const_defined?(Dynamoid::Config.adapter.camelcase)
         require "dynamoid/adapter_plugin/#{Dynamoid::Config.adapter}"
@@ -189,6 +184,5 @@ module Dynamoid
 
       Dynamoid::AdapterPlugin.const_get(Dynamoid::Config.adapter.camelcase)
     end
-
   end
 end

data/lib/dynamoid/adapter_plugin/{aws_sdk_v2.rb → aws_sdk_v3.rb}

@@ -1,46 +1,47 @@
+# frozen_string_literal: true
+
 module Dynamoid
   module AdapterPlugin
-
-    # The AwsSdkV2 adapter provides support for the aws-sdk version 2 for ruby.
-    class AwsSdkV2
-      EQ = 'EQ'.freeze
+    # The AwsSdkV3 adapter provides support for the aws-sdk version 2 for ruby.
+    class AwsSdkV3
+      EQ = 'EQ'
       RANGE_MAP = {
-          range_greater_than: 'GT',
-          range_less_than:    'LT',
-          range_gte:          'GE',
-          range_lte:          'LE',
-          range_begins_with:  'BEGINS_WITH',
-          range_between:      'BETWEEN',
-          range_eq:           'EQ'
-      }
+        range_greater_than: 'GT',
+        range_less_than:    'LT',
+        range_gte:          'GE',
+        range_lte:          'LE',
+        range_begins_with:  'BEGINS_WITH',
+        range_between:      'BETWEEN',
+        range_eq:           'EQ'
+      }.freeze
 
       # Don't implement NULL and NOT_NULL because it doesn't make seanse -
       # we declare schema in models
       FIELD_MAP = {
-          eq:           'EQ',
-          ne:           'NE',
-          gt:           'GT',
-          lt:           'LT',
-          gte:          'GE',
-          lte:          'LE',
-          begins_with:  'BEGINS_WITH',
-          between:      'BETWEEN',
-          in:           'IN',
-          contains:     'CONTAINS',
-          not_contains: 'NOT_CONTAINS'
-      }
-      HASH_KEY  = 'HASH'.freeze
-      RANGE_KEY = 'RANGE'.freeze
-      STRING_TYPE  = 'S'.freeze
-      NUM_TYPE     = 'N'.freeze
-      BINARY_TYPE  = 'B'.freeze
+        eq:           'EQ',
+        ne:           'NE',
+        gt:           'GT',
+        lt:           'LT',
+        gte:          'GE',
+        lte:          'LE',
+        begins_with:  'BEGINS_WITH',
+        between:      'BETWEEN',
+        in:           'IN',
+        contains:     'CONTAINS',
+        not_contains: 'NOT_CONTAINS'
+      }.freeze
+      HASH_KEY  = 'HASH'
+      RANGE_KEY = 'RANGE'
+      STRING_TYPE  = 'S'
+      NUM_TYPE     = 'N'
+      BINARY_TYPE  = 'B'
       TABLE_STATUSES = {
-          creating: 'CREATING',
-          updating: 'UPDATING',
-          deleting: 'DELETING',
-          active: 'ACTIVE'
+        creating: 'CREATING',
+        updating: 'UPDATING',
+        deleting: 'DELETING',
+        active: 'ACTIVE'
       }.freeze
-      PARSE_TABLE_STATUS = ->(resp, lookup = :table) {
+      PARSE_TABLE_STATUS = lambda { |resp, lookup = :table|
         # lookup is table for describe_table API
         # lookup is table_description for create_table API
         #   because Amazon, damnit.
@@ -74,6 +75,13 @@ module Dynamoid
           @connection_hash[:region] = Dynamoid::Config.region
         end
 
+        # https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/lib/aws-sdk-core/plugins/logging.rb
+        # https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/lib/aws-sdk-core/log/formatter.rb
+        formatter = Aws::Log::Formatter.new(':operation | Request :http_request_body | Response :http_response_body')
+        @connection_hash[:logger] = Dynamoid::Config.logger
+        @connection_hash[:log_level] = :debug
+        @connection_hash[:log_formatter] = formatter
+
         @connection_hash
       end
 
@@ -90,10 +98,10 @@ module Dynamoid
       # Block receives boolean flag which is true if there are some unprocessed items, otherwise false.
       #
       # @example Saves several items to the table testtable
-      #   Dynamoid::AdapterPlugin::AwsSdkV2.batch_write_item('table1', [{ id: '1', name: 'a' }, { id: '2', name: 'b'}])
+      #   Dynamoid::AdapterPlugin::AwsSdkV3.batch_write_item('table1', [{ id: '1', name: 'a' }, { id: '2', name: 'b'}])
       #
       # @example Pass block
-      #   Dynamoid::AdapterPlugin::AwsSdkV2.batch_write_item('table1', items) do |bool|
+      #   Dynamoid::AdapterPlugin::AwsSdkV3.batch_write_item('table1', items) do |bool|
       #     if bool
       #       puts 'there are unprocessed items'
       #     end
@@ -107,27 +115,25 @@ module Dynamoid
       # See:
       # * http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
       # * http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#batch_write_item-instance_method
-      def batch_write_item table_name, objects, options = {}
+      def batch_write_item(table_name, objects, options = {})
         items = objects.map { |o| sanitize_item(o) }
 
         begin
-          while items.present? do
+          while items.present?
             batch = items.shift(BATCH_WRITE_ITEM_REQUESTS_LIMIT)
             requests = batch.map { |item| { put_request: { item: item } } }
 
             response = client.batch_write_item(
               {
                 request_items: {
-                  table_name => requests,
+                  table_name => requests
                 },
                 return_consumed_capacity: 'TOTAL',
                 return_item_collection_metrics: 'SIZE'
               }.merge!(options)
             )
 
-            if block_given?
-              yield(response.unprocessed_items.present?)
-            end
+            yield(response.unprocessed_items.present?) if block_given?
 
             if response.unprocessed_items.present?
               items += response.unprocessed_items[table_name].map { |r| r.put_request.item }
@@ -148,10 +154,10 @@ module Dynamoid
       # * and boolean flag is true if there are some unprocessed keys, otherwise false.
       #
       # @example Retrieve IDs 1 and 2 from the table testtable
-      #   Dynamoid::AdapterPlugin::AwsSdkV2.batch_get_item('table1' => ['1', '2'])
+      #   Dynamoid::AdapterPlugin::AwsSdkV3.batch_get_item('table1' => ['1', '2'])
       #
       # @example Pass block to receive each batch
-      #   Dynamoid::AdapterPlugin::AwsSdkV2.batch_get_item('table1' => ids) do |hash, bool|
+      #   Dynamoid::AdapterPlugin::AwsSdkV3.batch_get_item('table1' => ids) do |hash, bool|
       #     puts hash['table1']
       #
       #     if bool
@@ -171,9 +177,9 @@ module Dynamoid
       # @since 1.0.0
       #
       # @todo: Provide support for passing options to underlying batch_get_item
-      def batch_get_item(table_ids, options = {})
-        request_items = Hash.new{|h, k| h[k] = []}
-        return request_items if table_ids.all?{|k, v| v.blank?}
+      def batch_get_item(table_ids, _options = {})
+        request_items = Hash.new { |h, k| h[k] = [] }
+        return request_items if table_ids.all? { |_k, v| v.blank? }
 
         ret = Hash.new([].freeze) # Default for tables where no rows are returned
 
@@ -184,20 +190,20 @@ module Dynamoid
           hk  = tbl.hash_key.to_s
           rng = tbl.range_key.to_s
 
-          while ids.present? do
+          while ids.present?
             batch = ids.shift(Dynamoid::Config.batch_size)
 
-            request_items = Hash.new{|h, k| h[k] = []}
+            request_items = Hash.new { |h, k| h[k] = [] }
 
             keys = if rng.present?
-              Array(batch).map do |h, r|
-                { hk => h, rng => r }
-              end
-            else
-              Array(batch).map do |id|
-                { hk => id }
-              end
-            end
+                     Array(batch).map do |h, r|
+                       { hk => h, rng => r }
+                     end
+                   else
+                     Array(batch).map do |id|
+                       { hk => id }
+                     end
+                   end
 
             request_items[t] = {
               keys: keys
@@ -207,11 +213,7 @@ module Dynamoid
               request_items: request_items
             )
 
-            unless block_given?
-              results.data[:responses].each do |table, rows|
-                ret[table] += rows.collect { |r| result_item_to_hash(r) }
-              end
-            else
+            if block_given?
               batch_results = Hash.new([].freeze)
 
               results.data[:responses].each do |table, rows|
@@ -219,6 +221,10 @@ module Dynamoid
               end
 
               yield(batch_results, results.unprocessed_keys.present?)
+            else
+              results.data[:responses].each do |table, rows|
+                ret[table] += rows.collect { |r| result_item_to_hash(r) }
+              end
             end
 
             if results.unprocessed_keys.present?
@@ -227,9 +233,7 @@ module Dynamoid
           end
         end
 
-        unless block_given?
-          ret
-        end
+        ret unless block_given?
       end
 
       # Delete many items at once from DynamoDB. More efficient than delete each item individually.
@@ -237,7 +241,7 @@ module Dynamoid
       # @example Delete IDs 1 and 2 from the table testtable
       #   Dynamoid::AdapterPlugin::AwsSdk.batch_delete_item('table1' => ['1', '2'])
       # or
-      #   Dynamoid::AdapterPlugin::AwsSdkV2.batch_delete_item('table1' => [['hk1', 'rk2'], ['hk1', 'rk2']]]))
+      #   Dynamoid::AdapterPlugin::AwsSdkV3.batch_delete_item('table1' => [['hk1', 'rk2'], ['hk1', 'rk2']]]))
       #
       # @param [Hash] options the hash of tables and IDs to delete
       #
@@ -253,11 +257,11 @@ module Dynamoid
           table = describe_table(table_name)
 
           ids.each_slice(BATCH_WRITE_ITEM_REQUESTS_LIMIT) do |sliced_ids|
-            delete_requests = sliced_ids.map { |id|
-              {delete_request: {key: key_stanza(table, *id)}}
-            }
+            delete_requests = sliced_ids.map do |id|
+              { delete_request: { key: key_stanza(table, *id) } }
+            end
 
-            requests << {table_name => delete_requests}
+            requests << { table_name => delete_requests }
           end
         end
 
@@ -266,7 +270,8 @@ module Dynamoid
             client.batch_write_item(
               request_items: request_items,
               return_consumed_capacity: 'TOTAL',
-              return_item_collection_metrics: 'SIZE')
+              return_item_collection_metrics: 'SIZE'
+            )
           end
         rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
           raise Dynamoid::Errors::ConditionalCheckFailedException, e
@@ -330,10 +335,10 @@ module Dynamoid
           end
         end
         resp = client.create_table(client_opts)
-        options[:sync] = true if !options.has_key?(:sync) && ls_indexes.present? || gs_indexes.present?
+        options[:sync] = true if !options.key?(:sync) && ls_indexes.present? || gs_indexes.present?
         until_past_table_status(table_name, :creating) if options[:sync] &&
-            (status = PARSE_TABLE_STATUS.call(resp, :table_description)) &&
-            status == TABLE_STATUSES[:creating]
+                                                          (status = PARSE_TABLE_STATUS.call(resp, :table_description)) &&
+                                                          status == TABLE_STATUSES[:creating]
         # Response to original create_table, which, if options[:sync]
         #   may have an outdated table_description.table_status of "CREATING"
         resp
@@ -395,8 +400,8 @@ module Dynamoid
       def delete_table(table_name, options = {})
         resp = client.delete_table(table_name: table_name)
         until_past_table_status(table_name, :deleting) if options[:sync] &&
-            (status = PARSE_TABLE_STATUS.call(resp, :table_description)) &&
-            status == TABLE_STATUSES[:deleting]
+                                                          (status = PARSE_TABLE_STATUS.call(resp, :table_description)) &&
+                                                          status == TABLE_STATUSES[:deleting]
         table_cache.delete(table_name)
       rescue Aws::DynamoDB::Errors::ResourceInUseException => e
         Dynamoid.logger.error "Table #{table_name} cannot be deleted as it is in use"
@@ -422,12 +427,11 @@ module Dynamoid
       # @todo Provide support for various options http://docs.aws.amazon.com/sdkforruby/api/Aws/DynamoDB/Client.html#get_item-instance_method
       def get_item(table_name, key, options = {})
         options ||= {}
-        table    = describe_table(table_name)
+        table = describe_table(table_name)
         range_key = options.delete(:range_key)
 
         item = client.get_item(table_name: table_name,
-          key: key_stanza(table, key, range_key)
-        )[:item]
+                               key: key_stanza(table, key, range_key))[:item]
         item ? result_item_to_hash(item) : nil
       end
 
@@ -450,11 +454,10 @@ module Dynamoid
         raise "non-empty options: #{options}" unless options.empty?
         begin
           result = client.update_item(table_name: table_name,
-            key: key_stanza(table, key, range_key),
-            attribute_updates: iu.to_h,
-            expected: expected_stanza(conditions),
-            return_values: 'ALL_NEW'
-          )
+                                      key: key_stanza(table, key, range_key),
+                                      attribute_updates: iu.to_h,
+                                      expected: expected_stanza(conditions),
+                                      return_values: 'ALL_NEW')
           result_item_to_hash(result[:attributes])
         rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
           raise Dynamoid::Errors::ConditionalCheckFailedException, e
@@ -518,11 +521,11 @@ module Dynamoid
         hk    = (opts[:hash_key].present? ? opts.delete(:hash_key) : table.hash_key).to_s
         rng   = (opts[:range_key].present? ? opts.delete(:range_key) : table.range_key).to_s
         q     = opts.slice(
-                  :consistent_read,
-                  :scan_index_forward,
-                  :select,
-                  :index_name
-                )
+          :consistent_read,
+          :scan_index_forward,
+          :select,
+          :index_name
+        )
 
         opts.delete(:consistent_read)
         opts.delete(:scan_index_forward)
@@ -534,7 +537,7 @@ module Dynamoid
         scan_limit = opts.delete(:scan_limit)
         batch_size = opts.delete(:batch_size)
         exclusive_start_key = opts.delete(:exclusive_start_key)
-        limit = [record_limit, scan_limit, batch_size].compact.min        
+        limit = [record_limit, scan_limit, batch_size].compact.min
 
         key_conditions = {
           hk => {
@@ -543,8 +546,8 @@ module Dynamoid
           }
         }
 
-        opts.each_pair do |k, v|
-          next unless(op = RANGE_MAP[k])
+        opts.each_pair do |k, _v|
+          next unless (op = RANGE_MAP[k])
           key_conditions[rng] = {
             comparison_operator: op,
             attribute_value_list: attribute_value_list(op, opts.delete(k).freeze)
@@ -552,7 +555,7 @@ module Dynamoid
         end
 
         query_filter = {}
-        opts.reject {|k, _| k.in? RANGE_MAP.keys}.each do |attr, hash|
+        opts.reject { |k, _| k.in? RANGE_MAP.keys }.each do |attr, hash|
           query_filter[attr] = {
             comparison_operator: FIELD_MAP[hash.keys[0]],
             attribute_value_list: attribute_value_list(FIELD_MAP[hash.keys[0]], hash.values[0].freeze)
@@ -565,7 +568,7 @@ module Dynamoid
         q[:key_conditions] = key_conditions
         q[:query_filter]   = query_filter
 
-        Enumerator.new { |y|
+        Enumerator.new do |y|
           record_count = 0
           scan_count = 0
           loop do
@@ -600,13 +603,13 @@ module Dynamoid
             scan_count += results.scanned_count
             break if scan_limit && scan_count >= scan_limit
 
-            if(lk = results.last_evaluated_key)
+            if (lk = results.last_evaluated_key)
               q[:exclusive_start_key] = lk
             else
               break
             end
           end
-        }
+        end
       end
 
       # Scan the DynamoDB table. This is usually a very slow operation as it naively filters all data on
@@ -632,13 +635,13 @@ module Dynamoid
         request_limit = [record_limit, scan_limit, batch_size].compact.min
         request[:limit] = request_limit if request_limit
         request[:exclusive_start_key] = exclusive_start_key if exclusive_start_key
-        
+
         if scan_hash.present?
           request[:scan_filter] = scan_hash.reduce({}) do |memo, (attr, cond)|
             memo.merge(attr.to_s => {
-              comparison_operator: FIELD_MAP[cond.keys[0]],
-              attribute_value_list: attribute_value_list(FIELD_MAP[cond.keys[0]], cond.values[0].freeze)
-            })
+                         comparison_operator: FIELD_MAP[cond.keys[0]],
+                         attribute_value_list: attribute_value_list(FIELD_MAP[cond.keys[0]], cond.values[0].freeze)
+                       })
           end
         end
 
@@ -678,7 +681,7 @@ module Dynamoid
             break if scan_limit && scan_count >= scan_limit
 
             # Keep pulling if we haven't finished paging in all data
-            if(lk = results[:last_evaluated_key])
+            if (lk = results[:last_evaluated_key])
               request[:exclusive_start_key] = lk
             else
               break
@@ -715,14 +718,14 @@ module Dynamoid
         status = PARSE_TABLE_STATUS.call(resp)
         again = counter < Dynamoid::Config.sync_retry_max_times &&
                 status == TABLE_STATUSES[expect_status]
-        {again: again, status: status, counter: counter}
+        { again: again, status: status, counter: counter }
       end
 
       def until_past_table_status(table_name, status = :creating)
         counter = 0
         resp = nil
         begin
-          check = {again: true}
+          check = { again: true }
           while check[:again]
             sleep Dynamoid::Config.sync_retry_wait_seconds
             resp = client.describe_table(table_name: table_name)
@@ -756,7 +759,7 @@ module Dynamoid
       # Converts from symbol to the API string for the given data type
       # E.g. :number -> 'N'
       def api_type(type)
-        case(type)
+        case type
         when :string then STRING_TYPE
         when :number then NUM_TYPE
         when :binary then BINARY_TYPE
@@ -967,7 +970,7 @@ module Dynamoid
       def attribute_value_list(operator, value)
         # For BETWEEN and IN operators we should keep value as is (it should be already an array)
         # For all the other operators we wrap the value with array
-        if ["BETWEEN", "IN"].include?(operator)
+        if %w[BETWEEN IN].include?(operator)
           [value].flatten
         else
           [value]
@@ -993,13 +996,13 @@ module Dynamoid
         end
 
         def range_type
-          range_type ||= schema[:attribute_definitions].find { |d|
+          range_type ||= schema[:attribute_definitions].find do |d|
             d[:attribute_name] == range_key
-          }.try(:fetch, :attribute_type, nil)
+          end.try(:fetch, :attribute_type, nil)
         end
 
         def hash_key
-          @hash_key ||= schema[:key_schema].find { |d| d[:key_type] == HASH_KEY  }.try(:attribute_name).to_sym
+          @hash_key ||= schema[:key_schema].find { |d| d[:key_type] == HASH_KEY }.try(:attribute_name).to_sym
         end
 
         #
@@ -1024,7 +1027,9 @@ module Dynamoid
         attr_reader :table, :key, :range_key
 
         def initialize(table, key, range_key = nil)
-          @table = table; @key = key, @range_key = range_key
+          @table = table
+          @key = key
+          @range_key = range_key
           @additions = {}
           @deletions = {}
           @updates   = {}
@@ -1086,13 +1091,13 @@ module Dynamoid
           ret
         end
 
-        ADD    = 'ADD'.freeze
-        DELETE = 'DELETE'.freeze
-        PUT    = 'PUT'.freeze
+        ADD    = 'ADD'
+        DELETE = 'DELETE'
+        PUT    = 'PUT'
       end
 
       def sanitize_item(attributes)
-        attributes.reject do |k, v|
+        attributes.reject do |_k, v|
           v.nil? || ((v.is_a?(Set) || v.is_a?(String)) && v.empty?)
         end
       end