tina4ruby 3.13.17 → 3.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 198d9905bf51e280f45f2bba90aac40fd64ea1bdf0c0f0b29e9a80d5e95020c9
-  data.tar.gz: 74c01ef1ac870c47aebf57e686a9b3bd7efa46f5c56c1d78df4c378102ee39f2
+  metadata.gz: 0073552dcac0e437fa36de2038f6958cbdbcde9077ec2427d9fd1bf77242da0e
+  data.tar.gz: c5c667382a67031bef1d7f3646020984942079edb5de9c5084c135ce4be68e9d
 SHA512:
-  metadata.gz: 03a840227106a3e2c12a78bde6c5d62ff8e4eb3041bc443fe73cad5e5d6d1dbd366ffa5458d34faeffe8448ad8fb19ce9bd74c821a4d3ec436ab80aa984b58fc
-  data.tar.gz: deefa98487ff855b8ad66beaa13b2e70f2b9f71677c0e317b52fc9153f43782a40723dc5519e814a2d65a29685fae18647f0bc84c124763aa8e5e7dcbddd07ca
+  metadata.gz: d7e9036bfe01826691e30382e35b8c4f70dfe2043602f41abae7a0e573993992a99f89e733b2b7dd74e4c2c2d6fe1c6be7faeb4d57d132d0be6c1d471f538afb
+  data.tar.gz: 7a4ec3bdd62b40c973e2fadbd52f205d92bc6fd2f0e18c1407a164a6cb27fcb03bffb50ec789851ac567105c1da81c6fbdcd00ece6fdbefef2411d1067f55610

data/lib/tina4/field_types.rb

@@ -84,7 +84,12 @@ module Tina4
       # Automatically:
       #   - Registers an integer field for the column
       #   - Calls belongs_to on this class (strip _id suffix for association name)
-      #   - Calls has_many on the referenced class (if already loaded)
+      #   - Calls has_many on the referenced class. The accessor name is the
+      #     declaring class name lowercased + "s" (e.g. Post → posts), matching
+      #     Python; override with related_name:. Works whether the referenced
+      #     class loaded before OR after this one, including the string form
+      #     (references: "Author") for forward references — resolution is
+      #     deferred via Tina4::ORM.inherited until the target class exists.
       #
       # @param name [Symbol]  Column name (e.g. :user_id)
       # @param references [Class, String]  Referenced model class or its name
@@ -122,12 +127,45 @@ module Tina4
           has_many_name: hm_key.to_sym,
           foreign_key: name.to_s
         }
+
+        # If the referenced model is ALREADY loaded (string form whose target
+        # is defined, or any forward reference that has since resolved), wire
+        # the deferred entry right now. The inherited hook on Tina4::ORM only
+        # fires when a NEW class is defined, so a string reference to a class
+        # that loaded BEFORE this one would otherwise never wire its has_many
+        # side. resolve_referenced_class returns the live class for either the
+        # Class or the string form.
+        resolved = resolve_referenced_class(references)
+        resolved.apply_fk_registry! if resolved && resolved.respond_to?(:apply_fk_registry!, true)
+      end
+
+      # Resolve a ForeignKeyField `references:` argument to a live Tina4::ORM
+      # subclass, or nil if it is not (yet) loaded. Accepts either a Class or a
+      # class-name String (with or without a namespace). The string form is the
+      # documented deferred-safe path: a bare constant used before its class is
+      # defined raises NameError (plain Ruby), so forward references must be
+      # written as strings.
+      def resolve_referenced_class(references)
+        return references if references.is_a?(Class)
+        return nil unless defined?(Tina4::ORM) && Tina4::ORM.respond_to?(:model_subclasses)
+
+        simple = references.to_s.split("::").last
+        Tina4::ORM.model_subclasses.find do |klass|
+          klass.name && klass.name.split("::").last == simple
+        end
+      rescue StandardError
+        nil
       end
 
       # Apply any deferred FK-registry has_many wiring for this class.
       # Called automatically when a class that is referenced by a ForeignKeyField is defined.
       def apply_fk_registry!
-        class_simple_name = self.name.split("::").last
+        # Anonymous classes (Class.new(Tina4::ORM), common in specs) have a nil
+        # name and can never be a string-form ForeignKeyField target, so there
+        # is nothing to wire — bail out instead of raising on nil.split.
+        return if name.nil?
+
+        class_simple_name = name.split("::").last
         return unless defined?(@@_fk_registry) && @@_fk_registry.key?(class_simple_name)
 
         @@_fk_registry[class_simple_name].each do |entry|

data/lib/tina4/orm.rb

@@ -16,6 +16,29 @@ module Tina4
   class ORM
     include Tina4::FieldTypes
 
+    # When a new model class is defined, resolve any deferred ForeignKeyField
+    # wiring that targets it. The string / forward-reference form of
+    # `foreign_key_field` (e.g. `references: "Author"`) records the has_many
+    # side in @@_fk_registry but cannot wire it until the referenced class
+    # actually loads — which is now. Without this hook apply_fk_registry! was
+    # never called, so the has_many side silently never wired. The class body
+    # (where the model's own foreign_key_field declarations run, populating the
+    # registry) executes AFTER inherited returns, so entries keyed on THIS
+    # class were already recorded by earlier-loaded models. Chain through super
+    # so we never clobber a future inherited hook.
+    def self.inherited(subclass)
+      super
+      (@_model_subclasses ||= []) << subclass
+      subclass.apply_fk_registry! if subclass.respond_to?(:apply_fk_registry!, true)
+    end
+
+    # Every Tina4::ORM subclass that has been loaded, in definition order.
+    # Mirrors Python's ORM.__subclasses__() — used to resolve string-form
+    # ForeignKeyField references to a live class.
+    def self.model_subclasses
+      @_model_subclasses ||= []
+    end
+
     class << self
       def db
         # v3.13.12: implicit binding from TINA4_DATABASE_URL.
@@ -132,7 +155,7 @@ module Tina4
       #
       # @return [Tina4::QueryBuilder]
       def query
-        QueryBuilder.from(table_name, db: db)
+        QueryBuilder.from_table(table_name, db: db)
       end
 
       def find(id_or_filter = nil, filter = nil, **kwargs)

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.13.17"
+  VERSION = "3.13.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.17
+  version: 3.13.18
 platform: ruby
 authors:
 - Tina4 Team