tina4ruby 3.10.14 → 3.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 369c8407929eb62f5cb731892cf04ead2ed42584770039116bf28bec683aebce
-  data.tar.gz: 753464d18ffc0fd0f3920a579ef47487bf51187de6a787e89b49a198e91be62b
+  metadata.gz: 3b4c3594fbc563cd59432d661382280e066d4632f94d2e8244a42479d2016b10
+  data.tar.gz: 15d5e418f53d660591813dd65a7eab0ff66edb98bc4c99b6c22f062b7c36fd55
 SHA512:
-  metadata.gz: '09a62c81d9cd67d79e5254de5751f0ee68f544d0c8a1e379f898613a9a486e584959331ab51db3963ee711c5ea912b7dca5cdff32884d6f2c896285c33086474'
-  data.tar.gz: 3dc7ea9d535599a1e86047efba6521b20e85a54a1fac79b738ecd1a928e19492968548e60bb85478e2b34d99314d8fc79c6456be30e46006d707ceda73efef70
+  metadata.gz: a0c02ec7be3a98f05845983cdea86f11dc9c9d6994e028fe61817daebe60bcec7b24dc07318932d66b8abd48d6145cddb6f1490b00a6fd9a2a74280a524591a6
+  data.tar.gz: a169f586a60bcd5c01b9600f3905aacb9ffa65c0cafc2e478acd31a09fbf572e94dc092b91cdf09cb02ada09fde75c04973b058a65c50a12ab7a488fea3fb96a

data/lib/tina4/template.rb

@@ -132,7 +132,10 @@ module Tina4
         "slice" => ->(v, s, e) { v.to_s[(s.to_i)..(e ? e.to_i : -1)] },
         "merge" => ->(v, o) { v.respond_to?(:merge) ? v.merge(o || {}) : v },
         "batch" => ->(v, s) { v.respond_to?(:each_slice) ? v.each_slice(s.to_i).to_a : [v] },
-        "date" => ->(v, fmt) { TwigEngine.format_date(v, fmt) }
+        "date" => ->(v, fmt) { TwigEngine.format_date(v, fmt) },
+        "to_json" => ->(v) { JSON.generate(v).gsub("<", "\\u003c").gsub(">", "\\u003e").gsub("&", "\\u0026") rescue v.to_s },
+        "tojson" => ->(v) { JSON.generate(v).gsub("<", "\\u003c").gsub(">", "\\u003e").gsub("&", "\\u0026") rescue v.to_s },
+        "js_escape" => ->(v) { v.to_s.gsub("\\", "\\\\").gsub("'", "\\'").gsub('"', '\\"').gsub("\n", "\\n").gsub("\r", "\\r") }
       }.freeze
 
       def initialize(context = {}, base_dir = nil)
@@ -335,8 +338,15 @@ module Tina4
         args = []
         current = +""
         in_quote = nil
+        escaped = false
         args_str.each_char do |ch|
-          if in_quote
+          if escaped
+            current << ch
+            escaped = false
+          elsif ch == "\\"
+            current << ch
+            escaped = true
+          elsif in_quote
             if ch == in_quote
               current << ch
               in_quote = nil
@@ -356,8 +366,8 @@ module Tina4
         args << current.strip unless current.strip.empty?
 
         args.map do |arg|
-          if arg =~ /\A["'](.*)["']\z/
-            Regexp.last_match(1)
+          if arg =~ /\A(["'])(.*)\1\z/m
+            process_escapes(Regexp.last_match(2))
           elsif arg =~ /\A\d+\z/
             arg.to_i
           elsif arg =~ /\A\d+\.\d+\z/
@@ -445,7 +455,9 @@ module Tina4
         expr = expr.strip
 
         # String literal early-return
-        return Regexp.last_match(1) if expr =~ /\A"([^"]*)"\z/ || expr =~ /\A'([^']*)'\z/
+        if expr =~ /\A"([^"]*)"\z/ || expr =~ /\A'([^']*)'\z/
+          return process_escapes(Regexp.last_match(1))
+        end
 
         return expr.to_i if expr =~ /\A-?\d+\z/
         return expr.to_f if expr =~ /\A-?\d+\.\d+\z/
@@ -618,6 +630,30 @@ module Tina4
         parts
       end
 
+      # Process backslash escape sequences in a single pass so that
+      # \\' does not collapse to ' (it should become \').
+      def process_escapes(s)
+        out = +""
+        i = 0
+        while i < s.length
+          if s[i] == "\\" && i + 1 < s.length
+            nxt = s[i + 1]
+            case nxt
+            when "n"  then out << "\n"; i += 2
+            when "t"  then out << "\t"; i += 2
+            when "\\" then out << "\\"; i += 2
+            when "'"  then out << "'";  i += 2
+            when '"'  then out << '"';  i += 2
+            else out << "\\"; i += 1
+            end
+          else
+            out << s[i]
+            i += 1
+          end
+        end
+        out
+      end
+
       def access_value(obj, key)
         return nil if obj.nil?
         if obj.is_a?(Hash)

data/lib/tina4/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.10.14
+  version: 3.10.16
 platform: ruby
 authors:
 - Tina4 Team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -400,7 +399,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://tina4.com
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -415,8 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Simple. Fast. Human. This is not a framework.
 test_files: []