tina4ruby 3.10.65 → 3.10.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6fa463a9244bec2d1144ebcdc903e19681ea7e60cc0b3ea3438e21b8388ec9e
-  data.tar.gz: 3ac6566d7b754979331b290e9c3610778eaa69ce6c31ae0eb8d8b16dd69deaa5
+  metadata.gz: e5ba81bb86f837e23521b7b13d2ee313a0ac7e34bbf04371c4256d00b077c7f3
+  data.tar.gz: 9bb8a43825801b904b30bddcfbc51fedc74694bb04d37d404d33702338d40806
 SHA512:
-  metadata.gz: c40fcd4bc17ee1e0d2e41a297750210fc1e66708080a20c180dfe2f6338ce435d8e30042c0799a9455384b5808f221c00f156d13bdbd9aac4ecbbd655d9204fa
-  data.tar.gz: 180229e03f54704f3d3455d6b1c6690aea1979fbcbbfe2b05150c1831b25630628cbeb3b52cb7810f72939d9360e40d4a0ff8c42196df46591114aa923ea1e74
+  metadata.gz: 29819ac550ac637dbc6bd3fb3456e426a2311cdbabc6cbe9953d4b03317ecb5eca6f55f5f70b69f515db433135b221fb45320f7aad3ded354b56a9772f150da2
+  data.tar.gz: 2ae5fc934297b48c3352aab9bc6606dba1553adc91e989efe8b301a6163e291eeec9f79d592a2a781ea34528b13b75a6cf8d55714f4795b5da80984c9be6e165

data/lib/tina4/metrics.rb

@@ -21,6 +21,9 @@ module Tina4
     @full_cache_time = 0
     CACHE_TTL = 60
 
+    # Stores the resolved scan root so file_detail can locate framework files.
+    @last_scan_root = ""
+
     # ── Root Resolution ──────────────────────────────────────────
 
     # Pick the right directory to scan.
@@ -30,10 +33,17 @@ module Tina4
     def self._resolve_root(root = 'src')
       root_path = Pathname.new(root)
       if root_path.directory? && !Dir.glob(root_path.join('**', '*.rb')).empty?
+        @last_scan_root = File.expand_path(root)
         return root
       end
       # Fallback: scan the framework package itself
-      File.dirname(__FILE__)
+      fw_dir = File.dirname(__FILE__)
+      @last_scan_root = fw_dir
+      fw_dir
+    end
+
+    def self.last_scan_root
+      @last_scan_root
     end
 
     # ── Quick Metrics ───────────────────────────────────────────
@@ -346,6 +356,15 @@ module Tina4
     # ── File Detail ─────────────────────────────────────────────
 
     def self.file_detail(file_path)
+      unless File.exist?(file_path)
+        # Try resolving relative to the last scan root (framework mode)
+        if @last_scan_root && !@last_scan_root.empty?
+          candidate = File.join(@last_scan_root, file_path)
+          if File.exist?(candidate)
+            file_path = candidate
+          end
+        end
+      end
       unless File.exist?(file_path)
         return { "error" => "File not found: #{file_path}" }
       end

data/lib/tina4/orm.rb

@@ -481,29 +481,15 @@ module Tina4
       errors
     end
 
-    def load(filter_sql = nil, params = [])
-      @relationship_cache = {} # Clear relationship cache on reload
-
-      pk = self.class.primary_key_field || :id
-
-      # Determine the SQL to execute
-      if filter_sql.nil? || filter_sql.is_a?(Integer)
-        # Legacy: load by primary key (load() or load(id))
-        id = filter_sql || __send__(pk)
-        return false unless id
-        sql = "SELECT * FROM #{self.class.table_name} WHERE #{pk} = ?"
-        query_params = [id]
-      else
-        # Filter-based: load("email = ?", ["alice@example.com"])
-        sql = "SELECT * FROM #{self.class.table_name} WHERE #{filter_sql}"
-        query_params = params
-      end
-
-      result = self.class.db.fetch_one(sql, query_params)
+    # Load a record into this instance via select_one.
+    # Returns true if found and loaded, false otherwise.
+    def load(sql, params = [], include: nil)
+      @relationship_cache = {}
+      result = self.class.select_one(sql, params, include: include)
       return false unless result
 
       mapping_reverse = self.class.field_mapping.invert
-      result.each do |key, value|
+      result.to_h.each do |key, value|
         attr_name = mapping_reverse[key.to_s] || key
         setter = "#{attr_name}="
         __send__(setter, value) if respond_to?(setter)

data/lib/tina4/version.rb

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

metadata

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