From 0a132c2fe13fb2b8d5dade9cf6abd70601376287 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 22 Apr 2009 17:16:28 -0700
Subject: Refactor ActionView::Path

  * Decouple from ActionController and ActionMailer
  * Bring back localization support.
  * Prepare to decouple templates from the filesystem.
  * Prepare to decouple localization from ActionView
  * Fix ActionMailer to take advantage of ActionView::Path
---
 actionpack/lib/action_controller/abstract/layouts.rb  | 4 ++--
 actionpack/lib/action_controller/abstract/renderer.rb | 2 +-
 actionpack/lib/action_controller/base/layout.rb       | 2 +-
 actionpack/lib/action_controller/base/render.rb       | 7 ++++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 478b301a26..0039e67c5a 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -38,7 +38,7 @@ module AbstractController
         else
           self.class_eval %{
             def _layout
-              if view_paths.find_by_parts?("#{_implied_layout_name}", formats, "layouts")
+              if view_paths.find_by_parts?("#{_implied_layout_name}", {:formats => formats}, "layouts")
                 "#{_implied_layout_name}"
               else
                 super
@@ -62,7 +62,7 @@ module AbstractController
         raise ArgumentError, "String, false, or nil expected; you passed #{name.inspect}"
       end
       
-      name && view_paths.find_by_parts(name, formats, "layouts")
+      name && view_paths.find_by_parts(name, {:formats => formats}, "layouts")
     end
     
     def _default_layout(require_layout = false)
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index a86eef889e..e31accbbfc 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -29,7 +29,7 @@ module AbstractController
     def render_to_body(options = {})
       name = options[:_template_name] || action_name
       
-      template = options[:_template] || view_paths.find_by_parts(name.to_s, formats, options[:_prefix])
+      template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
       _render_template(template, options)
     end
 
diff --git a/actionpack/lib/action_controller/base/layout.rb b/actionpack/lib/action_controller/base/layout.rb
index 4fcef6c5d9..1ad5191c73 100644
--- a/actionpack/lib/action_controller/base/layout.rb
+++ b/actionpack/lib/action_controller/base/layout.rb
@@ -182,7 +182,7 @@ module ActionController #:nodoc:
       def memoized_find_layout(layout, formats) #:nodoc:
         return layout if layout.nil? || layout.respond_to?(:render)
         prefix = layout.to_s =~ /layouts\// ? nil : "layouts"
-        view_paths.find_by_parts(layout.to_s, formats, prefix)
+        view_paths.find_by_parts(layout.to_s, {:formats => formats}, prefix)
       end
 
       def find_layout(*args)
diff --git a/actionpack/lib/action_controller/base/render.rb b/actionpack/lib/action_controller/base/render.rb
index 606df58518..52934076e6 100644
--- a/actionpack/lib/action_controller/base/render.rb
+++ b/actionpack/lib/action_controller/base/render.rb
@@ -374,8 +374,13 @@ module ActionController
         render_for_file(name.sub(/^\//, ''), [layout, true], options)
       end
     end
-  
+
+    # ==== Arguments
+    # parts<Array[String, Array[Symbol*], String, Boolean]>::
+    #     Example: ["show", [:html, :xml], "users", false]
     def render_for_parts(parts, layout, options = {})
+      parts[1] = {:formats => parts[1], :locales => [I18n.locale]}
+      
       tmp = view_paths.find_by_parts(*parts)
       
       layout = _pick_layout(*layout) unless tmp.exempt_from_layout?
-- 
cgit v1.2.3