familia 2.0.0.pre15 → 2.0.0.pre17

data/try/features/encrypted_fields/error_conditions_try.rb

@@ -29,9 +29,9 @@ end
 ## Tampered auth tag fails decryption
 @model.secret = 'valid-secret'
 @valid_cipher = @model.secret.encrypted_value
-@tampered = JSON.parse(@valid_cipher)
+@tampered = Familia::JsonSerializer.parse(@valid_cipher)
 @tampered['auth_tag'] = Base64.strict_encode64('tampered' * 4)
-@model.instance_variable_set(:@secret, @tampered.to_json)
+@model.instance_variable_set(:@secret, Familia::JsonSerializer.dump(@tampered))
 
 @model.secret
 #=!> Familia::EncryptionError
@@ -58,7 +58,7 @@ Familia::Encryption.reset_derivation_count!
 # Ensure keys are available for this test
 Familia.config.encryption_keys = @test_keys
 @error_model = ErrorTest.new(id: 'err-counter')
-# Set valid JSON but with invalid base64 data to trigger decrypt failure after parsing
+# UnsortedSet valid JSON but with invalid base64 data to trigger decrypt failure after parsing
 @error_model.instance_variable_set(:@secret, '{"algorithm":"aes-256-gcm","nonce":"dGVzdA==","ciphertext":"invalid-base64!!!","auth_tag":"dGVzdA==","key_version":"v1"}')
 begin
   @error_model.secret
@@ -72,9 +72,9 @@ Familia::Encryption.derivation_count.value
 # Ensure keys are available for this test
 Familia.config.encryption_keys = @test_keys
 @model.secret = 'test-data'
-@cipher_data = JSON.parse(@model.secret.encrypted_value)
+@cipher_data = Familia::JsonSerializer.parse(@model.secret.encrypted_value)
 @cipher_data['algorithm'] = 'unsupported-algorithm'
-@model.instance_variable_set(:@secret, @cipher_data.to_json)
+@model.instance_variable_set(:@secret, Familia::JsonSerializer.dump(@cipher_data))
 
 @model.secret
 #=!> Familia::EncryptionError
@@ -93,9 +93,9 @@ Familia.config.current_key_version = @original_version
 Familia.config.encryption_keys = @test_keys
 Familia.config.current_key_version = :v1
 @model.secret = 'test-data'
-@cipher_with_bad_version = JSON.parse(@model.secret.encrypted_value)
+@cipher_with_bad_version = Familia::JsonSerializer.parse(@model.secret.encrypted_value)
 @cipher_with_bad_version['key_version'] = 'nonexistent'
-@model.instance_variable_set(:@secret, @cipher_with_bad_version.to_json)
+@model.instance_variable_set(:@secret, Familia::JsonSerializer.dump(@cipher_with_bad_version))
 @model.secret
 #=!> Familia::EncryptionError
 #==> error.message.include?('No key for version: nonexistent')

data/try/features/encrypted_fields/fresh_key_try.rb

@@ -162,7 +162,7 @@ internal_empty.nil?
 ## Consistent behavior across Ruby restart simulation
 model = PersistenceTestModel.new(user_id: 'persistence-test')
 model.persistent_data = 'data-to-persist'
-Thread.current[:familia_request_cache] = nil if Thread.current[:familia_request_cache]
+Fiber[:familia_request_cache] = nil if Fiber[:familia_request_cache]
 # With secure-by-default, field access returns ConcealedString
 model.persistent_data.to_s
 #=> '[CONCEALED]'

data/try/features/encrypted_fields/nonce_uniqueness_try.rb

@@ -20,7 +20,7 @@ end
 
 ## Multiple encryptions produce unique nonces (concealed behavior)
 model = NonceTest.new(id: 'nonce-test')
-concealed_values = Set.new
+concealed_values = ::Set.new
 
 10.times do
   model.secret = 'same-value'

data/try/features/encrypted_fields/secure_by_default_behavior_try.rb

@@ -190,11 +190,11 @@ end
 
 ## JSON serialization prevents leakage by raising error
 begin
-  user_json = {
+  user_json = Familia::JsonSerializer.dump({
     id: @user.id,
     username: @user.username,
     password: @user.password_hash
-  }.to_json
+  })
   false
 rescue Familia::SerializerError
   true
@@ -203,11 +203,11 @@ end
 
 ## JSON serialization with ConcealedString raises error
 begin
-  user_json = {
+  user_json = Familia::JsonSerializer.dump({
     id: @user.id,
     username: @user.username,
     password: @user.password_hash
-  }.to_json
+  })
   false
 rescue Familia::SerializerError => e
   e.message.include?("ConcealedString")
@@ -294,7 +294,7 @@ api_response = {
 }
 
 begin
-  @response_json = api_response.to_json
+  @response_json = Familia::JsonSerializer.dump(api_response)
   false
 rescue Familia::SerializerError
   true
@@ -311,7 +311,7 @@ api_response = {
 }
 
 begin
-  @response_json = api_response.to_json
+  @response_json = Familia::JsonSerializer.dump(api_response)
   false
 rescue Familia::SerializerError
   true
@@ -328,7 +328,7 @@ api_response = {
 }
 
 begin
-  @response_json = api_response.to_json
+  @response_json = Familia::JsonSerializer.dump(api_response)
   false
 rescue Familia::SerializerError => e
   e.message.include?("ConcealedString")

data/try/features/encrypted_fields/universal_serialization_safety_try.rb

@@ -69,7 +69,7 @@ hash_result.keys.include?("api_token")
 
 ## JSON serialization - to_json (fails for security)
 begin
-  @record.api_token.to_json
+  Familia::JsonSerializer.dump(@record.api_token)
   raise "Should have raised SerializerError"
 rescue Familia::SerializerError => e
   e.class
@@ -96,7 +96,7 @@ end
 @record.api_token.to_f
 #=!> NoMethodError
 
-## Complex nested JSON structure
+## Nested JSON with ConcealedString raises error
 @nested_data = {
   record: @record,
   fields: {
@@ -104,23 +104,16 @@ end
     encrypted: [@record.api_token, @record.secret_notes]
   }
 }
+Familia::JsonSerializer.dump(@nested_data)
+#=!> Familia::SerializerError
+#==> error.message.include?("Failed to dump")
 
-begin
-  @serialized = @nested_data.to_json
-  false
-rescue Familia::SerializerError
-  true
-end
-#=> true
-
-## Nested JSON with ConcealedString raises error
-begin
-  @nested_data.to_json
-  false
-rescue Familia::SerializerError => e
-  e.message.include?("ConcealedString cannot be serialized")
-end
-#=> true
+## Nested JSON with ConcealedString raises error, plus
+## Oj strict mode prevents serialization of custom objects
+Familia::JsonSerializer.dump(@record)
+#=:> Familia::SerializerError
+#==> error.message.include?("Failed to dump")
+#==> error.message.include?("strict mode")
 
 ## Array of mixed field types safety
 @mixed_array = [
@@ -131,7 +124,7 @@ end
 ]
 
 begin
-  @mixed_array.to_json
+  Familia::JsonSerializer.dump(@mixed_array)
   false
 rescue Familia::SerializerError
   true
@@ -140,7 +133,7 @@ end
 
 ## Mixed array with ConcealedString raises error
 begin
-  @mixed_array.to_json
+  Familia::JsonSerializer.dump(@mixed_array)
   false
 rescue Familia::SerializerError => e
   e.message.include?("ConcealedString")

data/try/features/external_identifier/external_identifier_try.rb

@@ -210,7 +210,7 @@ bug_test_obj.extid
 delete_test_obj = ExternalIdTest.new(id: 'delete_test', name: 'Delete Test')
 delete_test_obj.save
 test_extid = delete_test_obj.extid
-# Delete the object directly from Redis to simulate cleanup scenario
+# Delete the object directly from Valkey/Redis to simulate cleanup scenario
 ExternalIdTest.dbclient.del(delete_test_obj.dbkey)
 # Now try to find by extid - this should clean up mapping and return nil
 ExternalIdTest.find_by_extid(test_extid)

data/try/features/feature_dependencies_try.rb

@@ -7,7 +7,7 @@ Familia.debug = false
 # Create test features with dependencies for testing
 module TestFeatureA
   def self.included(base)
-    Familia.trace :included, base, self, caller(1..1) if Familia.debug?
+    Familia.trace :included, base, self if Familia.debug?
     base.extend ClassMethods
   end
 
@@ -24,7 +24,7 @@ end
 
 module TestFeatureB
   def self.included(base)
-    Familia.trace :INCLUDED, base, self, caller(1..1) if Familia.debug?
+    Familia.trace :INCLUDED, base, self if Familia.debug?
     base.extend ClassMethods
   end
 
@@ -41,7 +41,7 @@ end
 
 module TestFeatureCWithDeps
   def self.included(base)
-    Familia.trace :feature_load, base, self, caller(1..1) if Familia.debug?
+    Familia.trace :feature_load, base, self if Familia.debug?
     base.extend ClassMethods
   end
 

data/try/features/field_groups_try.rb

@@ -0,0 +1,244 @@
+# frozen_string_literal: true
+
+# try/features/field_groups_try.rb
+
+require_relative '../../lib/familia'
+
+# Define test classes in setup section
+class BasicUser < Familia::Horreum
+  field_group :personal_info do
+    field :name
+    field :email
+  end
+end
+
+class MultiGroupUser < Familia::Horreum
+  field_group :personal do
+    field :name
+    field :email
+  end
+
+  field_group :metadata do
+    field :created_at
+    field :updated_at
+  end
+end
+
+class EmptyGroupModel < Familia::Horreum
+  field_group :placeholder
+end
+
+class TransientModel < Familia::Horreum
+  feature :transient_fields
+  transient_field :api_key
+  transient_field :session_token
+end
+
+class EncryptedModel < Familia::Horreum
+  feature :encrypted_fields
+  encrypted_field :password
+  encrypted_field :credit_card
+end
+
+class MixedGroupsModel < Familia::Horreum
+  feature :transient_fields
+  transient_field :temp_data
+
+  field_group :custom do
+    field :custom_field
+  end
+
+  feature :encrypted_fields
+  encrypted_field :secret_key
+end
+
+class FieldsOutsideGroups < Familia::Horreum
+  field :standalone_field
+
+  field_group :grouped do
+    field :grouped_field
+  end
+end
+
+class NoSuchGroup < Familia::Horreum
+  field_group :existing do
+    field :name
+  end
+end
+
+class ParentModel < Familia::Horreum
+  field_group :base_fields do
+    field :id
+  end
+end
+
+class ChildModel < ParentModel
+  field_group :child_fields do
+    field :name
+  end
+end
+
+# Create instances for testing
+@user = MultiGroupUser.new(name: 'Alice', email: 'alice@example.com', created_at: Time.now.to_i)
+@user2 = BasicUser.new(name: 'Bob', email: 'bob@example.com')
+
+## Manual field groups - basic access via hash
+BasicUser.instance_variable_get(:@field_groups)[:personal_info]
+#=> [:name, :email]
+
+## Multiple groups - access personal group via hash
+MultiGroupUser.instance_variable_get(:@field_groups)[:personal]
+#=> [:name, :email]
+
+## Multiple groups - access metadata group via hash
+MultiGroupUser.instance_variable_get(:@field_groups)[:metadata]
+#=> [:created_at, :updated_at]
+
+## Multiple groups - list all field groups (returns hash)
+MultiGroupUser.field_groups.keys.sort
+#=> [:metadata, :personal]
+
+## Field groups - fields defined inside groups are tracked
+user = MultiGroupUser.new(name: 'Alice', email: 'alice@example.com', created_at: Time.now.to_i)
+
+## Grouped fields - access name field
+@user.name
+#=> 'Alice'
+
+## Grouped fields - access email field
+@user.email
+#=> 'alice@example.com'
+
+## Empty group - access via hash
+EmptyGroupModel.instance_variable_get(:@field_groups)[:placeholder]
+#=> []
+
+## Empty group - list field groups (returns hash)
+EmptyGroupModel.field_groups
+#=> {placeholder: []}
+
+## Empty group - list field group keys
+EmptyGroupModel.field_groups.keys
+#=> [:placeholder]
+
+## Transient feature - access via backward compatible method
+TransientModel.transient_fields
+#=> [:api_key, :session_token]
+
+## Transient feature - access via field_groups hash
+TransientModel.instance_variable_get(:@field_groups)[:transient_fields]
+#=> [:api_key, :session_token]
+
+## Transient feature - field_groups returns hash with content
+TransientModel.field_groups
+#=> {transient_fields: [:api_key, :session_token]}
+
+## Transient feature - list field group keys
+TransientModel.field_groups.keys
+#=> [:transient_fields]
+
+## Encrypted feature - access via backward compatible method
+EncryptedModel.encrypted_fields
+#=> [:password, :credit_card]
+
+## Encrypted feature - access via field_groups hash
+EncryptedModel.instance_variable_get(:@field_groups)[:encrypted_fields]
+#=> [:password, :credit_card]
+
+## Encrypted feature - field_groups returns hash with content
+EncryptedModel.field_groups
+#=> {encrypted_fields: [:password, :credit_card]}
+
+## Encrypted feature - list field group keys
+EncryptedModel.field_groups.keys
+#=> [:encrypted_fields]
+
+## Mixed groups - list all field group keys
+MixedGroupsModel.field_groups.keys.sort
+#=> [:custom, :encrypted_fields, :transient_fields]
+
+## Mixed groups - access custom group via hash
+MixedGroupsModel.instance_variable_get(:@field_groups)[:custom]
+#=> [:custom_field]
+
+## Mixed groups - access transient_fields via backward compatible method
+MixedGroupsModel.transient_fields
+#=> [:temp_data]
+
+## Mixed groups - access encrypted_fields via backward compatible method
+MixedGroupsModel.encrypted_fields
+#=> [:secret_key]
+
+## Error: nested field groups
+class NestedGroupsModel < Familia::Horreum
+  field_group :outer do
+    field_group :inner do
+      field :bad
+    end
+  end
+end
+#=!> Familia::Problem
+
+## Exception during field_group block resets @current_field_group
+class ErrorDuringGroup < Familia::Horreum
+  begin
+    field_group :broken do
+      field :first_field
+      raise StandardError, "Simulated error"
+      field :unreachable_field
+    end
+  rescue StandardError
+    # Swallow the error for testing
+  end
+
+  # Field defined after the error should not be in :broken group
+  field :after_error
+end
+
+ErrorDuringGroup
+#=> ErrorDuringGroup
+
+## Exception handling - broken group has only first_field
+ErrorDuringGroup.instance_variable_get(:@field_groups)[:broken]
+#=> [:first_field]
+
+## Exception handling - after_error field is not in broken group
+ErrorDuringGroup.instance_variable_get(:@field_groups)[:broken].include?(:after_error)
+#=> false
+
+## Exception handling - after_error is in fields list
+ErrorDuringGroup.fields.include?(:after_error)
+#=> true
+
+## Exception handling - current_field_group was reset to nil
+ErrorDuringGroup.instance_variable_get(:@current_field_group)
+#=> nil
+
+
+## Fields outside - access grouped field group via hash
+FieldsOutsideGroups.instance_variable_get(:@field_groups)[:grouped]
+#=> [:grouped_field]
+
+## Fields outside - all fields include both grouped and standalone
+FieldsOutsideGroups.fields
+#=> [:standalone_field, :grouped_field]
+
+## Accessing non-existent field group returns nil
+NoSuchGroup.instance_variable_get(:@field_groups)[:nonexistent]
+#=> nil
+
+## Inheritance - parent class has its own field groups
+ParentModel.field_groups
+#=> {base_fields: [:id]}
+
+## Inheritance - child class has its own field groups
+ChildModel.field_groups
+#=> {child_fields: [:name]}
+
+## Normal field access - get name value
+@user2.name
+#=> 'Bob'
+
+## Normal field access - get email value
+@user2.email
+#=> 'bob@example.com'

data/try/features/object_identifier/object_identifier_integration_try.rb

@@ -7,9 +7,9 @@ Familia.debug = false
 # Integration test for ObjectIdentifier and ExternalIdentifiers features together
 
 # Class using both features with defaults
-class IntegrationTest < Familia::Horreum
+class ::IntegrationTest < Familia::Horreum
   feature :object_identifier
-  feature :external_identifier  # This depends on :object_identifier
+  feature :external_identifier # This depends on :object_identifier
   identifier_field :id
   field :id
   field :name
@@ -17,7 +17,7 @@ class IntegrationTest < Familia::Horreum
 end
 
 # Class with custom configurations for both features
-class CustomIntegrationTest < Familia::Horreum
+class ::CustomIntegrationTest < Familia::Horreum
   feature :object_identifier, generator: :hex
   feature :external_identifier, prefix: 'custom'
   identifier_field :id
@@ -25,8 +25,8 @@ class CustomIntegrationTest < Familia::Horreum
   field :name
 end
 
-# Class testing full lifecycle with Redis persistence
-class PersistenceTest < Familia::Horreum
+# Class testing full lifecycle with Valkey/Redis persistence
+class ::PersistenceTest < Familia::Horreum
   feature :object_identifier
   feature :external_identifier
   identifier_field :id
@@ -79,7 +79,7 @@ obj.extid == original_extid
 #==> true
 
 ## Custom objid uses hex format (64 chars for 256-bit)
-@custom_obj.objid.match(/\A[0-9a-f]{64}\z/)
+@custom_obj.objid =~ /\A[0-9a-f]{64}\z/
 #=*> nil
 
 ## Custom extid uses custom prefix
@@ -90,19 +90,20 @@ obj.extid == original_extid
 persistence_obj = PersistenceTest.new
 persistence_obj.id = 'persistence_test'
 persistence_obj.name = 'Persistence Test Object'
-persistence_obj.created_at = Time.now.to_i
+persistence_obj.created_at = Familia.now.to_i
 original_objid = persistence_obj.objid
 original_extid = persistence_obj.extid
 persistence_obj.save
 
-# Load from Redis
-loaded_obj = PersistenceTest.new(id: 'persistence_test')
+# Load from Valkey/Redis
+loaded_obj = PersistenceTest.load(id: 'persistence_test')
+#=> nil
 
 ## objid persists after save/load
 persistence_obj = PersistenceTest.new
 persistence_obj.id = 'persistence_test'
 persistence_obj.name = 'Persistence Test Object'
-persistence_obj.created_at = Time.now.to_i
+persistence_obj.created_at = Familia.now.to_i
 original_objid = persistence_obj.objid
 persistence_obj.save
 loaded_obj = PersistenceTest.new(id: 'persistence_test')
@@ -113,7 +114,7 @@ loaded_obj.objid == original_objid
 persistence_obj = PersistenceTest.new
 persistence_obj.id = 'persistence_test'
 persistence_obj.name = 'Persistence Test Object'
-persistence_obj.created_at = Time.now.to_i
+persistence_obj.created_at = Familia.now.to_i
 original_extid = persistence_obj.extid
 persistence_obj.save
 loaded_obj = PersistenceTest.new(id: 'persistence_test')
@@ -138,7 +139,7 @@ lazy_obj.instance_variable_get(:@extid)
 
 ## Accessing extid triggers objid generation if needed
 lazy_obj2 = IntegrationTest.new
-lazy_obj2.extid  # This should trigger objid generation too
+lazy_obj2.extid # This should trigger objid generation too
 lazy_obj2.instance_variable_get(:@objid)
 #=*> nil
 
@@ -182,12 +183,12 @@ CustomIntegrationTest.feature_options(:external_identifier)[:prefix]
 
 ## objid is URL-safe (UUID format)
 obj = IntegrationTest.new
-obj.objid.match(/\A[A-Za-z0-9\-]+\z/)
+obj.objid =~ /\A[A-Za-z0-9-]+\z/
 #=*> nil
 
 ## extid is URL-safe (base36 format)
 obj = IntegrationTest.new
-obj.extid.match(/\A[a-z0-9_]+\z/)
+obj.extid =~ /\A[a-z0-9_]+\z/
 #=*> nil
 
 ## Data integrity preserved during complex initialization
@@ -197,27 +198,16 @@ complex_obj = IntegrationTest.new(
   email: 'complex@test.com',
   objid: 'preset_objid_123',
   extid: 'preset_ext_456'
-)
+).save
+#=> true
 
 ## Preset objid value is preserved
-complex_obj = IntegrationTest.new(
-  id: 'complex_integration',
-  name: 'Complex Integration',
-  email: 'complex@test.com',
-  objid: 'preset_objid_123',
-  extid: 'preset_ext_456'
-)
+complex_obj = IntegrationTest.load('complex_integration')
 complex_obj.objid
 #=> 'preset_objid_123'
 
 ## Preset extid value is preserved
-complex_obj = IntegrationTest.new(
-  id: 'complex_integration',
-  name: 'Complex Integration',
-  email: 'complex@test.com',
-  objid: 'preset_objid_123',
-  extid: 'preset_ext_456'
-)
+complex_obj = IntegrationTest.load('complex_integration')
 complex_obj.extid
 #=> 'preset_ext_456'
 
@@ -225,6 +215,7 @@ complex_obj.extid
 search_obj = IntegrationTest.new
 search_obj.id = 'search_test'
 search_obj.save
+#=> true
 
 ## find_by_objid returns nil (stub implementation)
 search_obj = IntegrationTest.new
@@ -232,10 +223,10 @@ search_obj.id = 'search_test'
 search_obj.save
 found_by_objid = IntegrationTest.find_by_objid(search_obj.objid)
 found_by_objid
-#=> nil
+#=:> IntegrationTest
 
 ## find_by_extid works with real implementation
-@search_obj = IntegrationTest.new
+@search_obj = IntegrationTest.new name: 'Tucker', email: 'tucker@example.com'
 @search_obj.id = 'search_test'
 @search_obj.save
 found_by_extid = IntegrationTest.find_by_extid(@search_obj.extid)
@@ -248,8 +239,7 @@ first_objid = stability_obj.objid
 first_extid = stability_obj.extid
 second_objid = stability_obj.objid
 second_extid = stability_obj.extid
-
-## objid remains stable across accesses
+# objid remains stable across accesses
 stability_obj = IntegrationTest.new
 first_objid = stability_obj.objid
 second_objid = stability_obj.objid
@@ -284,4 +274,8 @@ obj.respond_to?(:delete!)
 #==> true
 
 # Cleanup test objects
-@search_obj.destroy! rescue nil
+begin
+  @search_obj.destroy!
+rescue StandardError
+  nil
+end

data/try/features/object_identifier/object_identifier_try.rb

@@ -189,3 +189,13 @@ empty_obj.instance_variable_get(:@objid)
 complex_obj = BasicObjectTest.new(id: 'complex', name: 'Complex Object')
 complex_obj
 #=*> _.objid
+
+## Test objid_lookup mapping when identifier set after objid generation (race condition fix)
+# Create object without identifier, access objid first, then set identifier
+race_obj = BasicObjectTest.new
+generated_objid = race_obj.objid           # Generate objid before setting identifier
+race_obj.id = "race_test_123"               # Set identifier after objid exists
+race_obj.save                                # Save so find_by_objid can locate it
+found = BasicObjectTest.find_by_objid(generated_objid)
+found && found.id == "race_test_123"
+#=> true

data/try/features/quantization/quantization_try.rb

@@ -85,5 +85,5 @@ custom_stamp
 #=> "2023061514"
 
 # Cleanup
-@test_obj.id = 'quantized_test_obj' # Set identifier before cleanup
+@test_obj.id = 'quantized_test_obj' # UnsortedSet identifier before cleanup
 @test_obj.destroy! if @test_obj