forest_admin_agent 1.36.0 → 1.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59bcabb74959ab090658d106c743b18c6503f75b085ad32c9282288a2ece4963
-  data.tar.gz: 66c2283f513b2f22d603b16f30480713992879a31fb46985f14dd7cf74b94c0a
+  metadata.gz: a13562c23233f9b3e5083c0d0f8d4478fd09eeaf6f9581b9e7b38b3020c96507
+  data.tar.gz: f6055e0ab36bdddc899de5e44d792c63185c1d0f040234f94812ac73672d562a
 SHA512:
-  metadata.gz: de2234332df46b3fbe7ddfeaf7425df1f0e789d39e9c0cba722044508f03019cabffe700edf977160beb1a087c96d07deb67f65b3e0ca1c8f4e31706be03c909
-  data.tar.gz: 8dd2c52e79c5253e7618ef9c70a93db8f4920bb56f96b9b7c2da5d6afb220fcc704d29f10019ecee4901d8d6e5755087dbb2067da3c024c2bf6dc3e7697a1c2a
+  metadata.gz: 75c550acaf51c3cd42c001d6629fdb777d730428d1dedbb1369dea0545e792b9a58e96b62825e8b428fa37458482a631bdfd78f6380f9faff0346c02b4b82d42
+  data.tar.gz: 0e78923aee30934275076f58ad3e526a34a5c7c744e864a178b83c7a34146f5e5a2c121f7f4b5c2dd33051bea050b14080afb4d1ca5f2ee196876054286ca718

data/lib/forest_admin_agent/utils/context_variables_injector.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module ForestAdminAgent
   module Utils
     class ContextVariablesInjector
@@ -5,13 +7,28 @@ module ForestAdminAgent
       include ForestAdminAgent::Builder
 
       REGEX = /{{([^}]+)}}/
+      FULL_REFERENCE_REGEX = /\A{{([^}]+)}}\z/
 
       def self.inject_context_in_value(value, context_variables)
+        return value unless value.is_a?(String)
+
+        # A value that is exactly one {{variable}} reference (no surrounding text) keeps the
+        # resolved object as-is, so a jsonb/array field gets typed-cast correctly by the
+        # datasource instead of being compared against a serialized string that can never match.
+        full_reference = FULL_REFERENCE_REGEX.match(value)
+        return context_variables.get_value(full_reference[1]) if full_reference
+
         inject_context_in_value_custom(value) do |context_variable_key|
-          context_variables.get_value(context_variable_key).to_s
+          serialize_for_injection(context_variables.get_value(context_variable_key))
         end
       end
 
+      def self.serialize_for_injection(resolved_value)
+        return JSON.generate(resolved_value) if resolved_value.is_a?(Array) || resolved_value.is_a?(Hash)
+
+        resolved_value.to_s
+      end
+
       def self.inject_context_in_native_query(datasource, connection_name, query, context_variables)
         return query unless query.is_a?(String)
 
@@ -37,23 +54,17 @@ module ForestAdminAgent
       def self.inject_context_in_value_custom(value)
         return value unless value.is_a?(String)
 
-        value_with_context_variables_injected = value
-        encountered_variables = []
-
-        while (match = REGEX.match(value_with_context_variables_injected))
-          context_variable_key = match[1]
+        # Resolve every distinct {{key}} found in the ORIGINAL string upfront, then substitute
+        # in a single gsub pass. A resolved value can itself contain "{{...}}"-looking text (e.g.
+        # a tag whose data happens to include it); re-scanning a mutated string for placeholders
+        # (the previous while+gsub! approach) would misinterpret that text as a new reference, or
+        # loop forever if it matched an already-resolved key without ever changing the string.
+        keys = value.scan(REGEX).map(&:first).uniq
+        return value if keys.empty?
 
-          unless encountered_variables.include?(context_variable_key)
-            value_with_context_variables_injected.gsub!(
-              /{{#{context_variable_key}}}/,
-              yield(context_variable_key)
-            )
-          end
-
-          encountered_variables.push(context_variable_key)
-        end
+        replacements = keys.to_h { |key| [key, yield(key)] }
 
-        value_with_context_variables_injected
+        value.gsub(REGEX) { replacements[::Regexp.last_match(1)] }
       end
 
       def self.inject_context_in_filter(filter, context_variables)

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.36.0"
+        LIANA_VERSION = "1.36.1"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.36.0"
+  VERSION = "1.36.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.36.1
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-24 00:00:00.000000000 Z
+date: 2026-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport