dynamoid_advanced_where 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239094fa5509e994cefa186a296b6f00bbc7a13913ea67803f82f173e6aea82a
-  data.tar.gz: cb46ded36d28fc09b54ea3b1598c34e2172232824056c9b6462f846f491e9673
+  metadata.gz: 65c24edd4faee3078a0e07e8ae9fb25ed11e4a5e4902c4f1bb450c8f52b06ce2
+  data.tar.gz: d4cc130e24982769928c7b5e0bd43c1c0bf548423a3117d5f31e8dbbc956eb68
 SHA512:
-  metadata.gz: bce42bfde6205d3a63ea557b0624391170f586220247fc3c7ab17a1203eb6876d4356b6758a41df0756ea9de07ee06b29ce84ba4c40b516143a803d2d361a9cc
-  data.tar.gz: 633267b36adc9112e67aa8c541946d4ce9a56821d68aa339af211c5ffa400c6b6491b188e33f1dcda01ebd4ea32842fffcde432a783687d14080fc589beecb52
+  metadata.gz: 5a1090f0f7f56bec722d10554b502763c9b088d68b9b14392b1cc8a44f36807a942c4f0bb0d2f12c42f697de08f2567c0f813ed9f44016c5ca9dc373fc800ad4
+  data.tar.gz: 3e4413331e652b825035b38712187e9b8115d7595616d51a0b945c7ba91c4a1bf2d1e0bdc2aa77def5ed558244fb9004c8951e2f1bde59dd78ee7523e756363b

data/.github/workflows/test.yml

@@ -11,8 +11,9 @@ jobs:
       matrix:
         ruby:
           - 3.0.4
-          - 2.7.6
           - 3.1.2
+          - 3.2.5
+          - 3.3.5
     services:
       dynamodb:
         image: amazon/dynamodb-local

data/Gemfile.lock

@@ -1,18 +1,23 @@
 PATH
   remote: .
   specs:
-    dynamoid_advanced_where (1.6.0)
+    dynamoid_advanced_where (1.8.0)
       dynamoid (>= 3.2, < 4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.1.4)
+      activesupport (= 7.1.4)
+    activesupport (7.1.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
@@ -21,29 +26,33 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.743.0)
-    aws-sdk-core (3.171.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.981.0)
+    aws-sdk-core (3.209.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-dynamodb (1.83.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.2)
+    aws-sdk-dynamodb (1.125.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     childprocess (4.1.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
-    diff-lcs (1.5.0)
-    dynamoid (3.8.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    dynamoid (3.10.0)
       activemodel (>= 4)
       aws-sdk-dynamodb (~> 1.0)
       concurrent-ruby (>= 1.0)
@@ -51,13 +60,14 @@ GEM
       colorize (~> 0.7)
       ruby_parser (>= 3.19.1)
     hashdiff (1.0.1)
-    i18n (1.12.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jmespath (1.6.2)
     json (2.6.2)
     method_source (1.0.0)
-    minitest (5.18.0)
+    minitest (5.25.1)
+    mutex_m (0.2.0)
     overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
@@ -73,19 +83,19 @@ GEM
     rake (10.5.0)
     regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)

data/README.md

@@ -188,6 +188,9 @@ Provided methods
 
 `.start({ some_hash_key: some_value })` takes a hash argument that must match the key structure of the table (range key must be specified where valid). If passed an empty hash, results will start from the beginning of the table. Records before the specified start key will not be scanned or returned. This is useful when doing manual pagination.
 
+### Scaning backwards
+`.scan_index_forward(false)` takes a boolean argument to indicate a query should be performed backwards. Errors if your query ends up scanning it will throw an error.
+
 ### Scan vs Query
 DAW will automatically preform a query when it determines it is possible,
 however if a query is determined to not be appropriate, a scan will be conduced

data/lib/dynamoid_advanced_where/query_builder.rb

@@ -6,16 +6,17 @@ require_relative './batched_updater'
 
 module DynamoidAdvancedWhere
   class QueryBuilder
-    attr_accessor :klass, :root_node, :start_hash, :record_limit, :projected_fields
+    attr_accessor :klass, :root_node, :start_hash, :record_limit, :projected_fields, :scanning_index_forward
 
     delegate :all, :each_page, :each, to: :query_materializer
 
-    def initialize(klass:, projected_fields: [], record_limit: nil, start_hash: nil, root_node: nil, &blk)
+    def initialize(klass:, projected_fields: [], record_limit: nil, start_hash: nil, root_node: nil, scanning_index_forward: true, &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
       self.projected_fields = projected_fields
+      self.scanning_index_forward = scanning_index_forward
 
       freeze
     end
@@ -58,6 +59,10 @@ module DynamoidAdvancedWhere
       dup_with_changes(record_limit: value)
     end
 
+    def scan_index_forward(value)
+      dup_with_changes(scanning_index_forward: value)
+    end
+
     def start(key_hash)
       return self if key_hash.nil? || key_hash.empty?
 
@@ -74,6 +79,7 @@ module DynamoidAdvancedWhere
         start_hash: start_hash,
         root_node: root_node,
         projected_fields: projected_fields,
+        scanning_index_forward: scanning_index_forward,
       }.merge(changes))
     end
   end

data/lib/dynamoid_advanced_where/query_materializer.rb

@@ -54,32 +54,34 @@ module DynamoidAdvancedWhere
 
       query[:limit] = query_builder.record_limit if query_builder.record_limit
 
-      page_start = start_hash
+      query[:exclusive_start_key] = start_hash
 
       Enumerator.new do |yielder|
         loop do
-          query[:exclusive_start_key] = page_start
           results = yield(query)
 
-          items = (results.items || []).map do |item|
-            klass.from_database(item.symbolize_keys)
-          end
-
-          yielder.yield(items, results)
+          yielder.yield(construct_items(results.items), results)
 
           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)
+          query[:exclusive_start_key] = results.last_evaluated_key
         end
       end.lazy
     end
 
+    def construct_items(items)
+      (items || []).map do |item|
+        klass.from_database(item)
+      end
+    end
+
     def each_page_via_query
       query = {
         table_name: table_name,
         index_name: selected_index_for_query,
+        scan_index_forward: query_builder.scanning_index_forward,
       }.merge(filter_builder.to_query_filter)
 
       enumerate_results(query) do |q|
@@ -88,6 +90,8 @@ module DynamoidAdvancedWhere
     end
 
     def each_page_via_scan
+      raise 'Unable to scan a table backwards' unless query_builder.scanning_index_forward
+
       query = {
         table_name: table_name,
       }.merge(filter_builder.to_scan_filter)

data/lib/dynamoid_advanced_where/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamoidAdvancedWhere
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamoid_advanced_where
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynamoid