tina4ruby 3.13.26 → 3.13.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37b3d1b2d32cd45ef6a97096e97bd5c6a39009ace98ead88dac0fdc89e786528
-  data.tar.gz: c02fc34b91be2c3dbad1f577b590be80d1eae9043803cd0fa2819ec465f47dce
+  metadata.gz: 01fb453b8f6a6ea027dc04bc3e1d56c808969f50739ca60946152030883e7fd0
+  data.tar.gz: b04d9e2902f61df6e37ae6eb81b95b6f60edf579739206ea97b9463a1ba5dd25
 SHA512:
-  metadata.gz: 6efda648bfaf41d5fba86200f2a3d063e186982cf1325721dcbc49660933592492526802e4c052850e710887dbefd10275001738a2fb149d3abb1bae620e9445
-  data.tar.gz: af138286dcc50de2e72defd69f535b9854ccbe5236b54c320a33b2a9e08487ff3ad557a90b6ae8486dd882c34c02d99d707b5abb8c344feb6a1e34b00a9d03d0
+  metadata.gz: 4c3ce7f5a22fef09964273c1645a3b1756a2359bf2d670bcc2b3c640bd8f0689a38653dd046b12c000fdc78ce9cbbb0dec386317a5d13e3cf09243c39461888f
+  data.tar.gz: dca9b42a7753fd2609d263867846d236e1c3e10b094f37a6030c690cadab75e3041b787e886c6feceb7dbafcb73b8bf3ba090c60fc69167e3309d1f3b79d378c

data/lib/tina4/docs.rb

@@ -98,8 +98,7 @@ module Tina4
     # Full reflection of a single class — `nil` for unknown.
     def class_spec(fqn)
       ensure_index
-      key = normalise_fqn(fqn)
-      class_entry = all_entries.find { |e| e[:kind] == "class" && e[:fqn] == key }
+      class_entry = resolve_class(fqn)
       return nil if class_entry.nil?
 
       methods = all_entries.select do |m|
@@ -123,9 +122,10 @@ module Tina4
     # Single method spec — `nil` for unknown.
     def method_spec(class_fqn, method_name)
       ensure_index
-      key = normalise_fqn(class_fqn)
+      klass = resolve_class(class_fqn)
+      resolved = klass ? klass[:fqn] : normalise_fqn(class_fqn)
       entry = all_entries.find do |e|
-        e[:kind] == "method" && e[:class_fqn] == key && e[:name] == method_name.to_s
+        e[:kind] == "method" && e[:class_fqn] == resolved && e[:name] == method_name.to_s
       end
       entry && method_payload(entry)
     end
@@ -558,6 +558,38 @@ module Tina4
       tokens.each do |tk|
         score += 1 if !tk.empty? && doc.include?(tk)
       end
+
+      # Class-qualified queries ("Frond.add_test" / "Frond::add_test" /
+      # "Frond add_test"): score the owning class so the qualifier steers
+      # ranking instead of being dead weight.
+      class_fqn = (entry[:class_fqn] || entry[:class]).to_s
+      unless class_fqn.empty?
+        parent = class_fqn.split("::").last.to_s.downcase
+        unless parent.empty?
+          # Exact "Class.method" intent — normalise `.`/`::`/whitespace in the
+          # (already space-stripped) joined query to a single `.` separator.
+          q_norm = joined.gsub(/[:.]+/, ".")
+          if q_norm == "#{parent}.#{name}" || q_norm == "#{parent}.#{stripped}"
+            score += 6 # strongest signal we have
+          end
+          tokens.each do |tk|
+            next if tk.empty?
+            if tk == parent
+              score += 2.5
+            elsif parent.start_with?(tk)
+              score += 1
+            end
+          end
+        end
+      end
+
+      # Any token that is a whole dotted / :: segment of the fqn
+      # (namespace / class / method).
+      fqn_segs = entry[:fqn].to_s.downcase.split(/[.:#\s]+/).reject(&:empty?)
+      tokens.each do |tk|
+        score += 1 if !tk.empty? && fqn_segs.include?(tk)
+      end
+
       # Substring fallback — full joined query inside the name.
       if !joined.empty? && score.zero? && name.include?(joined)
         score += 2
@@ -632,5 +664,36 @@ module Tina4
     def normalise_fqn(fqn)
       fqn.to_s.sub(/\A::/, "")
     end
+
+    # Resolve a class entry by exact FQN, documented public path, or bare name.
+    #
+    # Callers naturally type the exact stored FQN (`Tina4::Database`), a bare
+    # class name (`Database`), or a longer path that nests the class name
+    # (`Tina4::Database::Database`). Match exactly first, then by class name
+    # (the last `::`/`.` segment), disambiguating by requiring the given
+    # segments to appear in the stored FQN (framework + shortest wins). A
+    # genuinely unknown name returns `nil` — no false positives.
+    def resolve_class(given)
+      classes = all_entries.select { |e| e[:kind] == "class" }
+      key = normalise_fqn(given)
+
+      exact = classes.find { |e| e[:fqn] == key }
+      return exact if exact
+
+      gsegs = key.split(/[:.]+/).reject(&:empty?)
+      gname = gsegs.empty? ? key : gsegs.last
+      cands = classes.select { |e| e[:fqn].to_s.split(/[:.]+/).last == gname }
+      return nil if cands.empty?
+      return cands.first if cands.size == 1
+
+      # Disambiguate: prefer classes whose stored FQN contains every given
+      # segment, then framework source, then the shortest FQN.
+      subset = cands.select do |e|
+        segs = e[:fqn].to_s.split(/[:.]+/)
+        gsegs.all? { |s| segs.include?(s) }
+      end
+      pool = subset.empty? ? cands : subset
+      pool.min_by { |e| [e[:source] == "framework" ? 0 : 1, e[:fqn].to_s.length, e[:fqn].to_s] }
+    end
   end
 end

data/lib/tina4/frond.rb

@@ -10,6 +10,7 @@ require "json"
 require "digest"
 require "base64"
 require "cgi"
+require "erb"
 require "uri"
 require "date"
 require "time"
@@ -738,7 +739,7 @@ module Tina4
                   when "title"      then value.to_s.split.map(&:capitalize).join(" ")
                   when "string"     then value.to_s
                   when "int"        then value.to_i
-                  when "escape", "e" then Frond.escape_html(value.to_s)
+                  when "escape", "e" then Tina4::SafeString.new(Frond.escape_html(value.to_s))
                   else value
                   end
           next
@@ -1042,9 +1043,26 @@ module Tina4
     # ── Literal values: strings, numbers, booleans, null ──
 
     def eval_literal(expr)
-      if (expr.start_with?('"') && expr.end_with?('"')) ||
-         (expr.start_with?("'") && expr.end_with?("'"))
-        return expr[1..-2]
+      if expr.length >= 2 && (expr[0] == '"' || expr[0] == "'") && expr[-1] == expr[0]
+        # Only a SINGLE complete string literal — i.e. the opening quote's
+        # match is the final char. Without this check, `'a' ~ 'b'` and
+        # `'Y' if x else 'N'` (which merely start and end with a quote) get
+        # their outer quotes stripped here before concat / inline-if run.
+        q = expr[0]
+        i = 1
+        single = false
+        while i < expr.length
+          if expr[i] == "\\"
+            i += 2
+            next
+          end
+          if expr[i] == q
+            single = (i == expr.length - 1)
+            break
+          end
+          i += 1
+        end
+        return expr[1..-2] if single
       end
       return expr.to_i if expr =~ INTEGER_RE
       return expr.to_f if expr =~ FLOAT_RE
@@ -1894,8 +1912,8 @@ module Tina4
         "striptags"  => ->(v, *_a) { v.to_s.gsub(STRIPTAGS_RE, "") },
 
         # -- Encoding --
-        "escape"        => ->(v, *_a) { Frond.escape_html(v.to_s) },
-        "e"             => ->(v, *_a) { Frond.escape_html(v.to_s) },
+        "escape"        => ->(v, *_a) { Tina4::SafeString.new(Frond.escape_html(v.to_s)) },
+        "e"             => ->(v, *_a) { Tina4::SafeString.new(Frond.escape_html(v.to_s)) },
         "raw"           => ->(v, *_a) { v },
         "safe"          => ->(v, *_a) { v },
         "json_encode"   => ->(v, *_a) { JSON.generate(v) rescue v.to_s },
@@ -1914,7 +1932,7 @@ module Tina4
             v.to_s
           end
         },
-        "url_encode"    => ->(v, *_a) { CGI.escape(v.to_s) },
+        "url_encode"    => ->(v, *_a) { ERB::Util.url_encode(v.to_s) },
 
         # -- JSON / JS --
         "to_json" => ->(v, *a) {
@@ -2058,7 +2076,7 @@ module Tina4
           lines.join("\n")
         },
         "slug"   => ->(v, *_a) { v.to_s.downcase.gsub(SLUG_CLEAN_RE, "-").gsub(SLUG_TRIM_RE, "") },
-        "nl2br"  => ->(v, *_a) { v.to_s.gsub("\n", "<br>\n") },
+        "nl2br"  => ->(v, *_a) { Tina4::SafeString.new(Frond.escape_html(v.to_s).gsub("\n", "<br />\n")) },
         "format" => ->(v, *a) {
           if a.any?
             v.to_s % a

data/lib/tina4/version.rb

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

metadata

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