tina4ruby 3.10.13 → 3.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6d46cd66e041da43c47eef3869b8fd66455270fe1937d4c86ee839836dd6419
-  data.tar.gz: bf4853aa8715cc865c25fa2693b10d50168d1fd48bc9a9371e8368a963e142bc
+  metadata.gz: 89bb63a5bf75c1e5100a6180e7283668bceb7a422e3dbfcb9ab175634ae0b8a5
+  data.tar.gz: 020d40942508338964f6e9c3b06417a11303f2997eb55827baefe59c9443bb11
 SHA512:
-  metadata.gz: 21b443f74d40f46d610be7d039be8158b6a3a8be044476730ece168baaa2f8bb9b65a1b6e82f8a8c2d1cf50b9aafa614d99c3229b0c75b64b696973853cd1a21
-  data.tar.gz: 93a487f54bcbf48995dc61915326b8826cac1a7a4250275ab0ec25fd3a47af55b39da60186dbeac86eb87db2c2d2b6b5f2a92f73f6ce46bf44db9c724cec8fb8
+  metadata.gz: 0c712a05318ae0cb27fa194121ff32999264835d27f7237e39cf3f80fd40b3b834b8e47a3a63c9605a43c0f503f284dc25bf3c3aa9441a69c14d192f382cacf2
+  data.tar.gz: bebefcf988a513b917ca9803474b07cf3dd6c116c5b3595a52d9582484c4fdfddd7e4b31472128012455f2d508d56866e378ef52809902d616ea5ba6a42a5c4d

data/lib/tina4/database.rb

@@ -311,6 +311,61 @@ module Tina4
       tables.any? { |t| t.downcase == table_name.to_s.downcase }
     end
 
+    # Pre-generate the next available primary key ID using engine-aware strategies.
+    #
+    # - Firebird: auto-creates a generator if missing, then increments via GEN_ID.
+    # - PostgreSQL: tries nextval() on the standard sequence, falls through to MAX+1.
+    # - SQLite/MySQL/MSSQL: uses MAX(pk) + 1.
+    # - Returns 1 if the table is empty or does not exist.
+    #
+    # @param table [String] Table name
+    # @param pk_column [String] Primary key column name (default: "id")
+    # @param generator_name [String, nil] Firebird generator name override
+    # @return [Integer] The next available ID
+    def get_next_id(table, pk_column: "id", generator_name: nil)
+      drv = current_driver
+
+      # Firebird — use generators
+      if @driver_name == "firebird"
+        gen_name = generator_name || "GEN_#{table.upcase}_ID"
+
+        # Auto-create the generator if it does not exist
+        begin
+          drv.execute("CREATE GENERATOR #{gen_name}")
+        rescue
+          # Generator already exists — ignore
+        end
+
+        rows = drv.execute_query("SELECT GEN_ID(#{gen_name}, 1) AS NEXT_ID FROM RDB$DATABASE")
+        row = rows.is_a?(Array) ? rows.first : nil
+        return (row && (row["NEXT_ID"] || row["next_id"]))&.to_i || 1
+      end
+
+      # PostgreSQL — try sequence first, fall through to MAX
+      if @driver_name == "postgres"
+        seq_name = "#{table.downcase}_#{pk_column.downcase}_seq"
+        begin
+          rows = drv.execute_query("SELECT nextval('#{seq_name}') AS next_id")
+          row = rows.is_a?(Array) ? rows.first : nil
+          if row && (row["next_id"] || row["nextval"])
+            return (row["next_id"] || row["nextval"]).to_i
+          end
+        rescue
+          # No sequence — fall through to MAX
+        end
+      end
+
+      # SQLite / MySQL / MSSQL / PostgreSQL fallback — MAX + 1
+      begin
+        rows = drv.execute_query("SELECT MAX(#{pk_column}) + 1 AS next_id FROM #{table}")
+        row = rows.is_a?(Array) ? rows.first : nil
+        next_id = row && (row["next_id"] || row["max"])
+        return next_id ? next_id.to_i : 1
+      rescue
+        return 1
+      end
+    end
+
     private
 
     def truthy?(val)

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.13"
+  VERSION = "3.10.15"
 end

metadata

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