familia 2.0.0.pre17 → 2.0.0.pre18

data/try/features/real_feature_integration_try.rb

@@ -1,6 +1,6 @@
 # try/features/real_feature_integration_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../support/helpers/test_helpers'
 
 Familia.debug = false
 
@@ -12,15 +12,17 @@ class ExpirationIntegrationTest < Familia::Horreum
   feature :expiration
 end
 
-# Safe dump feature integration with field categories
+# Safe dump feature integration with field types
 class SafeDumpCategoryTest < Familia::Horreum
+  feature :encrypted_fields
+  feature :transient_fields
+  feature :safe_dump
+
   identifier_field :id
   field :id
-  field :public_name, category: :persistent
-  field :email, category: :encrypted
-  field :tryouts_cache_data, category: :transient
-
-  feature :safe_dump
+  field :public_name
+  encrypted_field :email
+  transient_field :tryouts_cache_data
 
   # Use new SafeDump DSL
   safe_dump_field :id
@@ -30,14 +32,15 @@ end
 
 # Combined features work together
 class CombinedFeaturesTest < Familia::Horreum
-  identifier_field :id
-  field :id
-  field :name, category: :persistent
-  field :temp_data, category: :transient
-
+  feature :transient_fields
   feature :expiration
   feature :safe_dump
 
+  identifier_field :id
+  field :id
+  field :name
+  transient_field :temp_data
+
   # Use new SafeDump DSL
   safe_dump_field :id
   safe_dump_field :name
@@ -123,11 +126,11 @@ CombinedFeaturesTest.features_enabled.include?(:safe_dump)
 
 ## Test that feature() method returns current features when called with no args
 CombinedFeaturesTest.feature
-#=> [:expiration, :safe_dump]
+#=> [:transient_fields, :expiration, :safe_dump]
 
 ## Test that features_enabled() method returns the same results as feature() method
 CombinedFeaturesTest.feature
-#=> [:expiration, :safe_dump]
+#=> [:transient_fields, :expiration, :safe_dump]
 
 ## Features list is accessible
 QueryFeaturesTest.feature

data/try/features/relationships/indexing_commands_verification_try.rb

@@ -4,7 +4,7 @@
 # This test ensures the indexing system uses proper DataType methods instead of direct Redis calls
 #
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Enable database command logging for command verification tests
 Familia.enable_database_logging = true
@@ -44,8 +44,11 @@ end
 
 # Test data
 @user = TestIndexedUser.new(user_id: 'test_user_123', email: 'test@example.com', department: 'engineering')
+@user.save
 @company = TestIndexedCompany.new(company_id: 'test_company_456', name: 'Test Corp')
+@company.save
 @employee = TestIndexedEmployee.new(emp_id: 'test_emp_789', email: 'emp@example.com', department: 'sales')
+@employee.save
 
 ## Class-level indexing creates proper DataType field
 TestIndexedUser.respond_to?(:email_index)
@@ -91,6 +94,7 @@ end
 #=> false
 
 ## Instance-level indexing works with parent context
+@employee.save
 @employee.add_to_test_indexed_company_dept_index(@company)
 sample = @company.sample_from_department('sales')
 sample.first&.emp_id == @employee.emp_id
@@ -103,15 +107,16 @@ dept_index.class.name
 
 ## Multiple employees in same department
 @employee2 = TestIndexedEmployee.new(emp_id: 'test_emp_999', email: 'emp2@example.com', department: 'sales')
+@employee2.save
 @employee2.add_to_test_indexed_company_dept_index(@company)
 employees_in_sales = @company.find_all_by_department('sales')
-employees_in_sales.map(&:emp_id).sort
+employees_in_sales&.map(&:emp_id).sort
 #=> ["test_emp_789", "test_emp_999"]
 
 ## Removing from instance-level index works
 @employee.remove_from_test_indexed_company_dept_index(@company)
 remaining_employees = @company.find_all_by_department('sales')
-remaining_employees.map(&:emp_id)
+remaining_employees&.map(&:emp_id)
 #=> ["test_emp_999"]
 
 ## Index update methods work correctly

data/try/features/relationships/indexing_try.rb

@@ -4,7 +4,7 @@
 # Tests both multi_index (parent-context) and unique_index (class-level) indexing
 #
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for indexing functionality
 class ::TestUser < Familia::Horreum
@@ -55,13 +55,18 @@ end
 
 # Setup
 @user1 = TestUser.new(user_id: 'user_001', email: 'alice@example.com', username: 'alice', department: 'engineering', role: 'developer')
+@user1.save
 @user2 = TestUser.new(user_id: 'user_002', email: 'bob@example.com', username: 'bob', department: 'marketing', role: 'manager')
+@user2.save
 @user3 = TestUser.new(user_id: 'user_003', email: 'charlie@example.com', username: 'charlie', department: 'engineering', role: 'lead')
+@user3.save
 
 @company_id = "comp_#{rand(10000000)}"
 @company = TestCompany.create(company_id: @company_id, name: 'Acme Corp')
 @emp1 = TestEmployee.new(emp_id: 'emp_001', email: 'alice@acme.com', department: 'engineering', manager_id: 'mgr_001', badge_number: 'BADGE001')
+@emp1.save
 @emp2 = TestEmployee.new(emp_id: 'emp_002', email: 'bob@acme.com', department: 'sales', manager_id: 'mgr_002', badge_number: 'BADGE002')
+@emp2.save
 
 
 ## Context-scoped methods require context parameter

data/try/features/relationships/participation_commands_verification_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'participation_commands_verification_try' do
     Timecop.freeze(Time.parse("2024-01-15 10:30:00"))
     puts Time.now  # Always returns 2024-01-15 10:30:00
     puts Date.today  # Always returns 2024-01-15
-    require_relative '../../../lib/middleware/database_middleware'
+    require_relative '../../../lib/middleware/database_logger'
     require_relative '../../../lib/familia'
     Familia.enable_database_logging = true
     Familia.enable_database_counter = true

data/try/features/relationships/participation_commands_verification_try.rb

@@ -17,7 +17,7 @@ puts Date.today  # Always returns 2024-01-15
 
 
 # Load middleware first
-require_relative '../../../lib/middleware/database_middleware'
+require_relative '../../../lib/middleware/database_logger'
 
 # Load Familia
 require_relative '../../../lib/familia'
@@ -83,7 +83,7 @@ instantiation_commands.empty?
 database_commands = DatabaseLogger.capture_commands do
   @customer.save
 end
-database_commands.map { |cmd| cmd[:command] } if database_commands
+database_commands.map { |cmd| cmd.command } if database_commands
 ##=> [["hmset", "reverse_index_customer:ri_cust_123:object", "customer_id", "ri_cust_123", "name", "Reverse Index Test Customer"], ["zadd", "reverse_index_customer:instances", "1705343400.0", "ri_cust_123"]]
 
 
@@ -91,14 +91,14 @@ database_commands.map { |cmd| cmd[:command] } if database_commands
 database_commands = DatabaseLogger.capture_commands do
   @domain1.save
 end
-database_commands[0][:command] if database_commands && database_commands[0]
+database_commands[0].command if database_commands && database_commands[0]
 ##=>  ["hmset", "reverse_index_domain:ri_dom_1:object", "domain_id", "ri_dom_1", "display_domain", "example1.com", "created_at", "1705343400.0"]
 
 ## Domain2 save functionality
 database_commands = DatabaseLogger.capture_commands do
   @domain2.save
 end
-database_commands[0][:command]if database_commands && database_commands[0]
+database_commands[0].command if database_commands && database_commands[0]
 ##=> ["hmset", "reverse_index_domain:ri_dom_2:object", "domain_id", "ri_dom_2", "display_domain", "example2.com", "created_at", "1705343401.0"]
 
 

data/try/features/relationships/participation_performance_improvements_try.rb

@@ -3,7 +3,7 @@
 # Tests for performance improvements in participation functionality
 # Verifies reverse index functionality and robust type comparison
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for performance improvements
 class PerfTestCustomer < Familia::Horreum

data/try/features/relationships/participation_reverse_index_try.rb

@@ -3,7 +3,7 @@
 # Tests for participation reverse index functionality
 # Verifies performance improvements and correct behavior
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for reverse index functionality
 class ReverseIndexCustomer < Familia::Horreum

data/try/features/relationships/relationships_api_changes_try.rb

@@ -4,7 +4,7 @@
 # Testing new class_participates_in and unique_index methods
 # Testing breaking changes and argument validation
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for new API
 class ::ApiTestUser < Familia::Horreum

data/try/features/relationships/relationships_edge_cases_try.rb

@@ -1,6 +1,6 @@
 # Simplified edge case testing for Relationships v2 - focusing on core functionality
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for edge case testing
 class EdgeTestCustomer < Familia::Horreum
@@ -41,14 +41,14 @@ end
 @domain1 = EdgeTestDomain.new(
   domain_id: 'edge_dom_1',
   display_domain: 'edge1.example.com',
-  created_at: Time.new(2025, 6, 15, 12, 0, 0),
+  created_at: Time.new(2025, 6, 15, 12, 0, 0).to_i,  # Convert Time to Integer for JSON serialization
   score_value: 10
 )
 
 @domain2 = EdgeTestDomain.new(
   domain_id: 'edge_dom_2',
   display_domain: 'edge2.example.com',
-  created_at: Time.new(2025, 7, 20, 15, 30, 0),
+  created_at: Time.new(2025, 7, 20, 15, 30, 0).to_i,  # Convert Time to Integer for JSON serialization
   score_value: 25
 )
 

data/try/features/relationships/relationships_performance_minimal_try.rb

@@ -1,6 +1,6 @@
 # Minimal performance testing focusing on core Familia functionality
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 require 'benchmark'
 
 # Simple test classes without relationships feature

data/try/features/relationships/relationships_performance_simple_try.rb

@@ -2,7 +2,7 @@
 #
 # Simplified performance testing for the Relationships feature
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 require 'benchmark'
 
 # Test classes for performance testing

data/try/features/relationships/relationships_performance_try.rb

@@ -2,7 +2,7 @@
 #
 # Performance and integration testing for the Relationships feature
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 require 'benchmark'
 
 # Test classes for performance testing

data/try/features/relationships/relationships_performance_working_try.rb

@@ -2,7 +2,7 @@
 #
 # Working performance test focusing on basic functionality
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 require 'benchmark'
 
 # Simple test class using only basic Familia features

data/try/features/relationships/relationships_try.rb

@@ -3,7 +3,7 @@
 # Simplified Familia v2 relationship functionality tests - focusing on core working features
 #
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for Familia v2 relationship functionality
 class TestCustomer < Familia::Horreum

data/try/features/safe_dump/safe_dump_advanced_try.rb

@@ -2,7 +2,7 @@
 
 # These tryouts test the safe dumping functionality.
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## By default Familia::Base has no safe_dump_fields method
 Familia::Base.respond_to?(:safe_dump_fields)

data/try/features/safe_dump/safe_dump_try.rb

@@ -1,6 +1,6 @@
 # try/features/safe_dump_try.rb
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 

data/try/features/transient_fields/redacted_string_try.rb

@@ -1,6 +1,6 @@
 # try/features/transient_fields/redacted_string_try.rb
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 
 # Create sample sensitive values for testing

data/try/features/transient_fields/refresh_reset_try.rb

@@ -1,7 +1,7 @@
 # try/features/transient_fields/refresh_reset_try.rb
 # Test that refresh! properly resets transient fields to nil
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 

data/try/features/transient_fields/single_use_redacted_string_try.rb

@@ -1,6 +1,6 @@
 # try/features/transient_fields/single_use_redacted_string_try.rb
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @otp_code = "123456"
 @auth_token = "temp-auth-token-xyz"

data/try/features/transient_fields/transient_fields_core_try.rb

@@ -1,6 +1,6 @@
 # try/features/transient_fields_core_try.rb
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 class SecretService < Familia::Horreum
   feature :transient_fields

data/try/features/transient_fields/transient_fields_integration_try.rb

@@ -1,6 +1,6 @@
 # try/features/transient_fields_integration_try.rb
 
-require_relative '../../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 class SecretService < Familia::Horreum
   feature :transient_fields

data/try/{connection → integration/connection}/fiber_context_preservation_try.rb

@@ -12,7 +12,7 @@
 # - Operation guards prevent unsafe scenarios before fiber issues arise
 # - Method aliases work correctly
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## Transaction method works without previous_conn preservation
 customer = Customer.new(custid: 'tx_test')

data/try/{connection → integration/connection}/handler_constraints_try.rb

@@ -8,7 +8,7 @@
 # - Fresh connections (provider/create) → safe for all operations
 # - Transaction connections → safe for reentrant transactions only
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## FiberTransactionHandler constraints
 Familia::Connection::FiberTransactionHandler.allows_transaction

data/try/{core → integration/connection}/isolated_dbclient_try.rb

@@ -5,7 +5,7 @@
 # Tests for isolated database connections that don't interfere
 # with the cached connection pool or existing model connections.
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Clean up any existing test data in all test databases
 (0..2).each do |db|

data/try/integration/connection/middleware_reconnect_try.rb

@@ -0,0 +1,87 @@
+# try/integration/connection/middleware_reconnect_try.rb
+#
+# Tests for Familia.reconnect! method that refreshes connection pools
+# with current middleware configuration
+
+require_relative '../../support/helpers/test_helpers'
+require 'connection_pool'
+
+# Disable logging for cleaner test output
+Familia.enable_database_logging = false
+
+# Test model for middleware reconnection testing
+class ReconnectTestUser < Familia::Horreum
+  identifier_field :user_id
+  field :user_id
+  field :name
+
+  def init
+    @user_id ||= SecureRandom.hex(4)
+  end
+end
+
+## Test 5: Middleware re-registration flag is reset and re-set
+Familia.enable_database_logging = true
+Familia.instance_variable_set(:@middleware_registered, true)
+Familia.reconnect!
+was_registered = Familia.instance_variable_get(:@middleware_registered)
+was_registered
+#=> true
+
+## Test 6: reconnect! safely handles no middleware enabled
+Familia.enable_database_logging = false
+Familia.enable_database_counter = false
+Familia.reconnect!
+chain_cleared = Familia.instance_variable_get(:@connection_chain).nil?
+chain_cleared
+#=> true
+
+
+
+## Setup: Clean database
+ReconnectTestUser.dbclient.flushdb
+#=> "OK"
+
+## Test 1: Basic reconnect functionality clears chain and increments version
+Familia.enable_database_logging = true
+initial = Familia.middleware_version
+Familia.reconnect!
+chain_cleared = Familia.instance_variable_get(:@connection_chain).nil?
+version_incremented = Familia.middleware_version > initial
+[chain_cleared, version_incremented]
+#=> [true, true]
+
+## Test 2: Reconnect works with connection providers
+
+# Create a simple connection provider
+Familia.connection_provider = ->(uri) { Redis.new(url: uri) }
+
+## Reconnect clears chain even with provider
+Familia.reconnect!
+Familia.instance_variable_get(:@connection_chain)
+#=> nil
+
+## Test 3: Verify new connections work after reconnect
+
+# Create user to trigger connection
+@user = ReconnectTestUser.new(name: "Bob")
+@user.save
+#=> true
+
+## User should be retrievable
+@retrieved = ReconnectTestUser.find(@user.identifier)
+@retrieved.name
+#=> "Bob"
+
+## Test 4: Multiple reconnects are safe
+Familia.reconnect!
+Familia.reconnect!
+Familia.reconnect!
+
+## Connection chain should still be cleared (will rebuild on next use)
+Familia.instance_variable_get(:@connection_chain)
+#=> nil
+
+## Cleanup
+Familia.enable_database_logging = false
+Familia.connection_provider = nil

data/try/{connection → integration/connection}/operation_mode_guards_try.rb

@@ -12,7 +12,7 @@
 # This prevents bugs where middleware/cached connections return "QUEUED" instead
 # of actual values, breaking conditional logic and business rules.
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## FiberConnectionHandler blocks transactions in strict mode
 begin

data/try/{connection → integration/connection}/pipeline_fallback_integration_try.rb

@@ -4,7 +4,7 @@
 # and that the fallback behavior matches transaction fallback patterns.
 #
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Store original values
 $original_pipeline_mode = Familia.pipeline_mode

data/try/{core → integration/connection}/pools_try.rb

@@ -5,7 +5,7 @@
 require 'bundler/setup'
 require 'securerandom'
 require 'thread'
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Configure connection pooling via connection_provider
 require 'connection_pool'

data/try/{connection → integration/connection}/responsibility_chain_tracking_try.rb

@@ -10,7 +10,7 @@
 # - Return the connection from the successful handler
 # - Return nil if no handler provides a connection
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Setup - clear any existing fiber state
 Fiber[:familia_connection_handler_class] = nil

data/try/{connection → integration/connection}/transaction_fallback_integration_try.rb

@@ -8,7 +8,7 @@
 # with Familia's existing features when connection handlers don't support
 # transactions (e.g., cached connections, middleware connections).
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Setup - store original values
 $original_transaction_mode = Familia.transaction_mode

data/try/{connection → integration/connection}/transaction_mode_permissive_try.rb

@@ -5,7 +5,7 @@
 #
 # Permissive mode: Silently uses IndividualCommandProxy for fallback
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test class for permissive mode testing
 class PermissiveModeTestCustomer < Familia::Horreum

data/try/{connection → integration/connection}/transaction_mode_strict_try.rb

@@ -5,7 +5,7 @@
 #
 # Strict mode: Raises OperationModeError when transaction unavailable
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test class for strict mode testing
 class StrictModeTestCustomer < Familia::Horreum

data/try/{connection → integration/connection}/transaction_mode_warn_try.rb

@@ -5,7 +5,7 @@
 #
 # Warn mode: Logs warning and uses IndividualCommandProxy for fallback
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test class for warn mode testing
 class WarnModeTestCustomer < Familia::Horreum

data/try/{connection → integration/connection}/transaction_modes_try.rb

@@ -10,7 +10,7 @@
 # The IndividualCommandProxy executes Redis commands immediately instead of queuing
 # them in a transaction, maintaining the same MultiResult interface for consistency.
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Setup - ensure clean state
 @original_transaction_mode = Familia.transaction_mode

data/try/{core → integration}/conventional_inheritance_try.rb

@@ -1,4 +1,4 @@
-require_relative '../helpers/test_helpers'
+require_relative '../support/helpers/test_helpers'
 
 # Define test classes in global namespace
 class ::TestVehicle < Familia::Horreum

data/try/{core → integration}/create_method_try.rb

@@ -3,7 +3,7 @@
 # Comprehensive test coverage for the create method
 # Tests the correct exception type and error message handling
 
-require_relative '../helpers/test_helpers'
+require_relative '../support/helpers/test_helpers'
 
 # Test class for create method behavior
 class CreateTestModel < Familia::Horreum

data/try/integration/cross_component_try.rb

@@ -1,6 +1,6 @@
 # Test cross-component integration scenarios
 
-require_relative '../helpers/test_helpers'
+require_relative '../support/helpers/test_helpers'
 
 class TestUser < Familia::Horreum
   using Familia::Refinements::StylizeWords

data/try/{core → integration}/database_consistency_try.rb

@@ -3,7 +3,7 @@
 # Database consistency verification and edge case testing
 # Complements persistence_operations_try.rb with deeper consistency checks
 
-require_relative '../helpers/test_helpers'
+require_relative '../support/helpers/test_helpers'
 
 # Test class with different field types for consistency verification
 class ConsistencyTestModel < Familia::Horreum
@@ -55,15 +55,18 @@ key_parts = dbkey.split(':')
 # Refresh and verify data integrity
 @serial_test.refresh!
 [@serial_test.name, @serial_test.active, @serial_test.metadata]
-#=> ['Serialization Test', 'true', {:key=>'value', :array=>[1, 2, 3]}]
+#=> ["Serialization Test", true, {"key"=>"value", "array"=>[1, 2, 3]}]
 
 ## Hash field count matches object field count
+@serial_test = ConsistencyTestModel.new(id: next_test_id)
+@serial_test.save
 expected_fields = @serial_test.class.persistent_fields.length
 redis_field_count = Familia.dbclient.hlen(@serial_test.dbkey)
 actual_object_fields = @serial_test.to_h.keys.length
-# All should match (redis may have fewer due to nil exclusion)
-[expected_fields >= redis_field_count, redis_field_count, actual_object_fields]
-#=> [true, 5, 5]
+# The JSON Serializer stores all fields (including nil as "null")
+# Expected fields (5) >= redis count (5) >= to_h count (5, even though email is nil)
+[expected_fields, redis_field_count, actual_object_fields]
+#=> [5, 5, 5]
 
 ## Memory vs persistence state consistency after save
 @consistency_obj = ConsistencyTestModel.new(id: next_test_id, name: 'Memory Test', email: 'test@example.com')
@@ -73,9 +76,9 @@ actual_object_fields = @serial_test.to_h.keys.length
 memory_name = @consistency_obj.name
 memory_email = @consistency_obj.email
 
-# Get persistence state
-redis_name = Familia.dbclient.hget(@consistency_obj.dbkey, 'name')
-redis_email = Familia.dbclient.hget(@consistency_obj.dbkey, 'email')
+# Get persistence state (deserialize from JSON storage)
+redis_name = @consistency_obj.deserialize_value(Familia.dbclient.hget(@consistency_obj.dbkey, 'name'))
+redis_email = @consistency_obj.deserialize_value(Familia.dbclient.hget(@consistency_obj.dbkey, 'email'))
 
 [memory_name == redis_name, memory_email == redis_email]
 #=> [true, true]