familia 2.0.0.pre14 → 2.0.0.pre15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e0d1d581a958fbf3492579039d9190764a83fb4add2a47fe3eb23d2d27ef2b
-  data.tar.gz: 9cda237209e910633ddcb9a7605cecb291eb66825de05aacd3bc6522168d220b
+  metadata.gz: 00416beac08786c1fffd75a0c2578669c6a0d18169824ca1a23e9122018a386b
+  data.tar.gz: c38f7bfe985a7d6151abf2ce4b6d7ca32ddb97adf8d069880f7e919662937851
 SHA512:
-  metadata.gz: 65cda30c3f3f96c0315c03f200dff37b507474d9a6367c6ce03b899450fd041403263ce6a5bfdb318bc90120c59234190e07548e576a522f92bcb4718dba6a55
-  data.tar.gz: 7a14a093a0fd83bce0e1fd08be41b98c4c418352d1d4210937cc3473f29264e1bf3dae2b671dee18c89b75faeb3a8e38b93ebf55632bba696da8653eb91b4eb3
+  metadata.gz: a3d6a60c86460578567fbd6f33e96c8ae0ee2dbfc80f3ffc6f123dc6fb84c6020efd359601122e63543c0128401d235587e9770df8acbbfa1f55cb908a012e07
+  data.tar.gz: 5062f93d7494df05a6d62dade395a0522ca8ab02afd4fdc5a00ee21db08b05ace8c3227d07739ef7cdd727fa72888ea4ec415491eb60028b25166d107d574e8e

data/CHANGELOG.rst

@@ -44,7 +44,7 @@ Added
 
 - **Feature Autoloading System**: Features can now automatically discover and load extension files from your project directories. When you include a feature like ``safe_dump``, Familia searches for configuration files using conventional patterns like ``{model_name}/{feature_name}_*.rb``, enabling clean separation between core model definitions and feature-specific configurations. See ``docs/migrating/v2.0.0-pre13.md`` for migration details.
 
-- **Consolidated autoloader architecture**: Introduced ``Familia::Autoloader`` as a shared utility for consistent file loading patterns across the framework, supporting both general-purpose and feature-specific autoloading scenarios.
+- **Consolidated autoloader architecture**: Introduced ``Familia::Features::Autoloader`` as a shared utility for consistent file loading patterns across the framework, supporting both general-purpose and feature-specific autoloading scenarios.
 
 - Added ``PER_MONTH`` constant (2,629,746 seconds = 30.437 days) derived from Gregorian year for consistent month calculations.
 - Added ``months``, ``month``, and ``in_months`` conversion methods to Numeric refinement.
@@ -183,7 +183,7 @@ Added
    with ancestry chain traversal for model-specific feature
    registration. This enables better organization, standardized naming,
    and automatic loading of project-specific features via the new
-   ``Familia::Autoloader`` module.
+   ``Familia::Features::Autoloader`` module.
 -  **Improved SafeDump DSL**: Replaced the internal
    ``@safe_dump_fields`` implementation with a cleaner, more robust DSL
    using ``safe_dump_field`` and ``safe_dump_fields`` methods.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    familia (2.0.0.pre14)
+    familia (2.0.0.pre15)
       benchmark (~> 0.4)
       connection_pool (~> 2.5)
       csv (~> 3.3)

data/docs/guides/Feature-System-Autoloading.md

@@ -44,7 +44,7 @@ end
 
 The `post_inclusion_autoload` system works in **two phases**:
 
-### Phase 1: Feature System Hook
+### Feature System Hook
 
 In `lib/familia/features.rb`, after including the feature module:
 
@@ -61,29 +61,6 @@ def feature(feature_name, **options)
 end
 ```
 
-### Phase 2: Autoloadable Implementation
-
-The `post_inclusion_autoload` method in `lib/familia/features/autoloadable.rb`:
-
-1. **Gets the source location** of the user's class file using Ruby's introspection:
-   ```ruby
-   location_info = Module.const_source_location(base.name)
-   source_location = location_info&.first  # e.g., "/path/to/models/user.rb"
-   ```
-
-2. **Calculates extension file paths** based on conventions:
-   ```ruby
-   base_dir = File.dirname(location_path)  # "/path/to/models"
-   model_name = base.name.snake_case       # "user"
-
-   # Look for files like:
-   patterns = [
-     "/path/to/models/user/safe_dump_*.rb",
-     "/path/to/models/user/features/safe_dump_*.rb",
-     "/path/to/models/features/safe_dump_*.rb"
-   ]
-   ```
-
 3. **Loads any matching files** found in those locations
 
 ## Why This Timing Matters
@@ -199,17 +176,10 @@ The `post_inclusion_autoload` system provides a clean, automatic, and safe way t
 
 ## Implementation Details
 
-### Autoloadable Module
+### Autoloader
 
-Features that support autoloading include the `Familia::Features::Autoloadable` module:
+Looks for features files in models/features.rb, models/features/, models/model_name/features.rb, models/model_name/features/
 
-```ruby
-module Familia::Features::SafeDump
-  include Familia::Features::Autoloadable  # ← Enables autoloading
-
-  # Feature implementation...
-end
-```
 
 ### Anonymous Class Handling
 

data/docs/migrating/v2.0.0-pre11.md

@@ -124,7 +124,7 @@ end
 
 class Customer < Familia::Horreum
   module Features
-    include Familia::Autoloader
+    include Familia::Features::Autoloader
     # Automatically discovers and loads all *.rb files from customer/features/
   end
 end
@@ -210,7 +210,7 @@ If you have project-specific features, set up auto-loading:
 module YourProject
   class ModelName < Familia::Horreum
     module Features
-      include Familia::Autoloader
+      include Familia::Features::Autoloader
     end
   end
 end

data/docs/migrating/v2.0.0-pre13.md

@@ -68,7 +68,7 @@ Common issues:
 
 The Feature Autoloading System consists of two key components:
 
-### Familia::Autoloader
+### Familia::Features::Autoloader
 A utility module providing shared file loading functionality:
 - Handles Dir.glob pattern matching and file loading
 - Provides consistent debug logging across all autoloading scenarios

data/lib/familia/{autoloader.rb → features/autoloader.rb}

@@ -1,11 +1,41 @@
-# frozen_string_literal: true
+# lib/familia/features/autoloader.rb
 
-module Familia
+module Familia::Features
   # Provides autoloading functionality for Ruby files based on patterns and conventions.
   #
   # Used by the Features module at library startup to load feature files, and available
   # as a utility for other modules requiring file autoloading capabilities.
   module Autoloader
+    using Familia::Refinements::SnakeCase
+
+    # Autoloads feature files when this module is included.
+    #
+    # Discovers and loads all Ruby files in the features/ directory relative to the
+    # including module's location. Typically used by Familia::Features.
+    #
+    # @param base [Module] the module including this autoloader
+    def self.included(base)
+
+      # Get the directory where the including module is defined
+      # This should be lib/familia for the Features module
+      base_path = File.dirname(caller_locations(1, 1).first.path)
+      model_name = base.name.snake_case
+      dir_patterns = [
+        File.join(base_path, 'features', '*.rb'),
+        File.join(base_path, model_name, 'features', '*.rb'),
+        File.join(base_path, model_name, 'features.rb'),
+      ]
+
+      # Ensure the Features module exists within the base module
+      unless base.const_defined?(:Features) || model_name.eql?('features')
+        base.const_set(:Features, Module.new)
+      end
+
+
+      # Use the shared autoload_files method
+      autoload_files(dir_patterns, log_prefix: "Autoloader[#{model_name}]")
+    end
+
     # Autoloads Ruby files matching the given patterns.
     #
     # @param patterns [String, Array<String>] file patterns to match (supports Dir.glob patterns)
@@ -15,6 +45,7 @@ module Familia
       patterns = Array(patterns)
 
       patterns.each do |pattern|
+        Familia.ld "[#{log_prefix}] Autoloader loading features from #{pattern}"
         Dir.glob(pattern).each do |file_path|
           basename = File.basename(file_path)
 
@@ -26,28 +57,5 @@ module Familia
         end
       end
     end
-
-    # Autoloads feature files when this module is included.
-    #
-    # Discovers and loads all Ruby files in the features/ directory relative to the
-    # including module's location. Typically used by Familia::Features.
-    #
-    # @param base [Module] the module including this autoloader
-    def self.included(base)
-      # Get the directory where the including module is defined
-      # This should be lib/familia for the Features module
-      base_path = File.dirname(caller_locations(1, 1).first.path)
-      features_dir = File.join(base_path, 'features')
-
-      Familia.ld "[DEBUG] Autoloader loading features from #{features_dir}"
-
-      return unless Dir.exist?(features_dir)
-
-      # Use the shared autoload_files method
-      autoload_files(
-        File.join(features_dir, '*.rb'),
-        log_prefix: 'Autoloader'
-      )
-    end
   end
 end

data/lib/familia/features/encrypted_fields.rb

@@ -255,6 +255,8 @@ module Familia
     # - Insider threats with application access
     #
     module EncryptedFields
+      Familia::Base.add_feature self, :encrypted_fields
+
       def self.included(base)
         Familia.trace :LOADED, self, base, caller(1..1) if Familia.debug?
         base.extend ClassMethods
@@ -430,8 +432,6 @@ module Familia
           end
         end
       end
-
-      Familia::Base.add_feature self, :encrypted_fields
     end
   end
 end

data/lib/familia/features/expiration/extensions.rb

@@ -0,0 +1,61 @@
+# lib/familia/features/expiration/extensions.rb
+
+module Familia
+  # Add a default update_expiration method for all classes that include
+  # Familia::Base. Since expiration is a core feature, we can confidently
+  # call `horreum_instance.update_expiration` without defensive programming
+  # even when expiration is not enabled for the horreum_instance class.
+  module Base
+    # Base implementation of update_expiration that maintains API compatibility
+    # with the :expiration feature's implementation.
+    #
+    # This is a no-op implementation that gets overridden by the :expiration
+    # feature. It accepts an optional default_expiration parameter to maintain
+    # interface compatibility with the overriding implementations.
+    #
+    # @param default_expiration [Numeric, nil] Time To Live in seconds
+    # @return [nil] Always returns nil for the base implementation
+    #
+    # @note This is a no-op implementation. Classes that need expiration
+    #       functionality should include the :expiration feature.
+    #
+    # @example Enable expiration feature
+    #   class MyModel < Familia::Horreum
+    #     feature :expiration
+    #     default_expiration 1.hour
+    #   end
+    #
+    def update_expiration(default_expiration: nil)
+      Familia.ld <<~LOG
+        [update_expiration] Expiration feature not enabled for #{self.class}.
+        Key: #{dbkey} Arg: #{default_expiration} (caller: #{caller(1..1)})
+      LOG
+      nil
+    end
+
+    # Base implementation of ttl that returns -1 (no expiration set)
+    #
+    # @return [Integer] Always returns -1 for the base implementation
+    #
+    def ttl
+      -1
+    end
+
+    # Base implementation of expires? that returns false
+    #
+    # @return [Boolean] Always returns false for the base implementation
+    #
+    def expires?
+      false
+    end
+
+    # Base implementation of expired? that returns false
+    #
+    # @param threshold [Numeric] Ignored in base implementation
+    # @return [Boolean] Always returns false for the base implementation
+    #
+    def expired?(_threshold = 0)
+      false
+    end
+  end
+end

data/lib/familia/features/expiration.rb

@@ -1,5 +1,7 @@
 # lib/familia/features/expiration.rb
 
+require_relative 'expiration/extensions'
+
 module Familia
   module Features
     # Expiration is a feature that provides Time To Live (TTL) management for Familia
@@ -149,6 +151,8 @@ module Familia
     module Expiration
       @default_expiration = nil
 
+      Familia::Base.add_feature self, :expiration
+
       using Familia::Refinements::TimeLiterals
 
       def self.included(base)
@@ -354,67 +358,6 @@ module Familia
         redis.persist(dbkey)
       end
 
-      Familia::Base.add_feature self, :expiration
-    end
-  end
-end
-
-module Familia
-  # Add a default update_expiration method for all classes that include
-  # Familia::Base. Since expiration is a core feature, we can confidently
-  # call `horreum_instance.update_expiration` without defensive programming
-  # even when expiration is not enabled for the horreum_instance class.
-  module Base
-    # Base implementation of update_expiration that maintains API compatibility
-    # with the :expiration feature's implementation.
-    #
-    # This is a no-op implementation that gets overridden by the :expiration
-    # feature. It accepts an optional default_expiration parameter to maintain
-    # interface compatibility with the overriding implementations.
-    #
-    # @param default_expiration [Numeric, nil] Time To Live in seconds
-    # @return [nil] Always returns nil for the base implementation
-    #
-    # @note This is a no-op implementation. Classes that need expiration
-    #       functionality should include the :expiration feature.
-    #
-    # @example Enable expiration feature
-    #   class MyModel < Familia::Horreum
-    #     feature :expiration
-    #     default_expiration 1.hour
-    #   end
-    #
-    def update_expiration(default_expiration: nil)
-      Familia.ld <<~LOG
-        [update_expiration] Expiration feature not enabled for #{self.class}.
-        Key: #{dbkey} Arg: #{default_expiration} (caller: #{caller(1..1)})
-      LOG
-      nil
-    end
-
-    # Base implementation of ttl that returns -1 (no expiration set)
-    #
-    # @return [Integer] Always returns -1 for the base implementation
-    #
-    def ttl
-      -1
-    end
-
-    # Base implementation of expires? that returns false
-    #
-    # @return [Boolean] Always returns false for the base implementation
-    #
-    def expires?
-      false
-    end
-
-    # Base implementation of expired? that returns false
-    #
-    # @param threshold [Numeric] Ignored in base implementation
-    # @return [Boolean] Always returns false for the base implementation
-    #
-    def expired?(_threshold = 0)
-      false
     end
   end
 end

data/lib/familia/features/external_identifier.rb

@@ -5,6 +5,9 @@ module Familia
     # Familia::Features::ExternalIdentifier
     #
     module ExternalIdentifier
+
+      Familia::Base.add_feature self, :external_identifier, depends_on: [:object_identifier]
+
       def self.included(base)
         Familia.trace :LOADED, self, base, caller(1..1) if Familia.debug?
         base.extend ClassMethods
@@ -304,7 +307,6 @@ module Familia
         end
       end
 
-      Familia::Base.add_feature self, :external_identifier, depends_on: [:object_identifier]
     end
   end
 end

data/lib/familia/features/object_identifier.rb

@@ -81,6 +81,8 @@ module Familia
     # - Custom generators allow domain-specific security requirements
     #
     module ObjectIdentifier
+      Familia::Base.add_feature self, :object_identifier, depends_on: []
+
       DEFAULT_GENERATOR = :uuid_v7
 
       def self.included(base)
@@ -301,7 +303,6 @@ module Familia
         Familia.trace :OBJID_INIT, dbclient, "Generator strategy: #{generator}", caller(1..1)
       end
 
-      Familia::Base.add_feature self, :object_identifier, depends_on: []
     end
   end
 end

data/lib/familia/features/quantization.rb

@@ -246,6 +246,8 @@ module Familia
     #
     module Quantization
 
+      Familia::Base.add_feature self, :quantization
+
       using Familia::Refinements::TimeLiterals
 
       def self.included(base)
@@ -397,8 +399,6 @@ module Familia
       end
 
       extend ClassMethods
-
-      Familia::Base.add_feature self, :quantization
     end
   end
 end

data/lib/familia/features/relationships.rb

@@ -98,9 +98,13 @@ module Familia
     #     { owner: team, collection: :domains }
     #   ], min_permission: :read)
     module Relationships
+
+      # Register the feature with Familia
+      Familia::Base.add_feature Relationships, :relationships
+
       # Feature initialization
       def self.included(base)
-        puts "[DEBUG] Relationships included in #{base}"
+        Familia.ld "[#{base}] Relationships included"
         base.extend ClassMethods
         base.include InstanceMethods
 
@@ -108,11 +112,8 @@ module Familia
         base.include ScoreEncoding
         base.include RedisOperations
 
-        puts '[DEBUG] Including Tracking module'
         base.include Tracking
-        puts '[DEBUG] Extending with Tracking::ClassMethods'
         base.extend Tracking::ClassMethods
-        puts "[DEBUG] Base now responds to tracked_in: #{base.respond_to?(:tracked_in)}"
 
         base.include Indexing
         base.extend Indexing::ClassMethods
@@ -466,8 +467,6 @@ module Familia
         end
       end
 
-      # Register the feature with Familia
-      Familia::Base.add_feature Relationships, :relationships
     end
   end
 end

data/lib/familia/features/safe_dump.rb

@@ -41,15 +41,15 @@ module Familia::Features
   # of symbols in the order they were defined.
   #
   module SafeDump
-    include Familia::Features::Autoloadable
+
+    Familia::Base.add_feature self, :safe_dump
+
     using Familia::Refinements::SnakeCase
 
     @dump_method = :to_json
     @load_method = :from_json
 
     def self.included(base)
-      # Call the Autoloadable module's included method for post-inclusion setup
-      super
 
       Familia.trace(:LOADED, self, base, caller(1..1)) if Familia.debug?
       base.extend ClassMethods
@@ -153,8 +153,6 @@ module Familia::Features
     end
 
     extend ClassMethods
-
-    Familia::Base.add_feature self, :safe_dump
   end
 end
 # rubocop:enable ThreadSafety/ClassInstanceVariable

data/lib/familia/features/transient_fields.rb

@@ -104,6 +104,9 @@ module Familia
     # (HashiCorp Vault, AWS Secrets Manager) or languages with secure memory handling.
     #
     module TransientFields
+
+      Familia::Base.add_feature self, :transient_fields, depends_on: nil
+
       def self.included(base)
         Familia.trace :LOADED, self, base, caller(1..1) if Familia.debug?
         base.extend ClassMethods
@@ -221,7 +224,6 @@ module Familia
         end
       end
 
-      Familia::Base.add_feature self, :transient_fields, depends_on: nil
     end
   end
 end

data/lib/familia/features.rb

@@ -1,7 +1,7 @@
 # lib/familia/features.rb
 
 # Load the Autoloader first, then use it to load all other features
-require_relative 'autoloader'
+require_relative 'features/autoloader'
 
 module Familia
   FeatureDefinition = Data.define(:name, :depends_on)
@@ -25,12 +25,21 @@ module Familia
   # feature options. When you enable a feature with options in different models,
   # each model stores its own separate configuration without interference.
   #
-  # ## Project Organization with Autoloadable
+  # ## Project Organization with Autoloader
   #
-  # For large projects, use {Familia::Features::Autoloadable} to automatically load
+  # For large projects, use {Familia::Features::Autoloader} to automatically load
   # project-specific features from a dedicated directory structure. This helps
   # organize complex models by separating features into individual files.
   #
+  # ### Class Reopening (Deprecated)
+  #
+  # Direct class reopening still works but generates deprecation warnings:
+  #
+  #   # app/models/customer/safe_dump_extensions.rb
+  #   class Customer
+  #     safe_dump_fields :name, :email  # Works but not recommended
+  #   end
+  #
   # @example Different models with different feature options
   #   class UserModel < Familia::Horreum
   #     feature :object_identifier, generator: :uuid_v4
@@ -57,15 +66,15 @@ module Familia
   #   # In your model file: app/models/customer.rb
   #   class Customer < Familia::Horreum
   #     module Features
-  #       include Familia::Features::Autoloadable
+  #       include Familia::Features::Autoloader
   #       # Automatically loads all .rb files from app/models/customer/features/
   #     end
   #   end
   #
-  # @see Familia::Features::Autoloadable For automatic feature loading
+  # @see Familia::Features::Autoloader For automatic feature loading
   #
   module Features
-    include Familia::Autoloader
+    include Familia::Features::Autoloader
 
     @features_enabled = nil
     attr_reader :features_enabled
@@ -110,8 +119,8 @@ module Familia
 
       # If there's a value provided check that it's a valid feature
       feature_name = feature_name.to_sym
-      feature_class = Familia::Base.find_feature(feature_name, self)
-      unless feature_class
+      feature_module = Familia::Base.find_feature(feature_name, self)
+      unless feature_module
         raise Familia::Problem, "Unsupported feature: #{feature_name}"
       end
 
@@ -146,11 +155,11 @@ module Familia
       end
 
       # Extend the Familia::Base subclass (e.g. Customer) with the feature module
-      include feature_class
+      include feature_module
 
       # Trigger post-inclusion autoloading for features that support it
-      if feature_class.respond_to?(:post_inclusion_autoload)
-        feature_class.post_inclusion_autoload(self, feature_name, options)
+      if feature_module.respond_to?(:post_inclusion_autoload)
+        feature_module.post_inclusion_autoload(self, feature_name, options)
       end
 
       # NOTE: Do we want to extend Familia::DataType here? That would make it

data/lib/familia/version.rb

@@ -2,5 +2,5 @@
 
 module Familia
   # Version information for the Familia
-  VERSION = '2.0.0.pre14'.freeze unless defined?(Familia::VERSION)
+  VERSION = '2.0.0.pre15'.freeze unless defined?(Familia::VERSION)
 end

data/lib/familia.rb

@@ -82,7 +82,6 @@ module Familia
 end
 
 require_relative 'familia/base'
-require_relative 'familia/features/autoloadable'
 require_relative 'familia/features'
 require_relative 'familia/data_type'
 require_relative 'familia/horreum'

data/try/core/autoloader_try.rb

@@ -30,16 +30,16 @@ File.write(@excluded_file, <<~RUBY)
   $autoloader_file_loaded = true
 RUBY
 
-## Test that Familia::Autoloader exists and is a module
-Familia::Autoloader.is_a?(Module)
+## Test that Familia::Features::Autoloader exists and is a module
+Familia::Features::Autoloader.is_a?(Module)
 #=> true
 
 ## Test that autoload_files class method exists
-Familia::Autoloader.respond_to?(:autoload_files)
+Familia::Features::Autoloader.respond_to?(:autoload_files)
 #=> true
 
 ## Test that included class method exists
-Familia::Autoloader.respond_to?(:included)
+Familia::Features::Autoloader.respond_to?(:included)
 #=> true
 
 ## Test autoload_files with single pattern
@@ -47,7 +47,7 @@ $test_feature1_loaded = false
 $test_feature2_loaded = false
 $autoloader_file_loaded = false
 
-Familia::Autoloader.autoload_files(File.join(@features_dir, '*.rb'))
+Familia::Features::Autoloader.autoload_files(File.join(@features_dir, '*.rb'))
 $test_feature1_loaded && $test_feature2_loaded
 #=> true
 
@@ -64,7 +64,7 @@ File.write(@exclude_file, '$exclude_me_loaded = true')
 $include_me_loaded = false
 $exclude_me_loaded = false
 
-Familia::Autoloader.autoload_files(
+Familia::Features::Autoloader.autoload_files(
   File.join(@exclude_features_dir, '*.rb'),
   exclude: ['autoloader.rb']
 )
@@ -88,7 +88,7 @@ File.write(@pattern_file2, '$pattern2_loaded = true')
 $pattern1_loaded = false
 $pattern2_loaded = false
 
-Familia::Autoloader.autoload_files([
+Familia::Features::Autoloader.autoload_files([
   File.join(@pattern_dir1, '*.rb'),
   File.join(@pattern_dir2, '*.rb')
 ])
@@ -99,11 +99,11 @@ $pattern1_loaded && $pattern2_loaded
 ## Test that included method loads features from features directory
 # Create a mock module that includes Autoloader
 @mock_features_module = Module.new do
-  include Familia::Autoloader
+  include Familia::Features::Autoloader
 end
 
 # The Features module already includes Autoloader, so test indirectly
-Familia::Features.ancestors.include?(Familia::Autoloader)
+Familia::Features.ancestors.include?(Familia::Features::Autoloader)
 #=> true
 
 # Cleanup test files and directories

data/try/features/safe_dump/module_based_extensions_try.rb

@@ -0,0 +1,100 @@
+# try/features/safe_dump/module_based_extensions_try.rb
+
+require_relative '../../../lib/familia'
+require 'fileutils'
+require 'tmpdir'
+
+# Create test directory structure for module-based SafeDump extensions
+@test_dir = Dir.mktmpdir('familia_module_extensions_test')
+@model_file = File.join(@test_dir, 'test_model.rb')
+@extension_file = File.join(@test_dir, 'test_model', 'safe_dump_extensions.rb')
+@extension_dir = File.join(@test_dir, 'test_model')
+
+# Create directory structure
+FileUtils.mkdir_p(@extension_dir)
+
+# Write test model file that uses SafeDump
+File.write(@model_file, <<~RUBY)
+  class TestModel < Familia::Horreum
+    field :name
+    field :email
+    field :secret
+
+    feature :safe_dump
+  end
+RUBY
+
+# Write extension file using NEW module-based pattern
+File.write(@extension_file, <<~RUBY)
+  module TestModel::SafeDumpExtensions
+    def self.included(base)
+      # Define safe dump fields using the DSL
+      base.safe_dump_fields :name, :email
+
+      # Add computed field
+      base.safe_dump_field :display_name, ->(obj) { "\#{obj.name} <\#{obj.email}>" }
+    end
+
+    # Add instance method to verify module inclusion
+    def module_extension_loaded?
+      true
+    end
+  end
+RUBY
+
+## Test module-based autoloading by loading model file
+@model_instance = nil
+
+begin
+  # Add test directory to load path for extension file loading
+  $LOAD_PATH.unshift(@test_dir)
+
+  require @model_file
+  @model_instance = TestModel.new(
+    name: 'Jane Doe',
+    email: 'jane@example.com',
+    secret: 'top secret'
+  )
+  true
+rescue => e
+  puts "Error: #{e.message}"
+  false
+end
+#=> true
+
+## Test that module extension method is available
+@model_instance.respond_to?(:module_extension_loaded?)
+#=> true
+
+## Test module extension method works
+@model_instance.module_extension_loaded?
+#=> true
+
+## Test that safe_dump fields were loaded from module extension
+TestModel.safe_dump_field_names.sort
+#=> [:display_name, :email, :name]
+
+## Test that safe_dump functionality works with module-loaded fields
+@dump_result = @model_instance.safe_dump
+@dump_result.keys.sort
+#=> [:display_name, :email, :name]
+
+## Test basic field values
+[@dump_result[:name], @dump_result[:email]]
+#=> ["Jane Doe", "jane@example.com"]
+
+## Test computed field from module
+@dump_result[:display_name]
+#=> "Jane Doe <jane@example.com>"
+
+## Test that secret field is excluded
+@dump_result.key?(:secret)
+#=> false
+
+## Test that the module was actually included (not just loaded)
+TestModel.included_modules.any? { |mod| mod.name&.include?('SafeDumpExtensions') }
+#=> true
+
+# Cleanup test files and directories
+FileUtils.rm_rf(@test_dir)
+$LOAD_PATH.shift if $LOAD_PATH.first == @test_dir

data/try/features/safe_dump/safe_dump_autoloading_try.rb

@@ -37,10 +37,6 @@ File.write(@extension_file, <<~RUBY)
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: familia
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre14
+  version: 2.0.0.pre15
 platform: ruby
 authors:
 - Delano Mandelbaum
@@ -193,7 +193,6 @@ files:
 - examples/safe_dump.rb
 - familia.gemspec
 - lib/familia.rb
-- lib/familia/autoloader.rb
 - lib/familia/base.rb
 - lib/familia/connection.rb
 - lib/familia/data_type.rb
@@ -217,11 +216,12 @@ files:
 - lib/familia/encryption/request_cache.rb
 - lib/familia/errors.rb
 - lib/familia/features.rb
-- lib/familia/features/autoloadable.rb
+- lib/familia/features/autoloader.rb
 - lib/familia/features/encrypted_fields.rb
 - lib/familia/features/encrypted_fields/concealed_string.rb
 - lib/familia/features/encrypted_fields/encrypted_field_type.rb
 - lib/familia/features/expiration.rb
+- lib/familia/features/expiration/extensions.rb
 - lib/familia/features/external_identifier.rb
 - lib/familia/features/object_identifier.rb
 - lib/familia/features/quantization.rb
@@ -336,7 +336,6 @@ files:
 - try/encryption/providers/xchacha20_poly1305_provider_try.rb
 - try/encryption/roundtrip_validation_try.rb
 - try/encryption/secure_memory_handling_try.rb
-- try/features/autoloadable/autoloadable_try.rb
 - try/features/encrypted_fields/aad_protection_try.rb
 - try/features/encrypted_fields/concealed_string_core_try.rb
 - try/features/encrypted_fields/context_isolation_try.rb
@@ -370,6 +369,7 @@ files:
 - try/features/relationships/relationships_performance_try.rb
 - try/features/relationships/relationships_performance_working_try.rb
 - try/features/relationships/relationships_try.rb
+- try/features/safe_dump/module_based_extensions_try.rb
 - try/features/safe_dump/safe_dump_advanced_try.rb
 - try/features/safe_dump/safe_dump_autoloading_try.rb
 - try/features/safe_dump/safe_dump_try.rb

data/lib/familia/features/autoloadable.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../refinements/snake_case'
-
-module Familia
-  module Features
-    # Enables automatic loading of feature-specific files when a feature is included in a user class.
-    #
-    # When included in a feature module, adds ClassMethods that detect when the feature is
-    # included in user classes, derives the feature name, and autoloads files matching
-    # conventional patterns in the user class's directory structure.
-    module Autoloadable
-      using Familia::Refinements::SnakeCase
-
-      # Sets up a feature module with autoloading capabilities.
-      #
-      # Extends the feature module with ClassMethods to handle post-inclusion autoloading.
-      #
-      # @param feature_module [Module] the feature module being enhanced
-      def self.included(feature_module)
-        feature_module.extend(ClassMethods)
-      end
-
-      # Methods added to feature modules that include Autoloadable.
-      module ClassMethods
-        # Triggered when the feature is included in a user class.
-        #
-        # Sets up for post-inclusion autoloading. The actual autoloading
-        # is deferred until after feature setup completes.
-        #
-        # @param base [Class] the user class including this feature
-        def included(base)
-          # Call parent included method if it exists (defensive programming for mixed-in contexts)
-          super if defined?(super)
-
-          # No autoloading here - it's deferred to post_inclusion_autoload
-          # to ensure the feature is fully set up before extension files are loaded
-        end
-
-        # Called by the feature system after the feature is fully included.
-        #
-        # Uses const_source_location to determine where the base class is defined,
-        # then autoloads feature-specific extension files from that location.
-        #
-        # @param base [Class] the class that included this feature
-        # @param feature_name [Symbol] the name of the feature
-        # @param options [Hash] feature options (unused but kept for compatibility)
-        def post_inclusion_autoload(base, feature_name, options)
-          Familia.trace :FEATURE, nil, "[Autoloadable] post_inclusion_autoload called for #{feature_name} on #{base.name || base}", caller(1..1) if Familia.debug?
-
-          # Get the source location via Ruby's built-in introspection
-          source_location = nil
-
-          # Check for named classes that can be looked up via const_source_location
-          # Class#name always returns String or nil, so type check is redundant
-          if base.name && !base.name.empty?
-            begin
-              location_info = Module.const_source_location(base.name)
-              source_location = location_info&.first
-              Familia.trace :FEATURE, nil, "[Autoloadable] Source location for #{base.name}: #{source_location}", caller(1..1) if Familia.debug?
-            rescue NameError => e
-              # Handle cases where the class name is not a valid constant name
-              # This can happen in test environments with dynamically created classes
-              Familia.trace :FEATURE, nil, "[Autoloadable] Cannot resolve source location for #{base.name}: #{e.message}", caller(1..1) if Familia.debug?
-            end
-          else
-            Familia.trace :FEATURE, nil, "[Autoloadable] Skipping source location detection - base.name=#{base.name.inspect}", caller(1..1) if Familia.debug?
-          end
-
-          # Autoload feature-specific files if we have a valid source location
-          if source_location && !source_location.include?('-e') # Skip eval/irb contexts
-            Familia.trace :FEATURE, nil, "[Autoloadable] Calling autoload_feature_files with #{source_location}", caller(1..1) if Familia.debug?
-            autoload_feature_files(source_location, base, feature_name.to_s.snake_case)
-          else
-            Familia.trace :FEATURE, nil, "[Autoloadable] Skipping autoload - no valid source location", caller(1..1) if Familia.debug?
-          end
-        end
-
-        private
-
-        # Autoloads feature-specific files from conventional directory patterns.
-        #
-        # Searches for files matching patterns like:
-        # - model_name/feature_name_*.rb
-        # - model_name/features/feature_name_*.rb
-        # - features/feature_name_*.rb
-        #
-        # @param location_path [String] path where the user class is defined
-        # @param base [Class] the user class including the feature
-        # @param feature_name [String] snake_case name of the feature
-        def autoload_feature_files(location_path, base, feature_name)
-          base_dir = File.dirname(location_path)
-
-          # Handle anonymous classes gracefully
-          model_name = base.name ? base.name.snake_case : "anonymous_#{base.object_id}"
-
-          # Look for feature-specific files in conventional locations
-          patterns = [
-            File.join(base_dir, model_name, "#{feature_name}_*.rb"),
-            File.join(base_dir, model_name, 'features', "#{feature_name}_*.rb"),
-            File.join(base_dir, 'features', "#{feature_name}_*.rb"),
-          ]
-
-          # Use Autoloader's shared method for consistent file loading
-          Familia::Autoloader.autoload_files(
-            patterns,
-            log_prefix: "Autoloadable(#{feature_name})"
-          )
-        end
-      end
-    end
-  end
-end

data/try/features/autoloadable/autoloadable_try.rb

@@ -1,61 +0,0 @@
-# try/features/autoloadable/autoloadable_try.rb
-
-require_relative '../../../lib/familia'
-
-# Create test feature module that includes Autoloadable
-module TestAutoloadableFeature
-  include Familia::Features::Autoloadable
-
-  def self.included(base)
-    super
-    base.define_method(:test_feature_method) { "feature_loaded" }
-  end
-end
-
-# Create test class to include the feature
-class TestModelForAutoloadable < Familia::Horreum
-  field :name
-end
-
-## Test that Autoloadable can be included in feature modules
-TestAutoloadableFeature.ancestors.include?(Familia::Features::Autoloadable)
-#=> true
-
-## Test that Autoloadable extends feature modules with ClassMethods
-TestAutoloadableFeature.respond_to?(:post_inclusion_autoload)
-#=> true
-
-## Test that including autoloadable feature in Horreum class works
-TestModelForAutoloadable.include(TestAutoloadableFeature)
-TestModelForAutoloadable.ancestors.include?(TestAutoloadableFeature)
-#=> true
-
-## Test that post_inclusion_autoload can be called with test class
-TestAutoloadableFeature.post_inclusion_autoload(TestModelForAutoloadable, :test_autoloadable_feature, {})
-"success"
-#=> "success"
-
-## Test that feature methods are available on the model
-@test_instance = TestModelForAutoloadable.new(name: 'test')
-@test_instance.respond_to?(:test_feature_method)
-#=> true
-
-## Test that feature method works
-@test_instance.test_feature_method
-#=> "feature_loaded"
-
-## Test that Autoloadable works with DataType classes (should not crash)
-class TestDataTypeAutoloadable < Familia::DataType
-  include Familia::Features::Autoloadable
-end
-
-TestDataTypeAutoloadable.ancestors.include?(Familia::Features::Autoloadable)
-#=> true
-
-## Test that SafeDump includes Autoloadable (real-world usage)
-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