familia 2.0.0.pre17 → 2.0.0.pre18

data/try/{core → unit/core}/time_utils_try.rb

@@ -1,4 +1,4 @@
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 module RefinedContext
   using Familia::Refinements::TimeLiterals

data/try/{core → unit/core}/tools_try.rb

@@ -2,7 +2,7 @@
 
 # Test Familia::Tools - key migration and utility functions
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## move_keys across Valkey/Redis instances (if available)
 begin

data/try/{core → unit/core}/utils_try.rb

@@ -1,6 +1,6 @@
 # try/core/utils_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 
@@ -62,26 +62,29 @@ custom_stamp = Familia.qstamp(3600, time: test_time)
 Time.at(custom_stamp).utc.hour
 #=> 14
 
-## distinguisher handles basic types
-str_result = Familia.distinguisher('test')
-int_result = Familia.distinguisher(123)
-sym_result = Familia.distinguisher(:symbol)
-[str_result, int_result, sym_result]
-#=> ["test", "123", "symbol"]
+## identifier_extractor extracts class names
+test_class = Class.new(Familia::Horreum)
+test_class.define_singleton_method(:name) { 'TestClass' }
+Familia.identifier_extractor(test_class)
+#=> "TestClass"
 
-## distinguisher raises error for high-risk types with strict mode
+## identifier_extractor extracts identifiers from Familia objects
+customer_class = Class.new(Familia::Horreum) do
+  identifier_field :custid
+  field :custid
+end
+customer = customer_class.new(custid: 'customer_123')
+Familia.identifier_extractor(customer)
+#=> "customer_123"
+
+## identifier_extractor raises error for non-Familia objects
 begin
-  Familia.distinguisher(true, strict_values: true)
+  Familia.identifier_extractor({ key: 'value' })
 rescue Familia::NotDistinguishableError => e
   e.class
 end
 #=> Familia::NotDistinguishableError
 
-## distinguisher allows high-risk types with non-strict mode
-result = Familia.distinguisher(false, strict_values: false)
-result
-#=> "false"
-
 # Cleanup - restore defaults, leave nothing but footprints
 Familia.delim(':')
 Familia.suffix(:object)

data/try/{data_types → unit/data_types}/boolean_try.rb

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

data/try/{data_types → unit/data_types}/counter_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/counter_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new(token: 'atoken3')
 

data/try/{data_types → unit/data_types}/datatype_base_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/base_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @limiter1 = Limiter.new :requests
 

data/try/{data_types → unit/data_types}/hash_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/hash_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new 'atoken'
 

data/try/{data_types → unit/data_types}/list_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/list_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new 'atoken'
 

data/try/{data_types → unit/data_types}/lock_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/lock_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new(token: 'atoken4')
 

data/try/{data_types → unit/data_types}/sorted_set_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/sorted_set_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new 'atoken'
 

data/try/{data_types → unit/data_types}/sorted_set_zadd_options_try.rb

@@ -1,6 +1,6 @@
 # try/features/data_type/sorted_set_zadd_options_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test class for ZADD options testing
 class MetricsTest < Familia::Horreum

data/try/{data_types → unit/data_types}/string_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/string_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new(token: 'atoken2')
 

data/try/{data_types → unit/data_types}/unsortedset_try.rb

@@ -1,6 +1,6 @@
 # try/data_types/unsortedset_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 @a = Bone.new 'atoken'
 

data/try/{horreum → unit/horreum}/auto_indexing_on_save_try.rb

@@ -5,7 +5,7 @@
 # Tests automatic index population when Familia::Horreum objects are saved
 #
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test classes for auto-indexing functionality
 class ::AutoIndexUser < Familia::Horreum

data/try/{horreum → unit/horreum}/base_try.rb

@@ -1,6 +1,6 @@
 # try/horreum/base_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 
@@ -203,11 +203,11 @@ end
 @aliased.display_size! 100
 #=> true
 
-## Aliased field refresh works correctly
+## Aliased field refresh works correctly (type preserved)
 @aliased.width = 50  # unsaved change
 @aliased.refresh!
 @aliased.width
-#=> "100"
+#=> 100
 
 ## Fast method with custom name
 class CustomFastMethodTest < Familia::Horreum

data/try/{horreum → unit/horreum}/class_methods_try.rb

@@ -2,7 +2,7 @@
 
 # Test Horreum class methods
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 TestUser = Class.new(Familia::Horreum) do
   identifier_field :email

data/try/{horreum → unit/horreum}/commands_try.rb

@@ -2,7 +2,7 @@
 
 # Test Horreum Valkey/Redis commands
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 ## hget/hset operations
 begin

data/try/{horreum → unit/horreum}/defensive_initialization_try.rb

@@ -1,6 +1,6 @@
 # try/horreum/defensive_initialization_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 # Test defensive initialization behavior
 class User < Familia::Horreum

data/try/{horreum → unit/horreum}/destroy_related_fields_cleanup_try.rb

@@ -9,7 +9,7 @@
 # This addresses the bug where destroy! only deleted the main object key
 # but left related field keys in the database.
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 MANY_FIELD_MULTIPLIER = 10
 

data/try/{horreum → unit/horreum}/enhanced_conflict_handling_try.rb

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

data/try/{horreum → unit/horreum}/field_categories_try.rb

@@ -1,44 +1,53 @@
 # try/horreum/field_categories_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 
-# Define test class with various field categories
+# Define test class with various field types
 class FieldCategoryTest < Familia::Horreum
+  feature :encrypted_fields
+  feature :transient_fields
+
   identifier_field :id
   field :id
-  field :name                           # default category (:field)
-  field :email, category: :encrypted    # encrypted category
-  field :tryouts_cache_data, category: :transient # transient category
-  field :description, category: :persistent # explicit persistent category
-  field :settings, category: nil        # nil category (defaults to :field)
+  field :name                           # regular field
+  encrypted_field :email                # encrypted field
+  transient_field :tryouts_cache_data   # transient field
+  field :description                    # regular persistent field
+  field :settings                       # regular field
 end
 
 # Test class with multiple transient fields
 class MultiTransientTest < Familia::Horreum
+  feature :transient_fields
+
   identifier_field :id
   field :id
   field :permanent_data
-  field :temp1, category: :transient
-  field :temp2, category: :transient
-  field :temp3, category: :transient
+  transient_field :temp1
+  transient_field :temp2
+  transient_field :temp3
 end
 
-# Field categories work with field aliasing
+# Field types work with field aliasing
 class AliasedCategoryTest < Familia::Horreum
+  feature :transient_fields
+
   identifier_field :id
   field :id
-  field :internal_temp, as: :temp, category: :transient
-  field :internal_perm, as: :perm, category: :persistent
+  transient_field :internal_temp, as: :temp
+  field :internal_perm, as: :perm
 end
 
 # Test edge case with all transient fields
 class AllTransientTest < Familia::Horreum
+  feature :transient_fields
+
   identifier_field :id
   field :id
-  field :temp1, category: :transient
-  field :temp2, category: :transient
+  transient_field :temp1
+  transient_field :temp2
 end
 
 ## Field types are stored correctly
@@ -58,11 +67,11 @@ FieldCategoryTest.field_types[:email].category
 FieldCategoryTest.field_types[:tryouts_cache_data].category
 #=> :transient
 
-## Explicit persistent category field has correct category
+## Regular fields have :field category
 FieldCategoryTest.field_types[:description].category
-#=> :persistent
+#=> :field
 
-## Nil category field defaults to :field
+## Regular fields default to :field category
 FieldCategoryTest.field_types[:settings].category
 #=> :field
 

data/try/{horreum → unit/horreum}/field_definition_try.rb

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

data/try/{horreum → unit/horreum}/initialization_try.rb

@@ -1,6 +1,6 @@
 # try/horreum/initialization_try.rb
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false
 
@@ -97,7 +97,7 @@ Familia.debug = false
 @complex.save
 @complex.refresh!
 [@complex.custid, @complex.name, @complex.role, @complex.verified]
-#=> ["complex@test.com", "Complex User", "admin", "true"]
+#=> ["complex@test.com", "Complex User", "admin", true]
 
 ## Clean up saved test objects
 [@customer6, @complex].map(&:delete!)

data/try/unit/horreum/json_type_preservation_try.rb

@@ -0,0 +1,248 @@
+# frozen_string_literal: true
+
+require_relative '../../support/helpers/test_helpers'
+
+Familia.debug = false
+
+# Setup: Define test model with various field types
+class JsonTestModel < Familia::Horreum
+  identifier_field :model_id
+  field :model_id
+  field :name           # String
+  field :age            # Integer
+  field :active         # Boolean
+  field :score          # Float
+  field :metadata       # Hash
+  field :tags           # Array
+  field :nested_data    # Hash with nested structures
+  field :badge_number   # String that looks numeric
+  field :status         # String that looks boolean
+  field :placeholder    # String that looks like null
+end
+
+@test_id = "json_test_#{Familia.now.to_i}"
+
+## String fields preserve String type
+@model = JsonTestModel.new(model_id: @test_id, name: "Test User")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.name
+#=> "Test User"
+
+## String field returns String class
+@loaded.name.class
+#=> String
+
+## Integer fields preserve Integer type (not String)
+@model = JsonTestModel.new(model_id: @test_id, age: 35)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.age
+#=> 35
+
+## Integer field returns Integer class (not String)
+@loaded.age.class
+#=> Integer
+
+## Boolean true preserves TrueClass type (not String "true")
+@model = JsonTestModel.new(model_id: @test_id, active: true)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.active
+#=> true
+
+## Boolean true returns TrueClass
+@loaded.active.class
+#=> TrueClass
+
+## Boolean false preserves FalseClass type (not String "false")
+@model = JsonTestModel.new(model_id: @test_id, active: false)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.active
+#=> false
+
+## Boolean false returns FalseClass
+@loaded.active.class
+#=> FalseClass
+
+## Float fields preserve Float type
+@model = JsonTestModel.new(model_id: @test_id, score: 98.6)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.score
+#=> 98.6
+
+## Float field returns Float class
+@loaded.score.class
+#=> Float
+
+## Hash fields preserve Hash structure
+@model = JsonTestModel.new(model_id: @test_id, metadata: { "key" => "value", "count" => 42 })
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.metadata
+#=> {"key"=>"value", "count"=>42}
+
+## Hash field returns Hash class
+@loaded.metadata.class
+#=> Hash
+
+## Array fields preserve Array structure and element types
+@model = JsonTestModel.new(model_id: @test_id, tags: ["ruby", "redis", 123, true])
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.tags
+#=> ["ruby", "redis", 123, true]
+
+## Array field returns Array class
+@loaded.tags.class
+#=> Array
+
+## Array preserves Integer element type
+@loaded.tags[2].class
+#=> Integer
+
+## Array preserves Boolean element type
+@loaded.tags[3].class
+#=> TrueClass
+
+## Nested Hash structures preserve types at all levels
+@nested = {
+  "user" => {
+    "name" => "John",
+    "age" => 30,
+    "active" => true,
+    "roles" => ["admin", "user"]
+  },
+  "count" => 5
+}
+@model = JsonTestModel.new(model_id: @test_id, nested_data: @nested)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.nested_data["user"]["age"].class
+#=> Integer
+
+## Nested Hash Boolean preserved
+@loaded.nested_data["user"]["active"].class
+#=> TrueClass
+
+## Nested Hash top-level Integer preserved
+@loaded.nested_data["count"].class
+#=> Integer
+## Round-trip consistency: save → load → save → load maintains types
+@model = JsonTestModel.new(
+  model_id: @test_id,
+  name: "Round Trip",
+  age: 42,
+  active: true,
+  score: 99.9,
+  tags: [1, 2, 3]
+)
+@model.save
+@first_load = JsonTestModel.find(@test_id)
+@first_load.save  # Re-save without modification
+@second_load = JsonTestModel.find(@test_id)
+[@second_load.age.class, @second_load.active.class, @second_load.tags[0].class]
+#=> [Integer, TrueClass, Integer]
+
+## batch_update preserves types
+@model = JsonTestModel.new(model_id: @test_id)
+@model.batch_update(name: "Batch", age: 50, active: false, tags: ["one", 2])
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.name, @loaded.age, @loaded.active, @loaded.tags[1]]
+#=> ["Batch", 50, false, 2]
+
+## batch_update types verification
+[@loaded.age.class, @loaded.active.class, @loaded.tags[1].class]
+#=> [Integer, FalseClass, Integer]
+
+## refresh! maintains type preservation
+@model = JsonTestModel.new(model_id: @test_id, age: 25, active: true)
+@model.save
+# Modify directly in Redis to simulate external change
+@model.dbclient.hset(@model.dbkey, "age", Familia::JsonSerializer.dump(30))
+@model.refresh!
+[@model.age, @model.age.class]
+#=> [30, Integer]
+
+## to_h returns string keys (external API compatibility)
+@model = JsonTestModel.new(model_id: @test_id, name: "API Test", age: 40)
+@hash = @model.to_h
+@hash.keys.first.class
+#=> String
+
+## to_h has string key for name field
+@hash.key?("name")
+#=> true
+
+## Nil values are handled correctly
+@model = JsonTestModel.new(model_id: @test_id, name: "Nil Test", age: nil, active: nil)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.age, @loaded.active]
+#=> [nil, nil]
+
+## Empty string preserved correctly
+@model = JsonTestModel.new(model_id: @test_id, name: "")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.name
+#=> ""
+
+## Empty string has String class
+@loaded.name.class
+#=> String
+
+## String fields with numeric values preserve String type (badge "007")
+@model = JsonTestModel.new(model_id: @test_id, badge_number: "007")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+@loaded.badge_number
+#=> "007"
+
+## Badge number preserves String class (not Integer)
+@loaded.badge_number.class
+#=> String
+
+## String "true" stays String (not Boolean)
+@model = JsonTestModel.new(model_id: @test_id, status: "true")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.status, @loaded.status.class]
+#=> ["true", String]
+
+## String "false" stays String (not Boolean)
+@model = JsonTestModel.new(model_id: @test_id, status: "false")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.status, @loaded.status.class]
+#=> ["false", String]
+
+## String "null" stays String (not nil)
+@model = JsonTestModel.new(model_id: @test_id, placeholder: "null")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.placeholder, @loaded.placeholder.class]
+#=> ["null", String]
+
+## Numeric string "123" preserves String type
+@model = JsonTestModel.new(model_id: @test_id, badge_number: "123")
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.badge_number, @loaded.badge_number.class]
+#=> ["123", String]
+
+## Zero values preserved with correct types
+@model = JsonTestModel.new(model_id: @test_id, age: 0, score: 0.0)
+@model.save
+@loaded = JsonTestModel.find(@test_id)
+[@loaded.age, @loaded.score]
+#=> [0, 0.0]
+
+## Zero Integer and Float have correct classes
+[@loaded.age.class, @loaded.score.class]
+#=> [Integer, Float]
+
+# Teardown: Clean up test data
+JsonTestModel.destroy!(@test_id) if JsonTestModel.exists?(@test_id)

data/try/{horreum → unit/horreum}/relations_try.rb

@@ -1,7 +1,7 @@
 # try/horreum/relations_try.rb
 # Test Horreum Database type relations functionality
 
-require_relative '../helpers/test_helpers'
+require_relative '../../support/helpers/test_helpers'
 
 Familia.debug = false