dynamoid_advanced_where 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0acc4dd6fd2beb8c36ce5ee16ac0a1e2a612e9f1f835ebab56d0d445bf026bbb
-  data.tar.gz: 0dbe226b9e1ef5037069b6af0133f72c20a64fd2fb9049648d015a58963cc43f
+  metadata.gz: 77c5c86c6aeccd5d5cd9db4a6e030a3527d17c87776fb05de5a06966699a1167
+  data.tar.gz: 02426eb629574d8bcd1ec7507c1f6795d0e3f22577ef54c21bf203351ccd81d3
 SHA512:
-  metadata.gz: bc34e3547aa649fed56dd816aea6998a70c8ca2d45a43eed56912f3215c41f7326b6e340bee29ca12b93e059cd135770d136383dd9e7e1f2be30a52a71ab1500
-  data.tar.gz: f58df477e8073f0792d5cc362c37dd4c3a78486aa4e4f3c3fe50ae72b62eb5f642b645308389d048dee03ed2279d29467034b938796a359dfcafea6577a08f99
+  metadata.gz: dcb79577e6f5e90cccb482e77d26614f7be1fe16bf265970441176fd794c0760107a994f444eabe9290151f5dfea9d8c263f359b663e7d5c87536a85540c38ac
+  data.tar.gz: 5e736cf0adaa648c1b088ddb938ce8a41080df77e243fe8cb0cb70fb561ae985582e3002c9078eed4d2ebd3284cccee30c657d9f24806082520f0055c5b22849

data/Appraisals

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 
-appraise "dynamoid-3.4" do
-  gem "dynamoid", "~> 3.4.0"
+appraise 'dynamoid-3.4' do
+  gem 'dynamoid', '~> 3.4.0'
 end
 
-appraise "dynamoid-latest" do
-  gem "dynamoid", "~> 3.0"
+appraise 'dynamoid-latest' do
+  gem 'dynamoid', '~> 3.0'
 end

data/Gemfile

@@ -1,9 +1,10 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in dynamoid-advanced-where.gemspec
 gemspec
 
 gem 'pry'
-

data/Gemfile.lock

@@ -1,103 +1,104 @@
 PATH
   remote: .
   specs:
-    dynamoid_advanced_where (1.2.0)
+    dynamoid_advanced_where (1.4.0)
       dynamoid (>= 3.2, < 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.3.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.1)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.408.0)
-    aws-sdk-core (3.110.0)
+    ast (2.4.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.482.0)
+    aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.58.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-dynamodb (1.62.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
-    bundler-audit (0.7.0.1)
+    bundler-audit (0.8.0)
       bundler (>= 1.2.0, < 3)
-      thor (>= 0.18, < 2)
-    childprocess (4.0.0)
+      thor (~> 1.0)
+    childprocess (4.1.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    dynamoid (3.6.0)
+    dynamoid (3.7.1)
       activemodel (>= 4)
       aws-sdk-dynamodb (~> 1.0)
       concurrent-ruby (>= 1.0)
-    fasterer (0.8.3)
+    fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jmespath (1.4.0)
     method_source (1.0.0)
-    minitest (5.14.2)
-    overcommit (0.57.0)
+    minitest (5.14.4)
+    overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
+      rexml (~> 3.2)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (10.5.0)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.6.1)
+    rspec-support (3.10.2)
+    rubocop (1.18.4)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    ruby_parser (3.15.0)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.1)
-    thor (1.0.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS

data/README.md

@@ -249,6 +249,23 @@ if it successfully updates. If it fails to update, it will return nil.
 If the specified hash key, or hash/range key combination is not already present
 it will be inserted with the desired mutations (if possible).
 
+### Referencing a field
+To identify the field to be updated, either through set, increment, decrement, or append you may just use the field name
+for top level keys. When you use the top level single symbol key DAW will use the built in Dynamoid dumper.
+
+If you need to reference the sub-key of a map, or custom serialized object you may pass an array of keys. Since DAW
+looses context to the "type" it is up to you to ensure you are writing out the correct values. The only exception to 
+this is if you are set the field to a class which implements `dynamoid_dump`.
+
+#### Example
+```ruby
+Model.where{ conditions }.batch_update
+  .set_values([:map_or_custom_type, :sub_field, :foo] => 'value', [:map_or_custom_type2, :foo] => MyDumpableClass.new(test))
+  .increment([:some_map, :attempts], by: 1)
+  .decrement([:some_map, :attempts_remaining], by: 1)
+  .apply(hash_key, range_key)
+```
+
 ### Setting a single field
 The batch updated method `set_values(attr_name: new_attr_value, other_atter: val)`
 

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/dynamoid_advanced_where.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dynamoid_advanced_where/version'
@@ -30,12 +32,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dynamoid', '>= 3.2', '< 4'
 
-  spec.add_development_dependency 'bundler-audit'
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '>= 1.16'
+  spec.add_development_dependency 'bundler-audit'
   spec.add_development_dependency 'fasterer'
   spec.add_development_dependency 'overcommit'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'appraisal'
 end

data/gemfiles/dynamoid_3.4.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"
-gem "dynamoid", "~> 3.4.0"
+gem 'dynamoid', '~> 3.4.0'
+gem 'pry'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/dynamoid_3.5.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"
-gem "dynamoid", "~> 3.5.0"
+gem 'dynamoid', '~> 3.5.0'
+gem 'pry'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/dynamoid_3.6.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"
-gem "dynamoid", "~> 3.6.0"
+gem 'dynamoid', '~> 3.6.0'
+gem 'pry'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/dynamoid_latest.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"
-gem "dynamoid", "~> 3.0"
+gem 'dynamoid', '~> 3.0'
+gem 'pry'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/dynamoid_master.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"
-gem "dynamoid", git: "https://github.com/Dynamoid/dynamoid.git"
+gem 'dynamoid', git: 'https://github.com/Dynamoid/dynamoid.git'
+gem 'pry'
 
-gemspec path: "../"
+gemspec path: '../'

data/lib/dynamoid_advanced_where/batched_updater.rb

@@ -5,6 +5,7 @@ module DynamoidAdvancedWhere
     DEEP_MERGE_ATTRIBUTES = %i[expression_attribute_names expression_attribute_values].freeze
 
     attr_accessor :query_builder, :_set_values, :_array_appends, :_set_appends, :_increments
+
     delegate :klass, to: :query_builder
 
     def initialize(query_builder:)
@@ -86,7 +87,7 @@ module DynamoidAdvancedWhere
       filter = merge_multiple_sets(
         [
           field_update_arguments,
-          add_update_args,
+          add_update_args
         ],
         result_base: filter_builder.to_scan_filter,
       )
@@ -129,11 +130,10 @@ module DynamoidAdvancedWhere
 
       _set_values.each_with_object(builder_hash) do |(k, v), h|
         prefix = merge_in_attr_placeholders(h, k, v)
-        h[:collected_update_expression] << "##{prefix} = :#{prefix}"
+        h[:collected_update_expression] << "#{prefix[0]} = :#{prefix[1]}"
       end
     end
 
-
     def increment_field_updates
       return {} if _increments.empty?
 
@@ -148,7 +148,7 @@ module DynamoidAdvancedWhere
 
       _increments.each_with_object(builder_hash) do |(field, change), h|
         prefix = merge_in_attr_placeholders(h, field, change)
-        builder_hash[:collected_update_expression] << "##{prefix} = if_not_exists(##{prefix}, :#{zero_prefix}) + :#{prefix}"
+        builder_hash[:collected_update_expression] << "#{prefix[0]} = if_not_exists(#{prefix[0]}, :#{zero_prefix}) + :#{prefix[1]}"
       end
     end
 
@@ -158,7 +158,7 @@ module DynamoidAdvancedWhere
       _set_appends.each_with_object(builder_hash) do |to_append, h|
         to_append.each do |k, v|
           prefix = merge_in_attr_placeholders(h, k, v)
-          builder_hash[:collected_update_expression] << "##{prefix} :#{prefix}"
+          builder_hash[:collected_update_expression] << "#{prefix[0]} :#{prefix[1]}"
         end
       end
     end
@@ -176,7 +176,7 @@ module DynamoidAdvancedWhere
       update_args = _array_appends.each_with_object(builder_hash) do |to_append, h|
         to_append.each do |k, v|
           prefix = merge_in_attr_placeholders(h, k, v)
-          builder_hash[:collected_update_expression] << "##{prefix}  = list_append(if_not_exists(##{prefix}, :#{empty_list_prefix}), :#{prefix})"
+          builder_hash[:collected_update_expression] << "#{prefix[0]}  = list_append(if_not_exists(#{prefix[0]}, :#{empty_list_prefix}), :#{prefix[1]})"
         end
       end
 
@@ -184,7 +184,7 @@ module DynamoidAdvancedWhere
     end
 
     def merge_in_attr_placeholders(hsh, field_name, value)
-      prefix, new_data = prefixerize(field_name, value)
+      *prefix, new_data = prefixerize(field_name, value)
 
       hsh.merge!(new_data, &method(:hash_extendeer))
 
@@ -192,14 +192,20 @@ module DynamoidAdvancedWhere
     end
 
     def prefixerize(field_name, value)
+      field_names = field_name.is_a?(Array) ? field_name : [field_name]
       prefix = SecureRandom.hex
 
+      update_target = field_names.each_with_index.map do |name, idx|
+        ["##{prefix}#{idx}", name]
+      end
+
       [
+        update_target.map(&:first).join('.').to_s,
         prefix,
         {
-          expression_attribute_names: { "##{prefix}" => field_name },
+          expression_attribute_names: Hash[update_target],
           expression_attribute_values: {
-            ":#{prefix}" => dump(value, klass.attributes[field_name])
+            ":#{prefix}" => dump(value, field_name)
           }
         }
       ]
@@ -222,8 +228,15 @@ module DynamoidAdvancedWhere
       )
     end
 
-    def dump(value, config)
-      Dynamoid::Dumping.dump_field(value, config)
+    def dump(value, field_name)
+      if klass.attributes[field_name]
+        Dynamoid::Dumping.dump_field(value, klass.attributes[field_name])
+      elsif value.respond_to?(:dynamoid_dump)
+        value.dynamoid_dump
+      else
+        value
+
+      end
     end
   end
 end

data/lib/dynamoid_advanced_where/integrations/model.rb

@@ -31,4 +31,4 @@ module DynamoidAdvancedWhere
   end
 end
 
-Dynamoid::Document.send(:include, DynamoidAdvancedWhere::Integrations::Model)
+Dynamoid::Document.include DynamoidAdvancedWhere::Integrations::Model

data/lib/dynamoid_advanced_where/nodes/and_node.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 module DynamoidAdvancedWhere
   module Nodes
     module Concerns

data/lib/dynamoid_advanced_where/nodes/base_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module DynamoidAdvancedWhere
@@ -15,4 +17,3 @@ module DynamoidAdvancedWhere
     end
   end
 end
-

data/lib/dynamoid_advanced_where/nodes/exists_node.rb

@@ -10,6 +10,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsLogicalOr
 
       attr_accessor :field_node, :prefix
+
       def initialize(field_node:)
         self.field_node = field_node
         self.prefix = SecureRandom.hex

data/lib/dynamoid_advanced_where/nodes/field_node.rb

@@ -20,9 +20,7 @@ module DynamoidAdvancedWhere
             config.respond_to?(:call) ? config.call(attr_config) : config <= attr_config
           end&.last
 
-          unless specific_klass
-            raise ArgumentError, "unable to find field type for `#{attr_config}`"
-          end
+          raise ArgumentError, "unable to find field type for `#{attr_config}`" unless specific_klass
 
           specific_klass.new(field_path: field_path)
         end
@@ -63,6 +61,7 @@ module DynamoidAdvancedWhere
     class StringAttributeNode < FieldNode
       include Concerns::SupportsIncludes
     end
+
     class NativeBooleanAttributeNode < FieldNode; end
 
     class StringBooleanAttributeNode < FieldNode
@@ -91,9 +90,10 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsGreaterThan
 
       def parse_right_hand_side(val)
-        if val.is_a?(Date)
+        case val
+        when Date
           val.to_time.to_i
-        elsif val.is_a?(Time)
+        when Time
           val.to_f
         else
           raise ArgumentError, "unable to compare datetime to type #{val.class}"
@@ -105,9 +105,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsGreaterThan
 
       def parse_right_hand_side(val)
-        if !val.is_a?(Date) || val.is_a?(DateTime)
-          raise ArgumentError, "unable to compare date to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare date to type #{val.class}" if !val.is_a?(Date) || val.is_a?(DateTime)
 
         (val - Dynamoid::Persistence::UNIX_EPOCH_DATE).to_i
       end
@@ -117,9 +115,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(String)
-          raise ArgumentError, "unable to compare date to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare date to type #{val.class}" unless val.is_a?(String)
 
         val
       end
@@ -129,9 +125,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(Integer)
-          raise ArgumentError, "unable to compare integer value to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare integer value to type #{val.class}" unless val.is_a?(Integer)
 
         val
       end
@@ -141,9 +135,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(String)
-          raise ArgumentError, "unable to compare string to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare string to type #{val.class}" unless val.is_a?(String)
 
         val
       end
@@ -153,9 +145,7 @@ module DynamoidAdvancedWhere
       include Concerns::SupportsIncludes
 
       def parse_right_hand_side(val)
-        unless val.is_a?(Integer)
-          raise ArgumentError, "unable to compare integer to type #{val.class}"
-        end
+        raise ArgumentError, "unable to compare integer to type #{val.class}" unless val.is_a?(Integer)
 
         val
       end

data/lib/dynamoid_advanced_where/nodes/greater_than_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class GreaterThanNode < OperationNode

data/lib/dynamoid_advanced_where/nodes/includes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class IncludesNode < OperationNode

data/lib/dynamoid_advanced_where/nodes/literal_node.rb

@@ -6,6 +6,7 @@ module DynamoidAdvancedWhere
   module Nodes
     class LiteralNode
       attr_accessor :value, :attr_prefix
+
       def initialize(value)
         self.value = value
         self.attr_prefix = SecureRandom.hex

data/lib/dynamoid_advanced_where/nodes/not.rb

@@ -37,6 +37,5 @@ module DynamoidAdvancedWhere
         "NOT(#{sub_node.to_expression})"
       end
     end
-
   end
 end

data/lib/dynamoid_advanced_where/nodes/or_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
   module Nodes
     class OrNode < BaseNode

data/lib/dynamoid_advanced_where/nodes/root_node.rb

@@ -40,7 +40,7 @@ module DynamoidAdvancedWhere
                             instance_eval(&blk)
                           else
                             blk.call(self)
-                       end
+                          end
       end
     end
   end

data/lib/dynamoid_advanced_where/nodes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './nodes/base_node'
 require_relative './nodes/field_node'
 require_relative './nodes/literal_node'

data/lib/dynamoid_advanced_where/query_builder.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 require_relative './nodes'
 require_relative './query_materializer'
 require_relative './batched_updater'
 
 module DynamoidAdvancedWhere
   class QueryBuilder
-    attr_accessor :klass, :root_node, :start_hash
+    attr_accessor :klass, :root_node, :start_hash, :record_limit
 
-    delegate :all, :each, to: :query_materializer
+    delegate :all, :each_page, :each, to: :query_materializer
 
-    def initialize(klass:, start_hash: nil, root_node: nil, &blk)
+    def initialize(klass:, record_limit: nil, start_hash: nil, root_node: nil, &blk)
       self.klass = klass
       self.root_node = root_node || Nodes::RootNode.new(klass: klass, &blk)
       self.start_hash = start_hash
+      self.record_limit = record_limit
 
       freeze
     end
@@ -46,10 +49,26 @@ module DynamoidAdvancedWhere
     end
     alias and where
 
+    def limit(value)
+      dup_with_changes(record_limit: value)
+    end
+
     def start(key_hash)
       return self if key_hash.nil? || key_hash.empty?
 
-      self.class.new(klass: klass, start_hash: key_hash, root_node: root_node)
+      dup_with_changes(start_hash: key_hash)
+    end
+
+    alias to_a all
+
+    private
+
+    def dup_with_changes(**changes)
+      self.class.new(**{
+        klass: klass,
+        start_hash: start_hash,
+        root_node: root_node
+      }.merge(changes))
     end
   end
 end

data/lib/dynamoid_advanced_where/query_materializer.rb

@@ -51,6 +51,8 @@ module DynamoidAdvancedWhere
         table_name: table_name
       }.merge(filter_builder.to_query_filter)
 
+      query[:limit] = query_builder.record_limit if query_builder.record_limit
+
       page_start = start_hash
 
       Enumerator.new do |yielder|
@@ -63,7 +65,11 @@ module DynamoidAdvancedWhere
 
           yielder.yield(items, results)
 
-          (page_start = results.last_evaluated_key) || break
+          query[:limit] = query[:limit] - results.items.length if query[:limit]
+
+          break if results.last_evaluated_key.nil? || query[:limit]&.zero?
+
+          (page_start = results.last_evaluated_key)
         end
       end.lazy
     end
@@ -73,6 +79,8 @@ module DynamoidAdvancedWhere
         table_name: table_name
       }.merge(filter_builder.to_scan_filter)
 
+      query[:limit] = query_builder.record_limit if query_builder.record_limit
+
       page_start = start_hash
 
       Enumerator.new do |yielder|
@@ -85,7 +93,11 @@ module DynamoidAdvancedWhere
 
           yielder.yield(items, results)
 
-          (page_start = results.last_evaluated_key) || break
+          query[:limit] = query[:limit] - results.items.length if query[:limit]
+
+          break if results.last_evaluated_key.nil? || query[:limit]&.zero?
+
+          (page_start = results.last_evaluated_key)
         end
       end.lazy
     end

data/lib/dynamoid_advanced_where/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DynamoidAdvancedWhere
-  VERSION = "1.2.0"
+  VERSION = '1.4.0'
 end

data/lib/dynamoid_advanced_where.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'dynamoid'
 
-require "dynamoid_advanced_where/version"
-require "dynamoid_advanced_where/integrations/model"
+require 'dynamoid_advanced_where/version'
+require 'dynamoid_advanced_where/integrations/model'
 
 module DynamoidAdvancedWhere
-      # Your code goes here...
+  # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid_advanced_where
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynamoid
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +142,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: things
 email:
 - bmalinconico@terminus.com