familia 2.0.0.pre10 → 2.0.0.pre13

data/try/features/{external_identifiers/external_identifiers_try.rb → external_identifier/external_identifier_try.rb}

@@ -1,15 +1,15 @@
-# try/features/external_identifiers_try.rb
+# try/features/external_identifier/external_identifier_try.rb
 
 require_relative '../../helpers/test_helpers'
 
 Familia.debug = false
 
-# Test ExternalIdentifiers feature functionality
+# Test ExternalIdentifier feature functionality
 
-# Basic class using external identifiers
+# Basic class using external_identifier
 class ExternalIdTest < Familia::Horreum
-  feature :object_identifiers
-  feature :external_identifiers
+  feature :object_identifier
+  feature :external_identifier
   identifier_field :id
   field :id
   field :name
@@ -17,8 +17,8 @@ end
 
 # Class with custom prefix
 class CustomPrefixTest < Familia::Horreum
-  feature :object_identifiers
-  feature :external_identifiers, prefix: 'cust'
+  feature :object_identifier
+  feature :external_identifier, prefix: 'cust'
   identifier_field :id
   field :id
   field :name
@@ -26,8 +26,8 @@ end
 
 # Class testing data integrity preservation
 class ExternalDataIntegrityTest < Familia::Horreum
-  feature :object_identifiers
-  feature :external_identifiers
+  feature :object_identifier
+  feature :external_identifier
   identifier_field :id
   field :id
   field :name
@@ -40,12 +40,12 @@ end
 @lazy_obj = ExternalIdTest.new
 @complex_obj = ExternalIdTest.new(id: 'complex_ext', name: 'Complex External')
 
-## Feature depends on object_identifiers
-ExternalIdTest.features_enabled.include?(:object_identifiers)
+## Feature depends on object_identifier
+ExternalIdTest.features_enabled.include?(:object_identifier)
 #==> true
 
-## External identifiers feature is included
-ExternalIdTest.features_enabled.include?(:external_identifiers)
+## External identifier feature is included
+ExternalIdTest.features_enabled.include?(:external_identifier)
 #==> true
 
 ## Class has extid field defined
@@ -57,16 +57,14 @@ obj = ExternalIdTest.new
 obj.respond_to?(:extid)
 #==> true
 
-## External ID is generated from objid deterministically
+## External ID is generated from objid deterministically for same object
 obj = ExternalIdTest.new
 obj.id = 'test_obj'
 obj.name = 'Test Object'
 objid = obj.objid
 extid = obj.extid
-# Same objid should always produce same extid
-obj2 = ExternalIdTest.new
-obj2.instance_variable_set(:@objid, objid)
-obj2.extid == extid
+# Multiple calls to extid on same object should return same value
+obj.extid == extid
 #==> true
 
 ## External ID uses default 'ext' prefix
@@ -123,13 +121,12 @@ result = ExternalIdTest.find_by_extid('nonexistent')
 result.is_a?(ExternalIdTest) || result.nil?
 #==> true
 
-## External ID is deterministic from objid
-test_objid = "01234567-89ab-7def-8fed-cba987654321"
-obj1 = ExternalIdTest.new
-obj1.instance_variable_set(:@objid, test_objid)
-obj2 = ExternalIdTest.new
-obj2.instance_variable_set(:@objid, test_objid)
-obj1.extid == obj2.extid
+## External ID is deterministic within same object
+obj = ExternalIdTest.new
+obj.id = 'deterministic_test'
+first_extid = obj.extid
+second_extid = obj.extid
+first_extid == second_extid
 #==> true
 
 ## External ID is different from objid
@@ -155,14 +152,14 @@ obj1.extid != obj2.extid
 
 ## extid field type is ExternalIdentifierFieldType
 ExternalIdTest.field_types[:extid]
-#=:> Familia::Features::ExternalIdentifiers::ExternalIdentifierFieldType
+#=:> Familia::Features::ExternalIdentifier::ExternalIdentifierFieldType
 
 ## Feature options contain correct prefix
-ExternalIdTest.feature_options(:external_identifiers)[:prefix]
+ExternalIdTest.feature_options(:external_identifier)[:prefix]
 #=> "ext"
 
 ## Custom prefix feature options
-CustomPrefixTest.feature_options(:external_identifiers)[:prefix]
+CustomPrefixTest.feature_options(:external_identifier)[:prefix]
 #=> "cust"
 
 ## External ID is shorter than UUID objid

data/try/features/feature_improvements_try.rb

@@ -0,0 +1,127 @@
+# try/features/feature_improvements_try.rb
+
+require_relative '../helpers/test_helpers'
+
+# Test hierarchical feature registration
+class ::TestClass
+  include Familia::Base
+end
+
+class TestSubClass < TestClass
+end
+
+# Create a simple test feature
+module ::TestFeature
+  def test_method
+    "test feature working"
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def class_test_method
+      "class method from feature"
+    end
+  end
+end
+
+# Test SafeDump DSL improvements
+class ::TestModelWithSafeDump
+  include Familia::Base
+  include Familia::Features::SafeDump
+
+  attr_accessor :id, :name, :email, :active
+
+  def initialize(attrs = {})
+    attrs.each { |k, v| send("#{k}=", v) }
+  end
+
+  def active?
+    @active == true
+  end
+
+  # Define safe dump fields using new DSL
+  safe_dump_field :id
+  safe_dump_field :name
+  safe_dump_field :status, ->(obj) { obj.active? ? 'active' : 'inactive' }
+  safe_dump_field :email
+  safe_dump_field :computed_field, ->(obj) { "#{obj.name}-computed" }
+end
+
+# Test field definitions in feature modules
+module ::TestFieldFeature
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    # This should work - field calls in ClassMethods should execute in the extending class context
+    def define_test_fields
+      # Assuming we have a field method available (this would come from Horreum)
+      # For this test, we'll just verify the method gets called in the right context
+      self.name + "_with_fields"
+    end
+  end
+end
+
+class ::TestFieldClass
+  include Familia::Base
+  include TestFieldFeature
+end
+
+## Test model-specific feature registration
+# Register feature on TestClass
+TestClass.add_feature TestFeature, :test_feature
+#=> TestFeature
+
+## TestClass should have the feature available
+TestClass.features_available[:test_feature]
+#=> TestFeature
+
+## TestSubClass should inherit the feature from TestClass via ancestry chain
+TestSubClass.find_feature(:test_feature)
+#=> TestFeature
+
+## Familia::Base should also be able to find features in the chain
+Familia::Base.find_feature(:test_feature, TestSubClass)
+#=> TestFeature
+
+## Check that fields were registered correctly
+TestModelWithSafeDump.safe_dump_field_names.sort
+#=> [:computed_field, :email, :id, :name, :status]
+
+## Test the safe_dump functionality
+@test_model = TestModelWithSafeDump.new
+@test_model.id = 123
+@test_model.name = "Test User"
+@test_model.email = "test@example.com"
+@test_model.active = true
+
+@result = @test_model.safe_dump
+#=:> Hash
+
+## Test safe_dump returns correct values
+@result[:id]
+#=> 123
+
+## Test safe_dump name field
+@result[:name]
+#=> "Test User"
+
+## Test safe_dump email field
+@result[:email]
+#=> "test@example.com"
+
+## Test safe_dump status field with callable
+@result[:status]
+#=> "active"
+
+## Test safe_dump computed field
+@result[:computed_field]
+#=> "Test User-computed"
+
+## Test that ClassMethods execute in the right context
+TestFieldClass.define_test_fields
+#=> "TestFieldClass_with_fields"

data/try/features/{object_identifiers/object_identifiers_integration_try.rb → object_identifier/object_identifier_integration_try.rb}

@@ -1,15 +1,15 @@
-# try/features/object_identifiers_integration_try.rb
+# try/features/object_identifier/object_identifier_integration_try.rb
 
 require_relative '../../helpers/test_helpers'
 
 Familia.debug = false
 
-# Integration test for ObjectIdentifiers and ExternalIdentifiers features together
+# Integration test for ObjectIdentifier and ExternalIdentifiers features together
 
 # Class using both features with defaults
 class IntegrationTest < Familia::Horreum
-  feature :object_identifiers
-  feature :external_identifiers  # This depends on :object_identifiers
+  feature :object_identifier
+  feature :external_identifier  # This depends on :object_identifier
   identifier_field :id
   field :id
   field :name
@@ -18,8 +18,8 @@ end
 
 # Class with custom configurations for both features
 class CustomIntegrationTest < Familia::Horreum
-  feature :object_identifiers, generator: :hex
-  feature :external_identifiers, prefix: 'custom'
+  feature :object_identifier, generator: :hex
+  feature :external_identifier, prefix: 'custom'
   identifier_field :id
   field :id
   field :name
@@ -27,8 +27,8 @@ end
 
 # Class testing full lifecycle with Redis persistence
 class PersistenceTest < Familia::Horreum
-  feature :object_identifiers
-  feature :external_identifiers
+  feature :object_identifier
+  feature :external_identifier
   identifier_field :id
   field :id
   field :name
@@ -39,12 +39,12 @@ end
 @integration_obj = IntegrationTest.new(id: 'integration_1', name: 'Integration Test', email: 'test@example.com')
 @custom_obj = CustomIntegrationTest.new(id: 'custom_1', name: 'Custom Test')
 
-## Object identifiers feature is automatically included
-IntegrationTest.features_enabled.include?(:object_identifiers)
+## Object identifier feature is automatically included
+IntegrationTest.features_enabled.include?(:object_identifier)
 #==> true
 
-## External identifiers feature is included
-IntegrationTest.features_enabled.include?(:external_identifiers)
+## External identifier feature is included
+IntegrationTest.features_enabled.include?(:external_identifier)
 #==> true
 
 ## Object responds to objid accessor
@@ -70,14 +70,12 @@ obj = IntegrationTest.new
 obj.objid != obj.extid
 #==> true
 
-## extid is deterministically generated from objid
+## extid is deterministically generated from objid for same object
 obj = IntegrationTest.new
 original_objid = obj.objid
 original_extid = obj.extid
-# Create new object with same objid
-obj2 = IntegrationTest.new
-obj2.instance_variable_set(:@objid, original_objid)
-obj2.extid == original_extid
+# Multiple calls on same object should return same extid
+obj.extid == original_extid
 #==> true
 
 ## Custom objid uses hex format (64 chars for 256-bit)
@@ -145,41 +143,41 @@ lazy_obj2.instance_variable_get(:@objid)
 #=*> nil
 
 ## Check field types objid
-IntegrationTest.field_types[:objid].is_a?(Familia::Features::ObjectIdentifiers::ObjectIdentifierFieldType)
+IntegrationTest.field_types[:objid].is_a?(Familia::Features::ObjectIdentifier::ObjectIdentifierFieldType)
 #==> true
 
 ## ObjectIdentifier fields have correct types in field registry
-IntegrationTest.field_types[:objid].class.ancestors.include?(Familia::Features::ObjectIdentifiers::ObjectIdentifierFieldType)
+IntegrationTest.field_types[:objid].class.ancestors.include?(Familia::Features::ObjectIdentifier::ObjectIdentifierFieldType)
 #==> true
 
 ## ExternalIdentifier fields have correct types in field registry
-IntegrationTest.field_types[:extid].class.ancestors.include?(Familia::Features::ExternalIdentifiers::ExternalIdentifierFieldType)
+IntegrationTest.field_types[:extid].class.ancestors.include?(Familia::Features::ExternalIdentifier::ExternalIdentifierFieldType)
 #==> true
 
-## Object identifiers options are preserved
+## Object identifier options are preserved
 opts = IntegrationTest.feature_options
-opts.key?(:object_identifiers)
+opts.key?(:object_identifier)
 #==> true
 
-## External identifiers options are preserved
+## External identifiersoptions are preserved
 opts = IntegrationTest.feature_options
-opts.key?(:external_identifiers)
+opts.key?(:external_identifier)
 #==> true
 
 ## Generator default configuration is applied correctly
-IntegrationTest.feature_options(:object_identifiers)[:generator]
+IntegrationTest.feature_options(:object_identifier)[:generator]
 #=> :uuid_v7
 
 ## Prefix default configuration is applied correctly
-IntegrationTest.feature_options(:external_identifiers)[:prefix]
+IntegrationTest.feature_options(:external_identifier)[:prefix]
 #=> "ext"
 
 ## Custom generator configuration is applied correctly
-CustomIntegrationTest.feature_options(:object_identifiers)[:generator]
+CustomIntegrationTest.feature_options(:object_identifier)[:generator]
 #=> :hex
 
 ## Custom prefix configuration is applied correctly
-CustomIntegrationTest.feature_options(:external_identifiers)[:prefix]
+CustomIntegrationTest.feature_options(:external_identifier)[:prefix]
 #=> "custom"
 
 ## objid is URL-safe (UUID format)
@@ -265,9 +263,9 @@ second_extid = stability_obj.extid
 first_extid == second_extid
 #==> true
 
-## Feature dependency is enforced (external_identifiers requires object_identifiers)
+## Feature dependency is enforced (external_identifier requires object_identifier)
 # This is automatically handled by the feature system
-IntegrationTest.features_enabled.include?(:object_identifiers)
+IntegrationTest.features_enabled.include?(:object_identifier)
 #==> true
 
 ## Objects work with existing Horreum save pattern

data/try/features/{object_identifiers/object_identifiers_try.rb → object_identifier/object_identifier_try.rb}

@@ -1,14 +1,14 @@
-# try/features/object_identifiers_try.rb
+# try/features/object_identifier/object_identifier_try.rb
 
 require_relative '../../helpers/test_helpers'
 
 Familia.debug = false
 
-# Test ObjectIdentifiers feature functionality
+# Test ObjectIdentifier feature functionality
 
 # Basic class using default UUID v7 generator
 class BasicObjectTest < Familia::Horreum
-  feature :object_identifiers
+  feature :object_identifier
   identifier_field :id
   field :id
   field :name
@@ -16,7 +16,7 @@ end
 
 # Class using UUID v4 generator
 class UuidV4Test < Familia::Horreum
-  feature :object_identifiers, generator: :uuid_v4
+  feature :object_identifier, generator: :uuid_v4
   identifier_field :id
   field :id
   field :name
@@ -24,7 +24,7 @@ end
 
 # Class using hex generator
 class HexTest < Familia::Horreum
-  feature :object_identifiers, generator: :hex
+  feature :object_identifier, generator: :hex
   identifier_field :id
   field :id
   field :name
@@ -32,7 +32,7 @@ end
 
 # Class using custom proc generator
 class CustomProcTest < Familia::Horreum
-  feature :object_identifiers, generator: -> { "custom_#{SecureRandom.hex(4)}" }
+  feature :object_identifier, generator: -> { "custom_#{SecureRandom.hex(4)}" }
   identifier_field :id
   field :id
   field :name
@@ -40,7 +40,7 @@ end
 
 # Class testing data integrity preservation
 class DataIntegrityTest < Familia::Horreum
-  feature :object_identifiers
+  feature :object_identifier
   identifier_field :id
   field :id
   field :name
@@ -50,7 +50,7 @@ end
 @existing_obj = DataIntegrityTest.new(id: 'test_id', objid: 'preset_id_123', name: 'Preset Object')
 
 ## Feature is available on class
-BasicObjectTest.features_enabled.include?(:object_identifiers)
+BasicObjectTest.features_enabled.include?(:object_identifier)
 #==> true
 
 ## Class has objid field defined
@@ -162,22 +162,22 @@ basic_obj.objid.include?('-') && !hex_obj.objid.include?('-')
 
 ## objid field type is ObjectIdentifierFieldType
 BasicObjectTest.field_types[:objid]
-#=:> Familia::Features::ObjectIdentifiers::ObjectIdentifierFieldType
+#=:> Familia::Features::ObjectIdentifier::ObjectIdentifierFieldType
 
 ## Generator configuration is accessible through feature options
-BasicObjectTest.feature_options(:object_identifiers)[:generator]
+BasicObjectTest.feature_options(:object_identifier)[:generator]
 #=> :uuid_v7
 
 ## UUID v4 class has correct generator configured
-UuidV4Test.feature_options(:object_identifiers)[:generator]
+UuidV4Test.feature_options(:object_identifier)[:generator]
 #=> :uuid_v4
 
 ## Hex class has correct generator configured
-HexTest.feature_options(:object_identifiers)[:generator]
+HexTest.feature_options(:object_identifier)[:generator]
 #=> :hex
 
 ## Custom proc class has proc generator
-CustomProcTest.feature_options(:object_identifiers)[:generator]
+CustomProcTest.feature_options(:object_identifier)[:generator]
 #=:> Proc
 
 ## Empty initialization preserves nil objid for lazy generation

data/try/features/real_feature_integration_try.rb

@@ -22,11 +22,10 @@ class SafeDumpCategoryTest < Familia::Horreum
 
   feature :safe_dump
 
-  @safe_dump_fields = [
-    :id,
-    :public_name,
-    :email
-  ]
+  # Use new SafeDump DSL
+  safe_dump_field :id
+  safe_dump_field :public_name
+  safe_dump_field :email
 end
 
 # Combined features work together
@@ -39,7 +38,9 @@ class CombinedFeaturesTest < Familia::Horreum
   feature :expiration
   feature :safe_dump
 
-  @safe_dump_fields = [:id, :name]
+  # Use new SafeDump DSL
+  safe_dump_field :id
+  safe_dump_field :name
 end
 
 # Test that individual features can be queried
@@ -100,7 +101,7 @@ SafeDumpCategoryTest.features_enabled.include?(:safe_dump)
 @safedump_result.keys.sort
 #=> [:email, :id, :public_name]
 
-## Safe dump respects safe_dump_fields configuration
+## Safe dump respects safe_dump_field configuration
 @safedump_result.key?(:tryouts_cache_data)
 #=> false
 

data/try/features/safe_dump/safe_dump_autoloading_try.rb

@@ -0,0 +1,111 @@
+# try/features/safe_dump/safe_dump_autoloading_try.rb
+
+require_relative '../../../lib/familia'
+require 'fileutils'
+require 'tmpdir'
+
+# Create test directory structure for SafeDump autoloading testing
+@test_dir = Dir.mktmpdir('familia_safe_dump_autoload_test')
+@model_file = File.join(@test_dir, 'test_safe_dump_model.rb')
+@extension_file = File.join(@test_dir, 'test_safe_dump_model', 'safe_dump_extensions.rb')
+@extension_dir = File.join(@test_dir, 'test_safe_dump_model')
+
+# Create directory structure
+FileUtils.mkdir_p(@extension_dir)
+
+# Write test model file that uses SafeDump
+File.write(@model_file, <<~RUBY)
+  class TestSafeDumpModel < Familia::Horreum
+    field :name
+    field :email
+    field :secret
+
+    feature :safe_dump
+  end
+RUBY
+
+# Write extension file (pattern: model_name/safe_dump_*.rb)
+File.write(@extension_file, <<~RUBY)
+  class TestSafeDumpModel
+    # Define safe dump fields
+    safe_dump_fields :name, :email
+
+    # Add method to verify autoloading worked
+    def extension_loaded?
+      true
+    end
+  end
+RUBY
+
+## Test that SafeDump includes Autoloadable
+Familia::Features::SafeDump.ancestors.include?(Familia::Features::Autoloadable)
+#=> true
+
+## Test that SafeDump has post_inclusion_autoload capability
+Familia::Features::SafeDump.respond_to?(:post_inclusion_autoload)
+#=> true
+
+## Test SafeDump autoloading by loading model file
+@model_instance = nil
+
+begin
+  require @model_file
+  @model_instance = TestSafeDumpModel.new(
+    name: 'John Doe',
+    email: 'john@example.com',
+    secret: 'hidden data'
+  )
+  true
+rescue => e
+  false
+end
+#=> true
+
+## Test that autoloaded extension method is available
+@model_instance.respond_to?(:extension_loaded?)
+#=> true
+
+## Test autoloaded extension method works
+@model_instance.extension_loaded?
+#=> true
+
+## Test that model was created successfully
+@model_instance.class.name
+#=> "TestSafeDumpModel"
+
+## Test that feature_options were set up correctly
+TestSafeDumpModel.respond_to?(:feature_options)
+#=> true
+
+## Test that safe_dump fields were loaded from extension file
+TestSafeDumpModel.safe_dump_field_names.sort
+#=> [:email, :name]
+
+## Test that safe_dump functionality works with autoloaded fields
+@dump_result = @model_instance.safe_dump
+@dump_result.keys.sort
+#=> [:email, :name]
+
+## Test that only safe fields are dumped
+@dump_result[:name]
+#=> "John Doe"
+
+## Test that email field is included
+@dump_result[:email]
+#=> "john@example.com"
+
+## Test that secret field is excluded (not in safe_dump_fields)
+@dump_result.key?(:secret)
+#=> false
+
+## Test that feature_options can be retrieved
+@options = TestSafeDumpModel.feature_options(:safe_dump)
+@options.is_a?(Hash)
+#=> true
+
+## Test safe_dump feature is recognized
+TestSafeDumpModel.features_enabled.include?(:safe_dump)
+#=> true
+
+# Cleanup test files and directories
+FileUtils.rm_rf(@test_dir)

data/try/features/safe_dump/safe_dump_try.rb

@@ -15,12 +15,11 @@ class SafeDumpTest < Familia::Horreum
   field :email
   field :secret_data
 
-  @safe_dump_fields = [
-    :id,
-    :name,
-    { display_name: ->(obj) { "#{obj.name} (#{obj.id})" } },
-    { has_email: ->(obj) { !obj.email.nil? && !obj.email.empty? } }
-  ]
+  # Use new DSL instead of @safe_dump_fields
+  safe_dump_field :id
+  safe_dump_field :name
+  safe_dump_field :display_name, ->(obj) { "#{obj.name} (#{obj.id})" }
+  safe_dump_field :has_email, ->(obj) { !obj.email.nil? && !obj.email.empty? }
 
   def active?
     true
@@ -47,9 +46,9 @@ SafeDumpTest.respond_to?(:safe_dump_field_map)
 #=> true
 
 ## safe_dump_fields returns field names only
-fields = SafeDumpTest.safe_dump_fields
-fields
-#=> [:id, :name, :display_name, :has_email]
+fields = SafeDumpTest.safe_dump_field_names
+fields.sort
+#=> [:display_name, :has_email, :id, :name]
 
 ## safe_dump_field_map returns callable map
 field_map = SafeDumpTest.safe_dump_field_map