tina4ruby 3.10.4 → 3.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb48b3053a6cde8d4d7fef6645b5e4a25eaff05c1d11b8b255c9c5ff42e7759
-  data.tar.gz: 5c7a65aa85b1a3d39676cf90b404cae1fbb3731c4e5c1fbbbbbae02ed97b468f
+  metadata.gz: 1e9679c01c6e303af77a6c9a73c595991c14010af16e36d1b4471eaf0caa6ed3
+  data.tar.gz: 11cb40c1733ec3b360f4c9ad047558f7548b68fe8dc452dcaa7764a2f0a2d33f
 SHA512:
-  metadata.gz: a1d8a2d31f0b1be83d4974190a6e7bf55aad671f7b8945444fc39335f14ddb537b98c887f975fba1f1d3f020f461703936000f33855845b3058de00c5147a377
-  data.tar.gz: 5b1c9e819c1b771c3d6308e23b9fbd1246906d0f96fce21b2a54ea38c27e5bb4af3a0032313101529960498b70f8be6283137d50ee5f172326f9070d681a1ee2
+  metadata.gz: 9ee5400333e5662e0f812887d75d1c95f3c00af5ea2ae64ece651acc0430f27131653510bd1239d262fda5ce39652957f6a796e141f5530fe1424c67527840e4
+  data.tar.gz: e7fa0c88df994957e0836fa0d9437320e7f03cac2f804cd54f55e66f6702294bf9a942fb259aa1e9d7febfed1ffda8a682ed759266bdb53eb78a58682efac0e9

data/lib/tina4/template.rb

@@ -368,9 +368,85 @@ module Tina4
         end
       end
 
+      # Find the first occurrence of +needle+ outside quotes and parentheses.
+      # Returns the index, or -1 if not found.
+      def find_outside_quotes(expr, needle)
+        in_q = nil
+        depth = 0
+        i = 0
+        while i <= expr.length - needle.length
+          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, needle.length] == needle
+            return i
+          end
+          i += 1
+        end
+        -1
+      end
+
+      # Split +expr+ on +sep+ only when +sep+ is outside quotes and parentheses.
+      def split_outside_quotes(expr, sep)
+        parts = []
+        current_start = 0
+        in_q = nil
+        depth = 0
+        i = 0
+        while i <= expr.length - sep.length
+          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, sep.length] == sep
+            parts << expr[current_start...i]
+            i += sep.length
+            current_start = i
+            next
+          end
+          i += 1
+        end
+        parts << expr[current_start..]
+        parts
+      end
+
       def evaluate_expression(expr)
         expr = expr.strip
+
+        # String literal early-return
         return Regexp.last_match(1) if expr =~ /\A"([^"]*)"\z/ || expr =~ /\A'([^']*)'\z/
+
         return expr.to_i if expr =~ /\A-?\d+\z/
         return expr.to_f if expr =~ /\A-?\d+\.\d+\z/
         return true if expr == "true"
@@ -382,10 +458,30 @@ module Tina4
         if expr =~ /\A(\d+)\.\.(\d+)\z/
           return (Regexp.last_match(1).to_i..Regexp.last_match(2).to_i)
         end
-        if expr.include?("~")
-          parts = expr.split("~").map { |p| evaluate_expression(p.strip) }
-          return parts.map(&:to_s).join
+
+        # Null coalescing: value ?? "default"
+        if find_outside_quotes(expr, "??") >= 0
+          pos = find_outside_quotes(expr, "??")
+          left = expr[0...pos]
+          right = expr[(pos + 2)..]
+          val = evaluate_expression(left.strip)
+          return val unless val.nil?
+          return evaluate_expression(right.strip)
+        end
+
+        # String concatenation with ~ (only outside quotes/parens)
+        if find_outside_quotes(expr, "~") >= 0
+          parts = split_outside_quotes(expr, "~")
+          return parts.map { |p| (evaluate_expression(p.strip) || "").to_s }.join
+        end
+
+        # Comparison operators (only outside quotes/parens)
+        [" not in ", " in ", " is not ", " is ", "!=", "==", ">=", "<=", ">", "<", " and ", " or ", " not "].each do |op|
+          if find_outside_quotes(expr, op) >= 0
+            return evaluate_condition(expr)
+          end
         end
+
         if expr =~ /\A(.+?)\s*(\+|-|\*|\/|%)\s*(.+)\z/
           left = evaluate_expression(Regexp.last_match(1))
           op = Regexp.last_match(2)

data/lib/tina4/version.rb

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

metadata

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