tina4ruby 3.10.15 → 3.10.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89bb63a5bf75c1e5100a6180e7283668bceb7a422e3dbfcb9ab175634ae0b8a5
-  data.tar.gz: 020d40942508338964f6e9c3b06417a11303f2997eb55827baefe59c9443bb11
+  metadata.gz: b0dfa03a5f7986169a14d59895459e7ca50d70f0254789c36dbc29aca80b1b93
+  data.tar.gz: e248121b6577b8c5d0ec172ab47e2f82235b500d3508f75e8e0fedd3071ac657
 SHA512:
-  metadata.gz: 0c712a05318ae0cb27fa194121ff32999264835d27f7237e39cf3f80fd40b3b834b8e47a3a63c9605a43c0f503f284dc25bf3c3aa9441a69c14d192f382cacf2
-  data.tar.gz: bebefcf988a513b917ca9803474b07cf3dd6c116c5b3595a52d9582484c4fdfddd7e4b31472128012455f2d508d56866e378ef52809902d616ea5ba6a42a5c4d
+  metadata.gz: 164505c4f5449c7fbfa15ca1b21fbdffa3beac78a7d84e907407ed11881e3a4335d7df8dd6c46cb4bb4fb11ff3f9b89d2cd4b8cd02a77bdfb72a584b965f942e
+  data.tar.gz: b8797d3fd1abe7baf178c73a752b47357d8e56753a699d833a100940433884d036211cfc9942fcee481ca56d610efcb50169ec086df04f31e549e73971b7fb65

data/lib/tina4/frond.rb

@@ -495,6 +495,41 @@ module Tina4
       eval_expr(arg, context)
     end
 
+    # Find the first occurrence of +needle+ that is not inside quotes or
+    # parentheses.  Returns the index, or -1 if not found.
+    def find_outside_quotes(expr, needle)
+      in_q = nil
+      depth = 0
+      i = 0
+      nlen = needle.length
+      while i <= expr.length - nlen
+        ch = expr[i]
+        if (ch == '"' || ch == "'") && depth == 0
+          if in_q.nil?
+            in_q = ch
+          elsif ch == in_q
+            in_q = nil
+          end
+          i += 1
+          next
+        end
+        if in_q
+          i += 1
+          next
+        end
+        if ch == "("
+          depth += 1
+        elsif ch == ")"
+          depth -= 1
+        end
+        if depth == 0 && expr[i, nlen] == needle
+          return i
+        end
+        i += 1
+      end
+      -1
+    end
+
     # Find the index of a top-level ``?`` that is part of a ternary operator.
     # Respects quoted strings, parentheses, and skips ``??`` (null coalesce).
     # Returns -1 if not found.
@@ -690,18 +725,46 @@ module Tina4
         return (Regexp.last_match(1).to_i..Regexp.last_match(2).to_i).to_a
       end
 
-      # Ternary: condition ? "yes" : "no"
-      ternary = expr.match(/\A(.+?)\s*\?\s*(.+?)\s*:\s*(.+)\z/)
-      if ternary
-        cond = eval_expr(ternary[1], context)
-        return truthy?(cond) ? eval_expr(ternary[2], context) : eval_expr(ternary[3], context)
+      # Parenthesized sub-expression: (expr) — strip parens and evaluate inner
+      if expr.start_with?("(") && expr.end_with?(")")
+        depth = 0
+        matched = true
+        expr.each_char.with_index do |ch, pi|
+          depth += 1 if ch == "("
+          depth -= 1 if ch == ")"
+          if depth == 0 && pi < expr.length - 1
+            matched = false
+            break
+          end
+        end
+        return eval_expr(expr[1..-2], context) if matched
+      end
+
+      # Ternary: condition ? "yes" : "no" — quote-aware
+      q_pos = find_outside_quotes(expr, "?")
+      if q_pos > 0
+        cond_part = expr[0...q_pos].strip
+        rest = expr[(q_pos + 1)..]
+        c_pos = find_outside_quotes(rest, ":")
+        if c_pos >= 0
+          true_part = rest[0...c_pos].strip
+          false_part = rest[(c_pos + 1)..].strip
+          cond = eval_expr(cond_part, context)
+          return truthy?(cond) ? eval_expr(true_part, context) : eval_expr(false_part, context)
+        end
       end
 
-      # Jinja2-style inline if: value if condition else other_value
-      inline_if = expr.match(/\A(.+?)\s+if\s+(.+?)\s+else\s+(.+)\z/)
-      if inline_if
-        cond = eval_expr(inline_if[2], context)
-        return truthy?(cond) ? eval_expr(inline_if[1], context) : eval_expr(inline_if[3], context)
+      # Jinja2-style inline if: value if condition else other_value — quote-aware
+      if_pos = find_outside_quotes(expr, " if ")
+      if if_pos >= 0
+        else_pos = find_outside_quotes(expr, " else ")
+        if else_pos && else_pos > if_pos
+          value_part = expr[0...if_pos].strip
+          cond_part = expr[(if_pos + 4)...else_pos].strip
+          else_part = expr[(else_pos + 6)..].strip
+          cond = eval_expr(cond_part, context)
+          return truthy?(cond) ? eval_expr(value_part, context) : eval_expr(else_part, context)
+        end
       end
 
       # Null coalescing: value ?? "default"
@@ -1459,6 +1522,25 @@ module Tina4
         },
         "url_encode"    => ->(v, *_a) { CGI.escape(v.to_s) },
 
+        # -- JSON / JS --
+        "to_json" => ->(v, *a) {
+          indent = a[0] ? a[0].to_i : nil
+          json = indent ? JSON.pretty_generate(v) : JSON.generate(v)
+          # Escape <, >, & for safe HTML embedding
+          Tina4::SafeString.new(json.gsub("<", '\u003c').gsub(">", '\u003e').gsub("&", '\u0026'))
+        },
+        "tojson" => ->(v, *a) {
+          indent = a[0] ? a[0].to_i : nil
+          json = indent ? JSON.pretty_generate(v) : JSON.generate(v)
+          Tina4::SafeString.new(json.gsub("<", '\u003c').gsub(">", '\u003e').gsub("&", '\u0026'))
+        },
+        "js_escape" => ->(v, *_a) {
+          Tina4::SafeString.new(
+            v.to_s.gsub("\\", "\\\\").gsub("'", "\\'").gsub('"', '\\"')
+                  .gsub("\n", "\\n").gsub("\r", "\\r").gsub("\t", "\\t")
+          )
+        },
+
         # -- Hashing --
         "md5"    => ->(v, *_a) { Digest::MD5.hexdigest(v.to_s) },
         "sha256" => ->(v, *_a) { Digest::SHA256.hexdigest(v.to_s) },

data/lib/tina4/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.10.15
+  version: 3.10.18
 platform: ruby
 authors:
 - Tina4 Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-28 00:00:00.000000000 Z
+date: 2026-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack