tina4ruby 3.10.1 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1111e4a55512ff1a1c0c01c82e4a180d107387b687ea8caf4b0753b4207f3f02
-  data.tar.gz: 5abf4c9493fdaf45de25ed18f328f92595a484ec4e11b7ed1c87278a55748cb6
+  metadata.gz: cfe8b7f49e17e2a703725d23ce90791acca6e078dc7747a0eebaf97091121330
+  data.tar.gz: a6a2e0c2e48b69e332d6bc0358929a141f91919b19062639259d7c51cb390a39
 SHA512:
-  metadata.gz: 91be26b34ba29c6cfe18038c3c1c78889c0723540483a663571f32482e3d6d7eff6a6fac44603627f516b21beba7f0355c656b1fce3545d6277cb294c52f027e
-  data.tar.gz: 56597ac885f021695f130bde7924309592e1f69154a117276c19d0ca56b2165b7a0d77fbfb79669885225976895440ee9464909f765f1d5ffce31d7ea4f13c24
+  metadata.gz: 24a17f01e57ffda9278e80e0451e54f82111921c1066f21ab30436391e05c475c613c6948824f4fe8d94ddc17f39796240ca47f6ecda8bfe166f805b54335b22
+  data.tar.gz: 2b0c24c5dbef5d4f4d2c3e5337f7dce2bc1f8a89a90cbb149484fe375914cf8465e604ccc6f30e264a78922e4132ad27f7f4d7189e7f589450cf3baa5361c0f1

data/lib/tina4/template.rb

@@ -396,10 +396,24 @@ module Tina4
       end
 
       def resolve_variable(expr)
-        parts = expr.split(".")
+        parts = split_dot_parts(expr)
         value = @context
         parts.each do |part|
-          if part =~ /\A(\w+)\[(.+?)\]\z/
+          if part =~ /\A(\w+)\((.*)?\)\z/m
+            # Method call: e.g. t("key") or greet("hello", "world")
+            method_name = Regexp.last_match(1)
+            args_str = Regexp.last_match(2)
+            callable = access_value(value, method_name)
+            if callable.respond_to?(:call)
+              args = args_str && !args_str.strip.empty? ? parse_filter_args(args_str) : []
+              value = callable.call(*args)
+            elsif callable.respond_to?(method_name.to_sym)
+              args = args_str && !args_str.strip.empty? ? parse_filter_args(args_str) : []
+              value = callable.send(method_name.to_sym, *args)
+            else
+              return nil
+            end
+          elsif part =~ /\A(\w+)\[(.+?)\]\z/
             base = Regexp.last_match(1)
             index = Regexp.last_match(2)
             value = access_value(value, base)
@@ -417,6 +431,65 @@ module Tina4
         value
       end
 
+      # Split expression on dots, respecting quotes, parentheses and brackets.
+      # Dots inside quoted strings or nested parens/brackets are NOT separators.
+      # Bracket access like foo["bar"] is emitted as a separate part.
+      def split_dot_parts(expr)
+        parts = []
+        current = +""
+        paren_depth = 0
+        bracket_depth = 0
+        in_quote = nil
+
+        i = 0
+        chars = expr.chars
+        while i < chars.length
+          ch = chars[i]
+
+          if in_quote
+            current << ch
+            # End quote only when matching unescaped closer
+            in_quote = nil if ch == in_quote && (i == 0 || chars[i - 1] != "\\")
+          elsif ch == '"' || ch == "'"
+            in_quote = ch
+            current << ch
+          elsif ch == "("
+            paren_depth += 1
+            current << ch
+          elsif ch == ")"
+            paren_depth -= 1
+            current << ch
+          elsif ch == "[" && paren_depth == 0
+            if bracket_depth == 0 && !current.empty?
+              # Start of bracket access on an existing part -- split here
+              parts << current
+              current = +""
+            end
+            bracket_depth += 1
+            current << ch
+          elsif ch == "]"
+            bracket_depth -= 1
+            current << ch
+            if bracket_depth == 0 && paren_depth == 0
+              # End of top-level bracket access -- emit as its own part
+              parts << current
+              current = +""
+              # Skip a trailing dot that merely chains the next segment
+              i += 1 if i + 1 < chars.length && chars[i + 1] == "."
+            end
+          elsif ch == "." && paren_depth == 0 && bracket_depth == 0
+            parts << current unless current.empty?
+            current = +""
+          else
+            current << ch
+          end
+
+          i += 1
+        end
+        parts << current unless current.empty?
+        parts
+      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.1"
+  VERSION = "3.10.3"
 end

metadata

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