activeitem 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976cb7f41429d4ca2489b0a67a87f39ca3720bc223b02ad9c1d4e2e244f6a700
-  data.tar.gz: e5c0fd6be8a2ea1ccfc00793942d91973e53b9d434fec9b67e92b8da9660049d
+  metadata.gz: a7d5990fc9c0532dc9a65f803bd9886c1769dc2b4c3071fd4748c079fa7559b3
+  data.tar.gz: 1c480246c6a898502eacedda1b456e003f54910a3f8562893cc5c070c06f168e
 SHA512:
-  metadata.gz: de5d8d0d4f7b6a986369e0604eec719dd686537009967b00302543abc507db28298b65222cb85e5fb22f9ee7e86568ec4934dc2f761956b6f880d89a74ad5456
-  data.tar.gz: 160ca85fad18fcd70b5650f274077c2a8fc841f6943b6d601a1effc13408c74ce037593c25dc6a58b4aa0a04f465b1616159719416d710e77fd10e1a2a134737
+  metadata.gz: db67b991fe6c8c9ed9ce18a362dc15dfd9f1b46c63ed20a49e8b1f82bf0bb2dfe3738b1e2f7d7b29a31396e61d40ee3e6d528393b01a93a92bf81c2e9d9f234b
+  data.tar.gz: dc5a3c76df184f02bf6fa4f0cd040e9a98e42729326f35243b198fc2d7c8ae4e4a86429bdc457be7f7e9198892ba93aaddf5a4d5650806afcba6cb528d6d54e7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.0.22
+
+### Changed
+
+- **Scoped `find` on associations** — `Relation#find(id)` now enforces association scope, matching Rails behavior. When called on an association (e.g., `@project.epics.find(id)`), it validates that the found record belongs to the association before returning it. If the record exists but belongs to a different parent, `ActiveItem::RecordNotFound` is raised. This prevents accidentally accessing records outside the association scope.
+
+  ```ruby
+  # Before: would return the epic even if it belonged to a different project
+  @project.epics.find(epic_id)
+
+  # After: raises RecordNotFound if epic.project_id != @project.id
+  @project.epics.find(epic_id)
+  ```
+
 ## 0.0.21
 
 ### Added

data/lib/active_item/base.rb

@@ -912,15 +912,11 @@ module ActiveItem
       indexes.each do |index_name, config|
         # Check partition key if it's being changed
         partition_key = config[:partition_key]&.to_s
-        if partition_key && changed_dynamo_keys.key?(partition_key)
-          validate_gsi_key_value!(partition_key, changed_dynamo_keys[partition_key], index_name)
-        end
+        validate_gsi_key_value!(partition_key, changed_dynamo_keys[partition_key], index_name) if partition_key && changed_dynamo_keys.key?(partition_key)
 
         # Check sort key if it's being changed
         sort_key = config[:sort_key]&.to_s
-        if sort_key && changed_dynamo_keys.key?(sort_key)
-          validate_gsi_key_value!(sort_key, changed_dynamo_keys[sort_key], index_name)
-        end
+        validate_gsi_key_value!(sort_key, changed_dynamo_keys[sort_key], index_name) if sort_key && changed_dynamo_keys.key?(sort_key)
       end
     end
 
@@ -953,9 +949,8 @@ module ActiveItem
       case value
       when String
         !value.empty? # Empty strings are not allowed for GSI keys
-      when Integer, Float, BigDecimal
-        true
-      when StringIO
+      when Integer, Float, BigDecimal, StringIO
+        # Numeric (Integer, Float, BigDecimal) and Binary (StringIO) are valid GSI key types
         true
       else
         false

data/lib/active_item/relation.rb

@@ -294,18 +294,26 @@ module ActiveItem
 
     # Find by id within the current scope, or find by block (like Enumerable#find)
     #
+    # When called on an association (e.g., @project.epics.find(id)), validates that
+    # the found record belongs to the association's scope. This matches Rails behavior
+    # where association.find(id) only returns records belonging to that association.
+    #
     # @overload find(id)
     #   Find a record by ID within the current scope
     #   @param id [String] The ID to find
-    #   @return [Object, nil] The found record or nil
+    #   @return [Object] The found record
+    #   @raise [ActiveItem::RecordNotFound] If record not found or not in scope
     #
     # @overload find(&block)
     #   Find the first record matching the block condition (like Enumerable#find/detect)
     #   @yield [record] Evaluates the block for each record
     #   @return [Object, nil] The first record where block returns true, or nil
     #
-    # @example Find by ID
-    #   User.where(status: 'active').find('user-123')
+    # @example Find by ID (scoped to association)
+    #   @project.epics.find('epic-123')  # Only finds if epic belongs to @project
+    #
+    # @example Find by ID (unscoped)
+    #   Epic.where(status: 'active').find('epic-123')  # Finds any active epic
     #
     # @example Find by block
     #   User.where(status: 'active').find { |u| u.email.include?('@example.com') }
@@ -317,13 +325,20 @@ module ActiveItem
       elsif id
         # Use direct GetItem instead of scanning — O(1) vs O(n)
         record = resolved_model.find(id)
+
+        # When called on an association (has conditions), validate scope
+        # This ensures @project.epics.find(id) only returns epics belonging to @project
+        if conditions.any? && !conditions[:_empty]
+          foreign_key, expected_value = conditions.first
+          actual_value = record.send(foreign_key)
+          raise ActiveItem::RecordNotFound, "Couldn't find #{resolved_model.name} with id=#{id}" unless actual_value == expected_value
+        end
+
         preload_associations_for_records([record]) if includes_associations.any?
         record
       else
         raise ArgumentError, 'find requires either an ID or a block'
       end
-    rescue ActiveItem::RecordNotFound
-      nil
     end
 
     # Find by conditions within current scope

data/lib/active_item/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveItem
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeitem
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Andy Davis
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-13 00:00:00.000000000 Z
+date: 2026-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel