familia 2.0.0.pre7 → 2.0.0.pre8

data/lib/familia/features/relationships/querying.rb

@@ -303,17 +303,15 @@ module Familia
                 permission_bits = decoded[:permissions]
 
                 # Check if this member has the required permission bits
-                if (permission_bits & required_bits) == required_bits
-                  valid_members << [score, member]
-                end
+                valid_members << [score, member] if (permission_bits & required_bits) == required_bits
               end
 
               # Recreate filtered collection if we have valid members
-              if valid_members.any?
-                dbclient.zadd(filtered_key, valid_members)
-                dbclient.expire(filtered_key, 300) # Temporary key cleanup
-                filtered_keys << filtered_key
-              end
+              next unless valid_members.any?
+
+              dbclient.zadd(filtered_key, valid_members)
+              dbclient.expire(filtered_key, 300) # Temporary key cleanup
+              filtered_keys << filtered_key
             end
 
             filtered_keys
@@ -341,9 +339,7 @@ module Familia
               permission_bits = decoded[:permissions]
 
               # Check if this member has the required permission bits
-              if (permission_bits & required_bits) == required_bits
-                valid_members << [score, member]
-              end
+              valid_members << [score, member] if (permission_bits & required_bits) == required_bits
             end
 
             # Create filtered collection
@@ -613,7 +609,6 @@ module Familia
             collection_info
           end
         end
-
       end
     end
   end

data/lib/familia/features/relationships/score_encoding.rb

@@ -40,7 +40,7 @@ module Familia
           configure: 0b00010000,  # 16  - Change settings
           delete:    0b00100000,  # 32  - Remove items
           transfer:  0b01000000,  # 64  - Change ownership
-          admin:     0b10000000   # 128 - Full control
+          admin:     0b10000000,  # 128 - Full control
         }.freeze
 
         # Predefined permission combinations
@@ -60,7 +60,6 @@ module Familia
           owner:          0b11111111   # All permissions
         }.freeze
 
-
         class << self
           # Get permission bit flag value for a permission symbol
           #
@@ -93,7 +92,6 @@ module Familia
             }
           end
 
-
           # Encode a timestamp and permissions into a Redis score
           #
           # @param timestamp [Time, Integer] The timestamp to encode

data/lib/familia/features/relationships/tracking.rb

@@ -372,7 +372,6 @@ module Familia
             memberships
           end
         end
-
       end
     end
   end

data/lib/familia/features/transient_fields.rb

@@ -182,9 +182,7 @@ module Familia
       def clear_transient_fields!
         self.class.transient_fields.each do |field_name|
           field_value = instance_variable_get("@#{field_name}")
-          if field_value.respond_to?(:clear!)
-            field_value.clear!
-          end
+          field_value.clear! if field_value.respond_to?(:clear!)
         end
       end
 
@@ -213,13 +211,13 @@ module Familia
       def transient_fields_summary
         self.class.transient_fields.each_with_object({}) do |field_name, summary|
           field_value = instance_variable_get("@#{field_name}")
-          if field_value.nil?
-            summary[field_name] = nil
-          elsif field_value.respond_to?(:cleared?) && field_value.cleared?
-            summary[field_name] = "[CLEARED]"
-          else
-            summary[field_name] = "[REDACTED]"
-          end
+          summary[field_name] = if field_value.nil?
+                                  nil
+                                elsif field_value.respond_to?(:cleared?) && field_value.cleared?
+                                  '[CLEARED]'
+                                else
+                                  '[REDACTED]'
+                                end
         end
       end
 

data/lib/familia/features.rb

@@ -1,17 +1,15 @@
 # lib/familia/features.rb
 
 module Familia
-
   FeatureDefinition = Data.define(:name, :depends_on)
 
   # Familia::Features
   #
   module Features
-
     @features_enabled = nil
     attr_reader :features_enabled
 
-    def feature(feature_name = nil)
+    def feature(feature_name = nil, **options)
       @features_enabled ||= []
 
       return features_enabled if feature_name.nil?
@@ -28,22 +26,28 @@ module Familia
         return
       end
 
-      if Familia.debug?
-        Familia.trace :FEATURE, nil, "#{self} includes #{feature_name.inspect}", caller(1..1)
+      Familia.trace :FEATURE, nil, "#{self} includes #{feature_name.inspect}", caller(1..1) if Familia.debug?
+
+      # Check dependencies and raise error if missing
+      feature_def = Familia::Base.feature_definitions[feature_name]
+      if feature_def&.depends_on&.any?
+        missing = feature_def.depends_on - features_enabled
+        if missing.any?
+          raise Familia::Problem,
+                "Feature #{feature_name} requires missing dependencies: #{missing.join(', ')}"
+        end
       end
 
       # Add it to the list available features_enabled for Familia::Base classes.
       features_enabled << feature_name
 
-      klass = Familia::Base.features_available[feature_name]
-
-      # Validate dependencies
-      feature_def = Familia::Base.feature_definitions[feature_name]
-      if feature_def&.depends_on&.any?
-        missing = feature_def.depends_on - features_enabled
-        raise Familia::Problem, "#{feature_name} requires: #{missing.join(', ')}" if missing.any?
+      # Store feature options if any were provided using the new pattern
+      if options.any?
+        add_feature_options(feature_name, **options)
       end
 
+      klass = Familia::Base.features_available[feature_name]
+
       # Extend the Familia::Base subclass (e.g. Customer) with the feature module
       include klass
 
@@ -58,7 +62,6 @@ module Familia
       # We'd need to extend the DataType instances for each Horreum subclass. That
       # avoids it getting included multiple times per DataType
     end
-
   end
 end
 

data/lib/familia/horreum/core/serialization.rb

@@ -135,7 +135,7 @@ module Familia
             multi.hmset(dbkey, to_h_for_storage)
           end
 
-          result.is_a?(Array)  # transaction succeeded
+          result.is_a?(Array) # transaction succeeded
         end
       end
 
@@ -463,9 +463,7 @@ module Familia
       #
       def serialize_value(val)
         # Security: Handle ConcealedString safely - extract encrypted data for storage
-        if val.respond_to?(:encrypted_value)
-          return val.encrypted_value
-        end
+        return val.encrypted_value if val.respond_to?(:encrypted_value)
 
         prepared = Familia.distinguisher(val, strict_values: false)
 
@@ -530,6 +528,5 @@ module Familia
         end
       end
     end
-
   end
 end

data/lib/familia/horreum/subclass/definition.rb

@@ -235,6 +235,40 @@ module Familia
         field_types[field_type.name] = field_type
       end
 
+      # Get feature options for a specific feature or all features
+      #
+      # @param feature_name [Symbol, nil] The feature name to get options for
+      # @return [Hash] The options hash for the feature, or empty hash if none
+      #
+      def feature_options(feature_name = nil)
+        @feature_options ||= {}
+        return @feature_options if feature_name.nil?
+
+        @feature_options[feature_name.to_sym] || {}
+      end
+
+      # Add feature options for a specific feature
+      #
+      # This method provides a clean way for features to set their default options
+      # without worrying about initialization state. Similar to register_field_type
+      # for field types.
+      #
+      # @param feature_name [Symbol] The feature name
+      # @param options [Hash] The options to add/merge
+      # @return [Hash] The updated options for the feature
+      #
+      def add_feature_options(feature_name, **options)
+  @feature_options ||= {}
+  @feature_options[feature_name.to_sym] ||= {}
+
+  # Only set defaults for options that don't already exist
+  options.each do |key, value|
+    @feature_options[feature_name.to_sym][key] ||= value
+  end
+
+  @feature_options[feature_name.to_sym]
+end
+
       # Create and register a transient field type
       #
       # @param name [Symbol] The field name

data/lib/familia/version.rb

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

data/try/core/errors_try.rb

@@ -58,7 +58,7 @@ begin
 rescue Familia::NotConnected => e
   e.message.include?('No client for')
 end
-# > true
+#=> true
 
 ## KeyNotFoundError stores key
 begin

data/try/features/{encrypted_fields_core_try.rb → encrypted_fields/encrypted_fields_core_try.rb}

@@ -1,6 +1,6 @@
 # try/features/encrypted_fields_core_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../helpers/test_helpers'
 require 'base64'
 
 

data/try/features/{encrypted_fields_integration_try.rb → encrypted_fields/encrypted_fields_integration_try.rb}

@@ -2,7 +2,7 @@
 
 # Test constants will be redefined in each test since variables don't persist
 
-require_relative '../helpers/test_helpers'
+require_relative '../../helpers/test_helpers'
 require 'base64'
 
 

data/try/features/{encrypted_fields_no_cache_security_try.rb → encrypted_fields/encrypted_fields_no_cache_security_try.rb}

@@ -3,7 +3,7 @@
 # Security tests for the no-cache encryption strategy
 # These tests verify that we maintain security properties by NOT caching derived keys
 
-require_relative '../helpers/test_helpers'
+require_relative '../../helpers/test_helpers'
 
 test_keys = {
   v1: Base64.strict_encode64('a' * 32),

data/try/features/{encrypted_fields_security_try.rb → encrypted_fields/encrypted_fields_security_try.rb}

@@ -1,6 +1,6 @@
 # try/features/encrypted_fields_security_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../helpers/test_helpers'
 require 'base64'
 
 # Define all test classes up front to avoid tryouts retry conflicts

data/try/features/{expiration_try.rb → expiration/expiration_try.rb}

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

data/try/features/external_identifiers/external_identifiers_try.rb

@@ -0,0 +1,203 @@
+# try/features/external_identifiers_try.rb
+
+require_relative '../../helpers/test_helpers'
+
+Familia.debug = false
+
+# Test ExternalIdentifiers feature functionality
+
+# Basic class using external identifiers
+class ExternalIdTest < Familia::Horreum
+  feature :object_identifiers
+  feature :external_identifiers
+  identifier_field :id
+  field :id
+  field :name
+end
+
+# Class with custom prefix
+class CustomPrefixTest < Familia::Horreum
+  feature :object_identifiers
+  feature :external_identifiers, prefix: 'cust'
+  identifier_field :id
+  field :id
+  field :name
+end
+
+# Class testing data integrity preservation
+class ExternalDataIntegrityTest < Familia::Horreum
+  feature :object_identifiers
+  feature :external_identifiers
+  identifier_field :id
+  field :id
+  field :name
+end
+
+# Test with existing external ID during initialization
+@existing_ext_obj = ExternalDataIntegrityTest.new(id: 'test_id', extid: 'preset_ext_123', name: 'Preset External')
+
+# Test objects for lazy generation and complex initialization
+@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)
+#==> true
+
+## External identifiers feature is included
+ExternalIdTest.features_enabled.include?(:external_identifiers)
+#==> true
+
+## Class has extid field defined
+ExternalIdTest.respond_to?(:extid)
+#==> true
+
+## Object has extid accessor
+obj = ExternalIdTest.new
+obj.respond_to?(:extid)
+#==> true
+
+## External ID is generated from objid deterministically
+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
+#==> true
+
+## External ID uses default 'ext' prefix
+obj = ExternalIdTest.new
+obj.extid.start_with?('ext_')
+#==> true
+
+## Custom prefix class uses specified prefix
+custom_obj = CustomPrefixTest.new
+custom_obj.extid.start_with?('cust_')
+#==> true
+
+## External ID is URL-safe base-36 format
+obj = ExternalIdTest.new
+extid = obj.extid
+extid.match(/\Aext_[0-9a-z]+\z/)
+#=*> nil
+
+## Custom prefix external ID format is correct
+custom_obj = CustomPrefixTest.new
+extid = custom_obj.extid
+extid.match(/\Acust_[0-9a-z]+\z/)
+#=*> nil
+
+## External ID is lazy - not generated until accessed
+@lazy_obj.instance_variable_get(:@extid)
+#=> nil
+
+## External ID is generated when first accessed
+@lazy_obj.extid
+@lazy_obj.instance_variable_get(:@extid)
+#=*> nil
+
+## External ID value is stable across multiple calls
+first_call = @lazy_obj.extid
+second_call = @lazy_obj.extid
+first_call == second_call
+#==> true
+
+## Data integrity: preset extid is preserved
+@existing_ext_obj.extid
+#=> "preset_ext_123"
+
+## Data integrity: preset extid not regenerated
+@existing_ext_obj.instance_variable_get(:@extid)
+#=> "preset_ext_123"
+
+## find_by_extid class method exists
+ExternalIdTest.respond_to?(:find_by_extid)
+#==> true
+
+## find_by_extid returns correct type
+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
+#==> true
+
+## External ID is different from objid
+obj = ExternalIdTest.new
+obj.objid != obj.extid
+#==> true
+
+## External ID persists through save/load cycle
+save_obj = ExternalIdTest.new
+save_obj.id = 'ext_save_test'
+save_obj.name = 'External Save Test'
+original_extid = save_obj.extid
+save_obj.save
+loaded_obj = ExternalIdTest.new(id: 'ext_save_test')
+loaded_obj.extid == original_extid
+#==> true
+
+## Different objids produce different external IDs
+obj1 = ExternalIdTest.new
+obj2 = ExternalIdTest.new
+obj1.extid != obj2.extid
+#==> true
+
+## extid field type is ExternalIdentifierFieldType
+ExternalIdTest.field_types[:extid]
+#=:> Familia::Features::ExternalIdentifiers::ExternalIdentifierFieldType
+
+## Feature options contain correct prefix
+ExternalIdTest.feature_options(:external_identifiers)[:prefix]
+#=> "ext"
+
+## Custom prefix feature options
+CustomPrefixTest.feature_options(:external_identifiers)[:prefix]
+#=> "cust"
+
+## External ID is shorter than UUID objid
+obj = ExternalIdTest.new
+obj.extid.length < obj.objid.length
+#==> true
+
+## External ID contains only lowercase alphanumeric after prefix
+obj = ExternalIdTest.new
+extid_suffix = obj.extid.split('_', 2)[1]
+extid_suffix.match(/\A[0-9a-z]+\z/)
+#=*> nil
+
+## Complex initialization preserves lazy generation
+@complex_obj.instance_variable_get(:@extid)
+#=> nil
+
+## External ID generation after complex initialization
+@complex_obj.extid
+#=*> nil
+
+## find_by_extid works with saved objects
+@test_obj = ExternalIdTest.new(id: 'findable_test', name: 'Test Object')
+@test_obj.save
+found_obj = ExternalIdTest.find_by_extid(@test_obj.extid)
+found_obj&.id
+#=> "findable_test"
+
+## find_by_extid returns nil for nonexistent extids
+ExternalIdTest.find_by_extid('nonexistent_extid')
+#=> nil
+
+## extid_lookup mapping is maintained
+ExternalIdTest.extid_lookup[@test_obj.extid]
+#=> "findable_test"
+
+# Cleanup test objects
+@test_obj.destroy! rescue nil