lib/hiera/interpolate.rb in hiera-1.3.2.rc1 vs lib/hiera/interpolate.rb in hiera-1.3.2.rc2

@@ -1,24 +1,38 @@
 require 'hiera/backend'
+require 'hiera/recursive_guard'
 
 class Hiera::Interpolate
   class << self
     INTERPOLATION = /%\{([^\}]*)\}/
     METHOD_INTERPOLATION = /%\{(scope|hiera)\(['"]([^"']*)["']\)\}/
 
-    def interpolate(data, recurse_guard, scope, extra_data)
+    def interpolate(data, scope, extra_data)
+      if data.is_a?(String)
+        # Wrapping do_interpolation in a gsub block ensures we process
+        # each interpolation site in isolation using separate recursion guards.
+        data.gsub(INTERPOLATION) do |match|
+          do_interpolation(match, Hiera::RecursiveGuard.new, scope, extra_data)
+        end
+      else
+        data
+      end
+    end
+
+    def do_interpolation(data, recurse_guard, scope, extra_data)
       if data.is_a?(String) && (match = data.match(INTERPOLATION))
         interpolation_variable = match[1]
         recurse_guard.check(interpolation_variable) do
           interpolate_method, key = get_interpolation_method_and_key(data)
           interpolated_data = send(interpolate_method, data, key, scope, extra_data)
-          interpolate(interpolated_data, recurse_guard, scope, extra_data)
+          do_interpolation(interpolated_data, recurse_guard, scope, extra_data)
         end
       else
         data
       end
     end
+    private :do_interpolation
 
     def get_interpolation_method_and_key(data)
       if (match = data.match(METHOD_INTERPOLATION))
         case match[1]
         when 'hiera' then [:hiera_interpolate, match[2]]
@@ -33,16 +47,16 @@
     def scope_interpolate(data, key, scope, extra_data)
       value = scope[key]
       if value.nil? || value == :undefined
         value = extra_data[key]
       end
-      data.sub(INTERPOLATION, value.to_s)
+
+      value
     end
     private :scope_interpolate
 
     def hiera_interpolate(data, key, scope, extra_data)
-      value = Hiera::Backend.lookup(key, nil, scope, nil, :priority)
-      data.sub(METHOD_INTERPOLATION, value)
+      Hiera::Backend.lookup(key, nil, scope, nil, :priority)
     end
     private :hiera_interpolate
   end
 end