Fix: locomotivecms#171 looping was modifing the original attribute

akretion · Jan 27, 2020 · 50648b0 · 50648b0
1 parent 9be88e1
commit 50648b0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/lib/locomotive/steam/liquid/tags/concerns/attributes.rb b/lib/locomotive/steam/liquid/tags/concerns/attributes.rb
@@ -18,17 +18,17 @@ module Attributes
             private
 
             def parse_attributes(markup, default = {})
-              @attributes = default || {}
+              @raw_attributes = default || {}
               attribute_markup = ""
               if markup =~ /^ *([a-zA-Z0-9_.]*:.*)$/
                 attribute_markup = $1
               elsif markup =~ /^[a-zA-Z0-9 _"']*, *(.*)$/
                 attribute_markup = $1
               end
               unless attribute_markup.blank?
-                @attributes.merge!(AttributeParser.parse(attribute_markup))
+                @raw_attributes.merge!(AttributeParser.parse(attribute_markup))
               end
-              @attributes
+              @raw_attributes
             end
 
             def context_evaluate_array(vals)
@@ -41,7 +41,7 @@ def context_evaluate(vals)
 
             def evaluate_attributes(context, lax: false)
               @attributes = HashWithIndifferentAccess.new.tap do |hash|
-                attributes.each do |key, value|
+                raw_attributes.each do |key, value|
                   hash[evaluate_value(context, key, lax: lax)] = evaluate_value(context, value, lax: lax)
                 end
               end

diff --git a/lib/locomotive/steam/liquid/tags/consume.rb b/lib/locomotive/steam/liquid/tags/consume.rb
@@ -25,9 +25,9 @@ def initialize(tag_name, markup, options)
             super
 
             if markup =~ Syntax
-              @variable_name, @url, attributes = $1.to_s, ::Liquid::Expression.parse($2), $3
+              @variable_name, @url, _attributes = $1.to_s, ::Liquid::Expression.parse($2), $3
 
-              parse_attributes(attributes)
+              parse_attributes(_attributes)
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'consume' - Valid syntax: consume <var> from \"<url>\" [username: value, password: value]")
             end

diff --git a/spec/unit/liquid/tags/path_to_spec.rb b/spec/unit/liquid/tags/path_to_spec.rb
@@ -106,6 +106,13 @@
 
         it { is_expected.to eq '/fr/a-notre-sujet' }
 
+        context 'loop on several locale from variable' do
+          let(:assigns) { { 'about_us' => drop, 'langs' => ['en', 'fr'] } }
+          let(:source) { "{% for lang in langs %}{% path_to about_us, locale: lang %}|{% endfor %}" }
+
+          it { is_expected.to eq '/about-us|/fr/a-notre-sujet|' }
+       end
+
       end
 
     end

diff --git a/spec/unit/liquid/tags/with_scope_spec.rb b/spec/unit/liquid/tags/with_scope_spec.rb
@@ -190,6 +190,15 @@
 
     end
 
+    describe 'In a loop context, each scope should be evaluated correctly' do
+        let(:assigns) { {'list' => ['A', 'B', 'C']} }
+
+        let(:source) { "{% for key in list %}{% with_scope foo: key %}{% assign conditions = with_scope %}{% endwith_scope %}{{ conditions }}{% endfor %}" }
+
+      it { expect(output).to eq '{"foo"=>"A"}{"foo"=>"B"}{"foo"=>"C"}' }
+
+    end
+
   end
 
 end