tina4ruby 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1111e4a55512ff1a1c0c01c82e4a180d107387b687ea8caf4b0753b4207f3f02
-  data.tar.gz: 5abf4c9493fdaf45de25ed18f328f92595a484ec4e11b7ed1c87278a55748cb6
+  metadata.gz: b49886a65ba68f1102f4c03b3054c6f0efd4cc576a1083e627981a8832986902
+  data.tar.gz: b5a5cf59633ba153be413a974bd32d6128d6e56e6f901e4a16afce9380f30e94
 SHA512:
-  metadata.gz: 91be26b34ba29c6cfe18038c3c1c78889c0723540483a663571f32482e3d6d7eff6a6fac44603627f516b21beba7f0355c656b1fce3545d6277cb294c52f027e
-  data.tar.gz: 56597ac885f021695f130bde7924309592e1f69154a117276c19d0ca56b2165b7a0d77fbfb79669885225976895440ee9464909f765f1d5ffce31d7ea4f13c24
+  metadata.gz: 85339a87b7bd1c5769cde431f56111d787d80091ba96872aba477b160084bdd18c416a469f1cd05677f0caec667a897e4908503914fc969fe536eb1f26e9a095
+  data.tar.gz: ae31dff4f46df762ca97ba74e26077b75885809e094848cbaf37cdc65fc9035e1fdf0543c7220d49707cf4d11f883ef38f60644ed1edf6d7d0efa8d54036aa50

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,29 @@ module Tina4
         value
       end
 
+      # Split expression on dots, but not dots inside parentheses
+      def split_dot_parts(expr)
+        parts = []
+        current = +""
+        depth = 0
+        expr.each_char do |ch|
+          if ch == "("
+            depth += 1
+            current << ch
+          elsif ch == ")"
+            depth -= 1
+            current << ch
+          elsif ch == "." && depth == 0
+            parts << current
+            current = +""
+          else
+            current << ch
+          end
+        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.2"
 end

metadata

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