dynamoid_advanced_where 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a830c51235f4fec181d2c9b6a5308f55015c23aea40be329dfecaa023f561b37
-  data.tar.gz: 95af2de8d86ad0de5ff9925591d5d161bdc3226c5b955544cfce32595c7297c6
+  metadata.gz: 239094fa5509e994cefa186a296b6f00bbc7a13913ea67803f82f173e6aea82a
+  data.tar.gz: cb46ded36d28fc09b54ea3b1598c34e2172232824056c9b6462f846f491e9673
 SHA512:
-  metadata.gz: 9f90439b8db774d0aae74bd08ee096b9a9fbd091b61e07e01d4b470b77f6f8de78fc52b296cf2625fd42c40b81be0b230402c378c46f1358459ffd6ddfe58036
-  data.tar.gz: c6f26e04f8be1dab29bc4f909fe04ae0afeaf27abc2f60515102822c13ac7690708545d1d43f14f9487acc860b77162e4618da9542d86be8f4e0d7bee289e947
+  metadata.gz: bce42bfde6205d3a63ea557b0624391170f586220247fc3c7ab17a1203eb6876d4356b6758a41df0756ea9de07ee06b29ce84ba4c40b516143a803d2d361a9cc
+  data.tar.gz: 633267b36adc9112e67aa8c541946d4ce9a56821d68aa339af211c5ffa400c6b6491b188e33f1dcda01ebd4ea32842fffcde432a783687d14080fc589beecb52

data/lib/dynamoid_advanced_where/query_builder.rb

@@ -6,15 +6,16 @@ require_relative './batched_updater'
 
 module DynamoidAdvancedWhere
   class QueryBuilder
-    attr_accessor :klass, :root_node, :start_hash, :record_limit
+    attr_accessor :klass, :root_node, :start_hash, :record_limit, :projected_fields
 
     delegate :all, :each_page, :each, to: :query_materializer
 
-    def initialize(klass:, record_limit: nil, start_hash: nil, root_node: nil, &blk)
+    def initialize(klass:, projected_fields: [], 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
+      self.projected_fields = projected_fields
 
       freeze
     end
@@ -49,6 +50,10 @@ module DynamoidAdvancedWhere
     end
     alias and where
 
+    def project(*fields)
+      dup_with_changes(projected_fields: projected_fields + fields)
+    end
+
     def limit(value)
       dup_with_changes(record_limit: value)
     end
@@ -68,6 +73,7 @@ module DynamoidAdvancedWhere
         klass: klass,
         start_hash: start_hash,
         root_node: root_node,
+        projected_fields: projected_fields,
       }.merge(changes))
     end
   end

data/lib/dynamoid_advanced_where/query_materializer.rb

@@ -44,11 +44,13 @@ module DynamoidAdvancedWhere
       end
     end
 
-    def each_page_via_query
-      query = {
-        table_name: table_name,
-        index_name: selected_index_for_query,
-      }.merge(filter_builder.to_query_filter)
+    def enumerate_results(starting_query)
+      query = starting_query.dup
+
+      unless query_builder.projected_fields.empty?
+        query[:select] = 'SPECIFIC_ATTRIBUTES'
+        query[:projection_expression] = query_builder.projected_fields.map(&:to_s).join(',')
+      end
 
       query[:limit] = query_builder.record_limit if query_builder.record_limit
 
@@ -56,7 +58,8 @@ module DynamoidAdvancedWhere
 
       Enumerator.new do |yielder|
         loop do
-          results = client.query(query.merge(exclusive_start_key: page_start))
+          query[:exclusive_start_key] = page_start
+          results = yield(query)
 
           items = (results.items || []).map do |item|
             klass.from_database(item.symbolize_keys)
@@ -73,32 +76,25 @@ module DynamoidAdvancedWhere
       end.lazy
     end
 
-    def each_page_via_scan
+    def each_page_via_query
       query = {
         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|
-        loop do
-          results = client.scan(query.merge(exclusive_start_key: page_start))
-
-          items = (results.items || []).map do |item|
-            klass.from_database(item.symbolize_keys)
-          end
-
-          yielder.yield(items, results)
+        index_name: selected_index_for_query,
+      }.merge(filter_builder.to_query_filter)
 
-          query[:limit] = query[:limit] - results.items.length if query[:limit]
+      enumerate_results(query) do |q|
+        client.query(q)
+      end
+    end
 
-          break if results.last_evaluated_key.nil? || query[:limit]&.zero?
+    def each_page_via_scan
+      query = {
+        table_name: table_name,
+      }.merge(filter_builder.to_scan_filter)
 
-          (page_start = results.last_evaluated_key)
-        end
-      end.lazy
+      enumerate_results(query) do |q|
+        client.scan(q)
+      end
     end
 
     def filter_builder

data/lib/dynamoid_advanced_where/version.rb

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

metadata

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