From 38117adfe370f0f13503f602cc90ced874428d52 Mon Sep 17 00:00:00 2001
From: Eugene Gilburg <eugene.gilburg@gmail.com>
Date: Fri, 18 Jul 2014 20:54:03 -0700
Subject: [PATCH] small refactors to actionview renderers

---
 .../action_view/renderer/abstract_renderer.rb |  6 ++++--
 .../action_view/renderer/partial_renderer.rb  | 20 +++++++++----------
 .../action_view/renderer/template_renderer.rb |  5 +----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/actionview/lib/action_view/renderer/abstract_renderer.rb b/actionview/lib/action_view/renderer/abstract_renderer.rb
index 73c19a0ae2..1f122f9bc6 100644
--- a/actionview/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionview/lib/action_view/renderer/abstract_renderer.rb
@@ -29,8 +29,9 @@ module ActionView
 
     def extract_details(options)
       @lookup_context.registered_details.each_with_object({}) do |key, details|
-        next unless value = options[key]
-        details[key] = Array(value)
+        value = options[key]
+
+        details[key] = Array(value) if value
       end
     end
 
@@ -41,6 +42,7 @@ module ActionView
     def prepend_formats(formats)
       formats = Array(formats)
       return if formats.empty? || @lookup_context.html_fallback_for_js
+
       @lookup_context.formats = formats | @lookup_context.formats
     end
   end
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb
index a4f6573601..a8d2094f72 100644
--- a/actionview/lib/action_view/renderer/partial_renderer.rb
+++ b/actionview/lib/action_view/renderer/partial_renderer.rb
@@ -353,25 +353,27 @@ module ActionView
     # respond to +to_partial_path+ in order to setup the path.
     def setup(context, options, block)
       @view   = context
-      partial = options[:partial]
-
       @options = options
-      @locals  = options[:locals] || {}
       @block   = block
+
+      @locals  = options[:locals] || {}
       @details = extract_details(options)
 
       prepend_formats(options[:formats])
 
+      partial = options[:partial]
+
       if String === partial
         @object     = options[:object]
+        @collection = collection_from_options
         @path       = partial
-        @collection = collection
       else
         @object = partial
+        @collection = collection_from_object || collection_from_options
 
-        if @collection = collection_from_object || collection
+        if @collection
           paths = @collection_data = @collection.map { |o| partial_path(o) }
-          @path = paths.uniq.size == 1 ? paths.first : nil
+          @path = paths.uniq.one? ? paths.first : nil
         else
           @path = partial_path
         end
@@ -392,7 +394,7 @@ module ActionView
       self
     end
 
-    def collection
+    def collection_from_options
       if @options.key?(:collection)
         collection = @options[:collection]
         collection.respond_to?(:to_ary) ? collection.to_ary : []
@@ -404,9 +406,7 @@ module ActionView
     end
 
     def find_partial
-      if path = @path
-        find_template(path, @template_keys)
-      end
+      find_template(@path, @template_keys) if @path
     end
 
     def find_template(path, locals)
diff --git a/actionview/lib/action_view/renderer/template_renderer.rb b/actionview/lib/action_view/renderer/template_renderer.rb
index be17097428..7bf527bfda 100644
--- a/actionview/lib/action_view/renderer/template_renderer.rb
+++ b/actionview/lib/action_view/renderer/template_renderer.rb
@@ -6,13 +6,10 @@ module ActionView
       @view    = context
       @details = extract_details(options)
       template = determine_template(options)
-      context  = @lookup_context
 
       prepend_formats(template.formats)
 
-      unless context.rendered_format
-        context.rendered_format = template.formats.first || formats.first
-      end
+      @lookup_context.rendered_format ||= (template.formats.first || formats.first)
 
       render_template(template, options[:layout], options[:locals])
     end