Merge pull request #92 from jlkiri/jlkiri/remove-deprecated-params-er…

…b-new Use named parameters in ERB.new function
criteo · Dec 12, 2024 · 8c8bb31 · 8c8bb31
2 parents 4a37595 + 493c780
commit 8c8bb31
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,7 @@ samples/consul-ui/decorators.js
 /samples/hosts
 /samples/hosts_per_services
 /samples/prometheus_consul_coordinates
-/samples/ready
+/samples/consul-ui/ready
 /samples/render_template_from_kv
 /samples/consul_template
 /samples/metrics

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:3.2
 
 WORKDIR /usr/src/app
 COPY . .

diff --git a/lib/consul/async/consul_template.rb b/lib/consul/async/consul_template.rb
@@ -318,7 +318,7 @@ def render(tpl, tpl_file_path, params = {}, current_template_info: nil)
           params: params,
           template_info: tpl_info
         }
-        result = ERB.new(tpl, nil, @trim_mode).result(binding)
+        result = ERB.new(tpl, trim_mode: @trim_mode).result(binding)
         raise "Result is not a string :='#{result}' for #{tpl_file_path}" unless result.is_a?(String)
 
         @context = old_value