familia 2.0.0.pre13 → 2.0.0.pre15

data/try/core/time_utils_try.rb

@@ -1,7 +1,7 @@
 require_relative '../helpers/test_helpers'
 
 module RefinedContext
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   def self.eval_in_refined_context(code)
     eval(code)
@@ -12,7 +12,7 @@ module RefinedContext
   end
 end
 
-# Test TimeUtils refinement
+# Test TimeLiterals refinement
 
 ## Numeric#months - convert number to months in seconds
 result = RefinedContext.eval_in_refined_context("1.month")
@@ -34,7 +34,7 @@ RefinedContext.instance_eval_in_refined_context("2629746.in_months")
 #=> 1.0
 
 ## Numeric#in_years - convert seconds to years
-result = RefinedContext.eval_in_refined_context("#{Familia::Refinements::TimeUtils::PER_YEAR}.in_years")
+result = RefinedContext.eval_in_refined_context("#{Familia::Refinements::TimeLiterals::PER_YEAR}.in_years")
 result.round(1)
 #=> 1.0
 
@@ -52,75 +52,75 @@ result.round(0)
 #=> 31556952.0
 
 ## Numeric#age_in - calculate age in months from timestamp (approximately 1 month ago)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_MONTH
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_MONTH
 result = RefinedContext.eval_in_refined_context("#{timestamp}.age_in(:months)")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## Numeric#age_in - calculate age in years from timestamp (approximately 1 year ago)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_YEAR
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_YEAR
 result = RefinedContext.instance_eval_in_refined_context("#{timestamp}.age_in(:years)")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## Numeric#months_old - convenience method for age_in(:months)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_MONTH
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_MONTH
 result = RefinedContext.eval_in_refined_context("#{timestamp}.months_old")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## Numeric#years_old - convenience method for age_in(:years)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_YEAR
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_YEAR
 result = RefinedContext.instance_eval_in_refined_context("#{timestamp}.years_old")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## Numeric#months_old - should NOT return seconds (the original bug)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_MONTH
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_MONTH
 result = RefinedContext.eval_in_refined_context("#{timestamp}.months_old")
 result.between?(0.9, 1.1)  # Should be ~1 month, not millions of seconds
 #=> true
 
 ## Numeric#years_old - should NOT return seconds (the original bug)
-timestamp = Time.now.to_f - Familia::Refinements::TimeUtils::PER_YEAR
+timestamp = Time.now.to_f - Familia::Refinements::TimeLiterals::PER_YEAR
 result = RefinedContext.instance_eval_in_refined_context("#{timestamp}.years_old")
 result.between?(0.9, 1.1)  # Should be ~1 year, not millions of seconds
 #=> true
 
 ## age_in with from_time parameter - months
-past_time = Time.now - (2 * Familia::Refinements::TimeUtils::PER_MONTH)  # 2 months ago
-from_time = Time.now - Familia::Refinements::TimeUtils::PER_MONTH  # 1 month ago
+past_time = Time.now - (2 * Familia::Refinements::TimeLiterals::PER_MONTH)  # 2 months ago
+from_time = Time.now - Familia::Refinements::TimeLiterals::PER_MONTH  # 1 month ago
 result = RefinedContext.eval_in_refined_context("#{past_time.to_f}.age_in(:months, #{from_time.to_f})")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## age_in with from_time parameter - years
-past_time = Time.now - (2 * Familia::Refinements::TimeUtils::PER_YEAR)  # 2 years ago
-from_time = Time.now - Familia::Refinements::TimeUtils::PER_YEAR  # 1 year ago
+past_time = Time.now - (2 * Familia::Refinements::TimeLiterals::PER_YEAR)  # 2 years ago
+from_time = Time.now - Familia::Refinements::TimeLiterals::PER_YEAR  # 1 year ago
 result = RefinedContext.instance_eval_in_refined_context("#{past_time.to_f}.age_in(:years, #{from_time.to_f})")
 (result - 1.0).abs < 0.01
 #=> true
 
 ## Verify month constant is approximately correct (30.437 days)
 expected_seconds_per_month = 30.437 * 24 * 60 * 60
-Familia::Refinements::TimeUtils::PER_MONTH.round(0)
+Familia::Refinements::TimeLiterals::PER_MONTH.round(0)
 #=> 2629746.0
 
 ## Verify year constant (365.2425 days - Gregorian year)
 expected_seconds_per_year = 365.2425 * 24 * 60 * 60
-Familia::Refinements::TimeUtils::PER_YEAR.round(0)
+Familia::Refinements::TimeLiterals::PER_YEAR.round(0)
 #=> 31556952.0
 
 ## UNIT_METHODS contains months mapping
-Familia::Refinements::TimeUtils::UNIT_METHODS['months']
+Familia::Refinements::TimeLiterals::UNIT_METHODS['months']
 #=> :months
 
 ## UNIT_METHODS contains mo mapping
-Familia::Refinements::TimeUtils::UNIT_METHODS['mo']
+Familia::Refinements::TimeLiterals::UNIT_METHODS['mo']
 #=> :months
 
 ## UNIT_METHODS contains month mapping
-Familia::Refinements::TimeUtils::UNIT_METHODS['month']
+Familia::Refinements::TimeLiterals::UNIT_METHODS['month']
 #=> :months
 
 ## Calendar consistency - 12 months equals 1 year (fix for inconsistency issue)

data/try/features/external_identifier/external_identifier_try.rb

@@ -198,3 +198,29 @@ ExternalIdTest.extid_lookup[@test_obj.extid]
 
 # Cleanup test objects
 @test_obj.destroy! rescue nil
+
+## Test 1: Changing extid value (should work after bug fix)
+bug_test_obj = ExternalIdTest.new(id: 'bug_test', name: 'Bug Test Object')
+bug_test_obj.save
+bug_test_obj.extid = 'new_extid_value'
+bug_test_obj.extid
+#=> "new_extid_value"
+
+## Test 2: find_by_extid with deleted object (should work after bug fix)
+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
+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)
+#=> nil
+
+## Test 3: destroy! method (should work after bug fix)
+destroy_test_obj = ExternalIdTest.new(id: 'destroy_test', name: 'Destroy Test')
+destroy_test_obj.save
+destroy_extid = destroy_test_obj.extid
+destroy_test_obj.destroy!
+# Verify mapping was cleaned up
+ExternalIdTest.extid_lookup.key?(destroy_extid)
+#=> false

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

data/try/helpers/test_helpers.rb

@@ -12,7 +12,7 @@ Familia.enable_database_logging = true
 Familia.enable_database_counter = true
 
 class Bone < Familia::Horreum
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   identifier_field :token
   field     :token
@@ -42,7 +42,7 @@ end
 
 class Customer < Familia::Horreum
 
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   logical_database 15 # Use something other than the default DB
   default_expiration 5.years
@@ -106,7 +106,7 @@ end
 @c.custid = 'd@example.com'
 
 class Session < Familia::Horreum
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   logical_database 14 # don't use Onetime's default DB
   default_expiration 180.minutes
@@ -130,7 +130,7 @@ end
 @s = Session.new
 
 class CustomDomain < Familia::Horreum
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   feature :expiration
 
@@ -161,7 +161,7 @@ end
 @d.custid = @c.custid
 
 class Limiter < Familia::Horreum
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   feature :expiration
   feature :quantization
@@ -243,7 +243,7 @@ end
 
 # Helper module for testing refinements in tryouts
 module RefinedContext
-  using Familia::Refinements::TimeUtils
+  using Familia::Refinements::TimeLiterals
 
   def self.eval_in_refined_context(code)
     eval(code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: familia
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre13
+  version: 2.0.0.pre15
 platform: ruby
 authors:
 - Delano Mandelbaum
@@ -180,6 +180,7 @@ files:
 - docs/migrating/v2.0.0-pre11.md
 - docs/migrating/v2.0.0-pre12.md
 - docs/migrating/v2.0.0-pre13.md
+- docs/migrating/v2.0.0-pre14.md
 - docs/migrating/v2.0.0-pre5.md
 - docs/migrating/v2.0.0-pre6.md
 - docs/migrating/v2.0.0-pre7.md
@@ -192,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
@@ -216,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
@@ -255,7 +256,7 @@ files:
 - lib/familia/refinements.rb
 - lib/familia/refinements/logger_trace.rb
 - lib/familia/refinements/snake_case.rb
-- lib/familia/refinements/time_utils.rb
+- lib/familia/refinements/time_literals.rb
 - lib/familia/secure_identifier.rb
 - lib/familia/settings.rb
 - lib/familia/utils.rb
@@ -335,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
@@ -369,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