BARN-77: don't override base context options

Author: cgaroutte

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parameter_substitution (3.0.0.pre.0)
+    parameter_substitution (3.0.0.pre.1)
       activesupport (>= 6.0)
       builder (~> 3.2)
       invoca-utils (~> 0.3)

lib/parameter_substitution.rb

@@ -86,14 +86,16 @@ def find_warnings(string_with_tokens, mapping: {}, context_overrides: nil)
     # @param [Hash, nil] context_overrides Optional overrides for context attributes
     # @return [ParameterSubstitution::Context] The constructed context
     def build_context(string_with_tokens, mapping, context_overrides)
+      override_options = context_overrides || {}
       base_options = {
         input: string_with_tokens,
         mapping: mapping
       }
 
-      ParameterSubstitution::Context.new(**base_options.merge(context_overrides || {}))
+      ParameterSubstitution::Context.new(**override_options.merge(base_options))
     end
 
+
     def parse_expression(context)
       cst = ParameterSubstitution::Parser.new(
         parameter_start: context.parameter_start,

lib/parameter_substitution/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ParameterSubstitution
-  VERSION = "3.0.0-0"
+  VERSION = "3.0.0-1"
 end

spec/lib/parameter_substitution_spec.rb

@@ -95,6 +95,18 @@ def self.find(_key); end
             expect(ParameterSubstitution.find_tokens(square_expression, mapping: mapping, context_overrides: context_overrides)).to eq(['call.start_time', 'do_a_barrel_roll'])
           end
         end
+
+        context 'when context_overrides attempts to override base options' do
+          it "ignores input override and uses method parameter" do
+            context_overrides = { input: "<different>" }
+            expect(ParameterSubstitution.find_tokens(expression, context_overrides: context_overrides)).to eq(['call', 'do_a_barrel_roll'])
+          end
+
+          it "ignores mapping override and uses method parameter" do
+            context_overrides = { mapping: { 'different' => 'value' } }
+            expect(ParameterSubstitution.find_tokens(expression, mapping: mapping, context_overrides: context_overrides)).to eq(['call.start_time', 'do_a_barrel_roll'])
+          end
+        end
       end
 
       context '#find_formatters' do
@@ -119,6 +131,18 @@ def self.find(_key); end
             expect(ParameterSubstitution.find_formatters(square_expression, mapping: mapping, context_overrides: context_overrides)).to eq(['blank_if_nil', 'downcase'])
           end
         end
+
+        context 'when context_overrides attempts to override base options' do
+          it "ignores input override and uses method parameter" do
+            context_overrides = { input: "<different>" }
+            expect(ParameterSubstitution.find_formatters(expression, context_overrides: context_overrides)).to eq(['start_time', 'blank_if_nil', 'downcase'])
+          end
+
+          it "ignores mapping override and uses method parameter" do
+            context_overrides = { mapping: { 'different' => 'value' } }
+            expect(ParameterSubstitution.find_formatters(expression, mapping: mapping, context_overrides: context_overrides)).to eq(['blank_if_nil', 'downcase'])
+          end
+        end
       end
 
       context '#find_warnings' do
@@ -180,6 +204,20 @@ def self.find(_key); end
                       "Unknown methods 'test1', 'test2' used on parameter 'black'"])
           end
         end
+
+        context 'when context_overrides attempts to override base options' do
+          it "ignores input override and uses method parameter" do
+            context_overrides = { input: "<different>" }
+            expect(ParameterSubstitution.find_warnings(expression_with_valid_params, mapping: default_mapping, context_overrides: context_overrides))
+              .to eq([])
+          end
+
+          it "ignores mapping override and uses method parameter" do
+            context_overrides = { mapping: { 'bobby' => 'value', 'bobby2' => 'value' } }
+            expect(ParameterSubstitution.find_warnings(expression_with_bad_params, mapping: {}, context_overrides: context_overrides))
+              .to eq(["Unknown param 'bobby'", "Unknown param 'bobby2'"])
+          end
+        end
       end
     end