s3arch 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd57db198f9598324792e16e5b84e9c22914ebfdfd4fddeb09fc99641458322c
-  data.tar.gz: e107d35cd4b7084d3cf90e3d014bb4fe3c6089475b26419524d9132867565592
+  metadata.gz: 5b5d2b31636cdd8dd3d02bfd8140a82263f462207bf80525ef55167e1267a057
+  data.tar.gz: 8cfa541ae296debeb4ca01737673733805b81268a415280241a57eaba1f22821
 SHA512:
-  metadata.gz: 65aba03e3064bf597dc8bb4e53d7552c07f0b89ebb7ca24b9e6c74a7f5c22f9c95746cec237d1e100fce63cb8f285f782487300abd7f4d1b6e1c76553fdad5ff
-  data.tar.gz: 28f5d435ce384c0c1c8e05d17d478ad9fdb9e0a949506350384886fdfcedbfaa2cbd9308dfd08d2faf91dfe4bf02ac07ac6d6749470143914a977f29ab0aef04
+  metadata.gz: fd0c3fabee28274d50d46951fde563bc9196263d59174ee87047bdb8a06d7ae1ee7964ae82d431c6c22ee875e40512918a01c6110292d0a0d06c89e54201e25e
+  data.tar.gz: '008755884d519604931a7ccfebff4492c0308900230d5e9cd535aa452afb9e7a48d9274c04b15867b2bfd3bbe031aeb2ae08d1c2b6ffdf8759a7a90518ce7b60'

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.0.4] - 2025-06-09
+
+### Fixed
+
+- `Indexer#fetch_records` now uses `expression_attribute_names` for DynamoDB reserved words (e.g., `status`), fixing `ValidationException` on `rebuild()`
+
+### Added
+
+- `Configuration#filter_fields` — declare which fields the `record_filter` proc needs projected from DynamoDB
+
+### Removed
+
+- Hardcoded `filter_fields` method (`%w[status bin_id]`) — replaced by configurable `filter_fields`
+
 ## [0.0.2] - 2025-06-08
 
 ### Added

data/lib/s3arch/configuration.rb

@@ -30,6 +30,9 @@ module S3arch
     # Filter proc — receives a record hash, returns true to include in index
     attr_accessor :record_filter
 
+    # Fields needed by the record_filter for projection (e.g., %w[status])
+    attr_accessor :filter_fields
+
     # Owner extractor — proc that extracts owner_id from a DynamoDB stream record
     attr_accessor :owner_extractor
 
@@ -45,6 +48,7 @@ module S3arch
       @token_field = 'searchTokens'
       @metadata_fields = %w[status created_at]
       @record_filter = ->(_record) { true }
+      @filter_fields = %w[status]
       @owner_extractor = lambda { |stream_record|
         image = stream_record.dig('dynamodb', 'NewImage') || stream_record.dig('dynamodb', 'OldImage') || {}
         image.dig(owner_key, 'S')

data/lib/s3arch/indexer.rb

@@ -4,7 +4,6 @@ require 'aws-sdk-dynamodb'
 require 'aws-sdk-s3'
 require 'sqlite3'
 require 'json'
-
 module S3arch
   # Builds SQLite FTS5 databases per owner from pre-computed tokens stored in DynamoDB.
   # The indexer never sees raw content — only tokens. Supports incremental updates via
@@ -80,6 +79,8 @@ module S3arch
       { statusCode: 200, body: JSON.generate(rebuilt: grouped.size) }
     end
 
+    RESERVED_WORDS = Set.new(%w[status name comment count size type]).freeze
+
     private
 
     def group_changes(sqs_records)
@@ -244,11 +245,7 @@ module S3arch
     # Full rebuild: fetches token field from DynamoDB (never reads content)
     def fetch_records(owner_id)
       records = []
-      fields_to_project = ['id', @config.token_field, @config.owner_key] + @config.metadata_fields + filter_fields
-      params = { table_name: @config.source_table, index_name: @config.source_index,
-                 key_condition_expression: "#{@config.owner_key} = :owner",
-                 expression_attribute_values: { ':owner' => owner_id },
-                 projection_expression: fields_to_project.uniq.join(', ') }
+      params = build_query_params(owner_id)
 
       loop do
         result = @dynamodb.query(params)
@@ -268,17 +265,29 @@ module S3arch
       records
     end
 
-    def extract_meta_from_item(item)
-      @config.metadata_fields.to_h do |field|
-        [field, item[field].to_s]
-      end
+    def build_query_params(owner_id)
+      fields = (['id', @config.token_field, @config.owner_key] +
+                @config.metadata_fields + @config.filter_fields).uniq
+      expression_names = {}
+      projected = fields.map { |f| reserved_word?(f) ? "##{f}".tap { |p| expression_names[p] = f } : f }
+
+      owner_placeholder = reserved_word?(@config.owner_key) ? "##{@config.owner_key}" : @config.owner_key
+      expression_names["##{@config.owner_key}"] = @config.owner_key if reserved_word?(@config.owner_key)
+
+      params = { table_name: @config.source_table, index_name: @config.source_index,
+                 key_condition_expression: "#{owner_placeholder} = :owner",
+                 expression_attribute_values: { ':owner' => owner_id },
+                 projection_expression: projected.join(', ') }
+      params[:expression_attribute_names] = expression_names if expression_names.any?
+      params
     end
 
-    def filter_fields
-      # Fields needed by the record_filter (best-effort — add status/bin_id for default filter)
-      %w[status bin_id]
+    def extract_meta_from_item(item)
+      @config.metadata_fields.to_h { |field| [field, item[field].to_s] }
     end
 
+    def reserved_word?(field) = RESERVED_WORDS.include?(field.downcase)
+
     def build_database(db_path, records)
       FileUtils.rm_f(db_path)
       db = SQLite3::Database.new(db_path)

data/lib/s3arch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module S3arch
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3arch
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Dalton

metadata.gz.sig

@@ -1 +1,2 @@
-Oco�
2��I�?D����0�̌��\�z,V��i���جԻX���f���f��$^�o������+"3�R�04q$�#`7���?���E�MF�A�	�x���f�����]���~j�]�/�IK�Dz#ni��B[XS������m��%��jQ+�a��_Ghf�a�J�"(o�~|I��y�&��kXڈL �Ϟ�j�Y�<��C���e�:�Pø�A��2X�P��)����nxL�y�<�L��je�L7���|������_�pG��p�nfPw���P_+�$�N�e�8�!����2�ա�̕g0#����WEdp�8��0�v�#_\G�^lU���(2jǨ��@�o^)��x�R%3���x���|��=���Ǻ
+�٣��b���A��t��1<ۈճ;w�@��^�����(,Z��\�r����XZƠ��B���:DewV�ԭ�h���x�KNI��%,`�Tf��8C��@��r;f��l}�7F�==T�V��b/!MP��ι[̦	@�ȁ��<�t�R���ȜX�u
u�d�H��k�T��!��A�N~�_���^atOZ�p%h�{�n���fMT�Y_�'g��=�#���/���6!��TS(�|�
l����7ݸ���{��
+��e~ʞ���uE���BG�S�7����ݼ�����*�q=�6r�_r��Q�P�|g�]�V]j��+ˍ���Qú�.B�������r