From 545312de6d1662963bd18ad6ba81ee012e5cd7bf Mon Sep 17 00:00:00 2001
From: Mike Angell <mike.angell@shopify.com>
Date: Tue, 8 Oct 2019 09:48:50 +1100
Subject: [PATCH] Extract render_partial

---
 lib/liquid/tags/render.rb | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/liquid/tags/render.rb b/lib/liquid/tags/render.rb
index 9eb3513..d644423 100644
--- a/lib/liquid/tags/render.rb
+++ b/lib/liquid/tags/render.rb
@@ -35,7 +35,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
 
-      partial = PartialCache.load(
+      @partial = PartialCache.load(
         template_name,
         context: context,
         parse_context: parse_context
@@ -43,23 +43,25 @@ module Liquid
 
       context_variable_name = @alias_name || template_name.split('/').last
 
-      variable = @variable_name_expr ? context.evaluate(@variable_name_expr) : nil
+      render_partial_func = ->(var) { render_partial(context, output, template_name, context_variable_name, var) }
 
-      variable = [variable] unless variable.is_a?(Array)
-      variable.each do |var|
-        inner_context = context.new_isolated_subcontext
-        inner_context.template_name = template_name
-        inner_context.partial = true
-        @attributes.each do |key, value|
-          inner_context[key] = context.evaluate(value)
-        end
-        inner_context[context_variable_name] = var unless var.nil?
-        partial.render_to_output_buffer(inner_context, output)
-      end
+      variable = @variable_name_expr ? context.evaluate(@variable_name_expr) : nil
+      variable.is_a?(Array) ? variable.each(&render_partial_func) : render_partial_func.call(variable)
 
       output
     end
 
+    def render_partial(context, output, template_name, variable_name, variable)
+      inner_context = context.new_isolated_subcontext
+      inner_context.template_name = template_name
+      inner_context.partial = true
+      @attributes.each do |key, value|
+        inner_context[key] = context.evaluate(value)
+      end
+      inner_context[variable_name] = variable unless variable.nil?
+      @partial.render_to_output_buffer(inner_context, output)
+    end
+
     class ParseTreeVisitor < Liquid::ParseTreeVisitor
       def children
         [