From 8a4e77b4200946ba4ed42fe5927a7400a846063a Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 27 Apr 2009 18:21:26 -0700
Subject: OMG, a lot of work

---
 actionpack/lib/action_controller/abstract/layouts.rb  | 5 +++--
 actionpack/lib/action_controller/abstract/renderer.rb | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 0039e67c5a..315d6151e9 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -50,6 +50,7 @@ module AbstractController
     end
     
     def _render_template(template, options)
+      # layout = options[:_layout].is_a?(ActionView::Template) ? options[:_layout] : _layout_for_name(options[:_layout])
       _action_view._render_template_with_layout(template, options[:_layout])
     end
         
@@ -67,10 +68,10 @@ module AbstractController
     
     def _default_layout(require_layout = false)
       if require_layout && !_layout
-        raise ArgumentError, 
+        raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
-        
+
       begin
         layout = _layout_for_name(_layout)
       rescue NameError => e
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index e31accbbfc..37da2398ec 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -27,9 +27,11 @@ module AbstractController
     # 
     # :api: plugin
     def render_to_body(options = {})
+      options = {:_template_name => options} if options.is_a?(String)
       name = options[:_template_name] || action_name
       
       template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
+      
       _render_template(template, options)
     end
 
-- 
cgit v1.2.3


From 4f68311685831b940936130203c240fa23525c84 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 29 Apr 2009 12:19:17 -0700
Subject: Finished implementing render :text in Base2

---
 actionpack/lib/action_controller/abstract/renderer.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 37da2398ec..c1f420f7b4 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -1,6 +1,15 @@
 require "action_controller/abstract/logger"
 
 module AbstractController
+  class AbstractControllerError < StandardError; end
+  class DoubleRenderError < AbstractControllerError
+    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end  
+  
   module Renderer
     depends_on AbstractController::Logger
     
@@ -17,6 +26,10 @@ module AbstractController
     end
         
     def render(options = {})
+      unless response_body.nil?
+        raise AbstractController::DoubleRenderError, "OMG"
+      end
+      
       self.response_body = render_to_body(options)
     end
     
-- 
cgit v1.2.3


From 0c3d9bc4c2b329cb754bfed1e465f99d058e1193 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 29 Apr 2009 16:33:24 -0700
Subject: Ported over render :template tests

---
 actionpack/lib/action_controller/abstract/layouts.rb  | 3 +--
 actionpack/lib/action_controller/abstract/renderer.rb | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 315d6151e9..f56b9dd914 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -50,8 +50,7 @@ module AbstractController
     end
     
     def _render_template(template, options)
-      # layout = options[:_layout].is_a?(ActionView::Template) ? options[:_layout] : _layout_for_name(options[:_layout])
-      _action_view._render_template_with_layout(template, options[:_layout])
+      _action_view._render_template_with_layout(template, options[:_layout], options)
     end
         
   private
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index c1f420f7b4..e9a7ab4004 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -40,7 +40,6 @@ module AbstractController
     # 
     # :api: plugin
     def render_to_body(options = {})
-      options = {:_template_name => options} if options.is_a?(String)
       name = options[:_template_name] || action_name
       
       template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
-- 
cgit v1.2.3


From 49834e088bf8d02a4f75793a42868f2aea8749a4 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Wed, 29 Apr 2009 17:32:39 -0700
Subject: Support implicit render and blank render

---
 actionpack/lib/action_controller/abstract/base.rb     | 13 ++++++++++++-
 actionpack/lib/action_controller/abstract/renderer.rb |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index ade7719cc0..a87a490a2d 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -29,10 +29,21 @@ module AbstractController
     
   private
   
+    # It is possible for respond_to?(action_name) to be false and
+    # respond_to?(:action_missing) to be false if respond_to_action?
+    # is overridden in a subclass. For instance, ActionController::Base
+    # overrides it to include the case where a template matching the
+    # action_name is found.
     def process_action
-      respond_to?(action_name) ? send(action_name) : send(:action_missing, action_name)
+      if respond_to?(action_name) then send(action_name)
+      elsif respond_to?(:action_missing, true) then send(:action_missing, action_name)
+      end
     end
     
+    # Override this to change the conditions that will raise an
+    # ActionNotFound error. If you accept a difference case,
+    # you must handle it by also overriding process_action and
+    # handling the case.
     def respond_to_action?(action_name)
       respond_to?(action_name) || respond_to?(:action_missing, true)
     end
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index e9a7ab4004..716b213c75 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -42,9 +42,9 @@ 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 => formats}, options[:_prefix])
+      options[:_template] ||= view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
       
-      _render_template(template, options)
+      _render_template(options[:_template], options)
     end
 
     # Raw rendering of a template to a string.
-- 
cgit v1.2.3


From 4ee3e5b094463383891789f484e927b19fccc744 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 30 Apr 2009 15:13:40 -0700
Subject: Ported over the concept of public instance methods on controller
 child classes as callable action methods

---
 actionpack/lib/action_controller/abstract/base.rb | 48 +++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index a87a490a2d..3b85ba5565 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -4,13 +4,44 @@ module AbstractController
     attr_internal :response_body
     attr_internal :response_obj
     attr_internal :action_name
-    
-    def self.process(action)
-      new.process(action)
+
+    class << self
+      attr_reader :abstract    
+      
+      def abstract!
+        @abstract = true
+      end
+      
+      alias_method :abstract?, :abstract
+      
+      def internal_methods
+        controller = self
+        controller = controller.superclass until controller.abstract?
+        controller.public_instance_methods(true)
+      end
+      
+      def process(action)
+        new.process(action)
+      end
+
+      def hidden_actions
+        []
+      end
+      
+      def action_methods
+        @action_methods ||=
+          # All public instance methods of this class, including ancestors
+          public_instance_methods(true).map { |m| m.to_sym }.to_set -
+          # Except for public instance methods of Base and its ancestors
+          internal_methods.map { |m| m.to_sym } +
+          # Be sure to include shadowed public instance methods of this class
+          public_instance_methods(false).map { |m| m.to_sym } -
+          # And always exclude explicitly hidden actions
+          hidden_actions
+      end
     end
     
-    def self.inherited(klass)
-    end
+    abstract!
     
     def initialize
       self.response_obj = {}
@@ -29,6 +60,10 @@ module AbstractController
     
   private
   
+    def action_methods
+      self.class.action_methods
+    end
+  
     # It is possible for respond_to?(action_name) to be false and
     # respond_to?(:action_missing) to be false if respond_to_action?
     # is overridden in a subclass. For instance, ActionController::Base
@@ -45,8 +80,7 @@ module AbstractController
     # you must handle it by also overriding process_action and
     # handling the case.
     def respond_to_action?(action_name)
-      respond_to?(action_name) || respond_to?(:action_missing, true)
+      action_methods.include?(action_name) || respond_to?(:action_missing, true)
     end
-    
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From b4903a8e34da77b96ea136ccd015c1634a8a5c2b Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 1 May 2009 16:01:37 -0700
Subject: Modify new_base to use String action_names for back-compat

---
 actionpack/lib/action_controller/abstract/base.rb      | 8 ++++----
 actionpack/lib/action_controller/abstract/callbacks.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 3b85ba5565..8a8e748c0e 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -21,7 +21,7 @@ module AbstractController
       end
       
       def process(action)
-        new.process(action)
+        new.process(action.to_s)
       end
 
       def hidden_actions
@@ -31,11 +31,11 @@ module AbstractController
       def action_methods
         @action_methods ||=
           # All public instance methods of this class, including ancestors
-          public_instance_methods(true).map { |m| m.to_sym }.to_set -
+          public_instance_methods(true).map { |m| m.to_s }.to_set -
           # Except for public instance methods of Base and its ancestors
-          internal_methods.map { |m| m.to_sym } +
+          internal_methods.map { |m| m.to_s } +
           # Be sure to include shadowed public instance methods of this class
-          public_instance_methods(false).map { |m| m.to_sym } -
+          public_instance_methods(false).map { |m| m.to_s } -
           # And always exclude explicitly hidden actions
           hidden_actions
       end
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index c8b509081c..5f1607940a 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -14,11 +14,11 @@ module AbstractController
     module ClassMethods
       def _normalize_callback_options(options)
         if only = options[:only]
-          only = Array(only).map {|o| "action_name == :#{o}"}.join(" || ")
+          only = Array(only).map {|o| "action_name == '#{o}'"}.join(" || ")
           options[:per_key] = {:if => only}
         end
         if except = options[:except]
-          except = Array(except).map {|e| "action_name == :#{e}"}.join(" || ")          
+          except = Array(except).map {|e| "action_name == '#{e}'"}.join(" || ")          
           options[:per_key] = {:unless => except}
         end
       end
-- 
cgit v1.2.3


From 918b119bd3310c15dab4eb8a3317cc2a32503119 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 1 May 2009 16:02:37 -0700
Subject: Add support for stripping "layouts/" from the layout name

---
 actionpack/lib/action_controller/abstract/layouts.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index f56b9dd914..eb3b73289d 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -57,6 +57,9 @@ module AbstractController
   
     def _layout() end # This will be overwritten
     
+    # :api: plugin
+    # ====
+    # Override this to mutate the inbound layout name
     def _layout_for_name(name)
       unless [String, FalseClass, NilClass].include?(name.class)
         raise ArgumentError, "String, false, or nil expected; you passed #{name.inspect}"
-- 
cgit v1.2.3


From 030dfe3f831aacd60bbfa525dfac4cd5921b6530 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Mon, 11 May 2009 10:22:07 -0700
Subject: More community code review :)

---
 actionpack/lib/action_controller/abstract/base.rb     | 3 +--
 actionpack/lib/action_controller/abstract/helpers.rb  | 9 +--------
 actionpack/lib/action_controller/abstract/renderer.rb | 4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 8a8e748c0e..ab9aed0b26 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -54,7 +54,6 @@ module AbstractController
       
       @_action_name = action_name
       process_action
-      self.response_obj[:body] = self.response_body
       self
     end
     
@@ -71,7 +70,7 @@ module AbstractController
     # action_name is found.
     def process_action
       if respond_to?(action_name) then send(action_name)
-      elsif respond_to?(:action_missing, true) then send(:action_missing, action_name)
+      elsif respond_to?(:action_missing, true) then action_missing(action_name)
       end
     end
     
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 1f0b38417b..370e3a79ee 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -6,14 +6,7 @@ module AbstractController
       extlib_inheritable_accessor :master_helper_module
       self.master_helper_module = Module.new
     end
-  
-    # def self.included(klass)
-    #   klass.class_eval do
-    #     extlib_inheritable_accessor :master_helper_module
-    #     self.master_helper_module = Module.new
-    #   end
-    # end
-    
+
     def _action_view
       @_action_view ||= begin
         av = super
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 716b213c75..bed7f75b2f 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -20,13 +20,13 @@ module AbstractController
       
       self._view_paths ||= ActionView::PathSet.new
     end
-        
+    
     def _action_view
       @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self)      
     end
         
     def render(options = {})
-      unless response_body.nil?
+      if response_body
         raise AbstractController::DoubleRenderError, "OMG"
       end
       
-- 
cgit v1.2.3


From c1d120a71e74aa3ccab6dc28a5406b87a51a69c1 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 11 May 2009 11:48:38 -0700
Subject: Don't run the action if callbacks are halted.

  In AbstractController, this means that response_body is not empty
---
 actionpack/lib/action_controller/abstract/callbacks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index 5f1607940a..f3210a040a 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Callbacks
     setup do
       include ActiveSupport::NewCallbacks
-      define_callbacks :process_action      
+      define_callbacks :process_action, "response_body"
     end
     
     def process_action
-- 
cgit v1.2.3


From 0cac68d3bed3e6bf8ec2eb994858e4a179046941 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 11 May 2009 15:03:24 -0700
Subject: Revert "Whitespace!"

This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
---
 actionpack/lib/action_controller/abstract/base.rb  | 19 ++++++++-------
 .../lib/action_controller/abstract/callbacks.rb    |  8 +++----
 .../lib/action_controller/abstract/exceptions.rb   |  2 +-
 .../lib/action_controller/abstract/helpers.rb      | 17 +++++++-------
 .../lib/action_controller/abstract/layouts.rb      | 27 +++++++++++-----------
 .../lib/action_controller/abstract/logger.rb       |  2 +-
 .../lib/action_controller/abstract/renderer.rb     | 19 +++++++--------
 7 files changed, 50 insertions(+), 44 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 39e9ad0440..ade7719cc0 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -1,38 +1,41 @@
 module AbstractController
   class Base
+    
     attr_internal :response_body
     attr_internal :response_obj
     attr_internal :action_name
-
+    
     def self.process(action)
       new.process(action)
     end
-
+    
     def self.inherited(klass)
     end
-
+    
     def initialize
       self.response_obj = {}
     end
-
+    
     def process(action_name)
       unless respond_to_action?(action_name)
         raise ActionNotFound, "The action '#{action_name}' could not be found"
       end
-
+      
       @_action_name = action_name
       process_action
       self.response_obj[:body] = self.response_body
       self
     end
-
+    
   private
+  
     def process_action
       respond_to?(action_name) ? send(action_name) : send(:action_missing, action_name)
     end
-
+    
     def respond_to_action?(action_name)
       respond_to?(action_name) || respond_to?(:action_missing, true)
     end
+    
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index cb8aade0be..d7faaf4236 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -13,7 +13,7 @@ module AbstractController
         super
       end
     end
-
+    
     module ClassMethods
       def _normalize_callback_options(options)
         if only = options[:only]
@@ -21,11 +21,11 @@ module AbstractController
           options[:per_key] = {:if => only}
         end
         if except = options[:except]
-          except = Array(except).map {|e| "action_name == :#{e}"}.join(" || ")
+          except = Array(except).map {|e| "action_name == :#{e}"}.join(" || ")          
           options[:per_key] = {:unless => except}
         end
       end
-
+      
       [:before, :after, :around].each do |filter|
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def #{filter}_filter(*names, &blk)
@@ -40,4 +40,4 @@ module AbstractController
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/exceptions.rb b/actionpack/lib/action_controller/abstract/exceptions.rb
index a7d07868bb..ec4680629b 100644
--- a/actionpack/lib/action_controller/abstract/exceptions.rb
+++ b/actionpack/lib/action_controller/abstract/exceptions.rb
@@ -1,3 +1,3 @@
 module AbstractController
   class ActionNotFound < StandardError ; end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 38e3ce8127..62caa119e7 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -8,14 +8,14 @@ module AbstractController
       extlib_inheritable_accessor :master_helper_module
       self.master_helper_module = Module.new
     end
-
+  
     # def self.included(klass)
     #   klass.class_eval do
     #     extlib_inheritable_accessor :master_helper_module
     #     self.master_helper_module = Module.new
     #   end
     # end
-
+    
     def _action_view
       @_action_view ||= begin
         av = super
@@ -23,19 +23,19 @@ module AbstractController
         av
       end
     end
-
+    
     module ClassMethods
       def inherited(klass)
         klass.master_helper_module = Module.new
         klass.master_helper_module.__send__ :include, master_helper_module
-
+        
         super
       end
-
+      
       def add_template_helper(mod)
         master_helper_module.module_eval { include mod }
       end
-
+      
       def helper_method(*meths)
         meths.flatten.each do |meth|
           master_helper_module.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
@@ -45,7 +45,7 @@ module AbstractController
           ruby_eval
         end
       end
-
+      
       def helper(*args, &blk)
         args.flatten.each do |arg|
           case arg
@@ -56,5 +56,6 @@ module AbstractController
         master_helper_module.module_eval(&blk) if block_given?
       end
     end
+    
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index 69fe4efc19..76130f8dc0 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -9,18 +9,18 @@ module AbstractController
         unless [String, Symbol, FalseClass, NilClass].include?(layout.class)
           raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
         end
-
+        
         @_layout = layout || false # Converts nil to false
         _write_layout_method
       end
-
+      
       def _implied_layout_name
         name.underscore
       end
-
+      
       # Takes the specified layout and creates a _layout method to be called
       # by _default_layout
-      #
+      # 
       # If the specified layout is a:
       # String:: return the string
       # Symbol:: call the method specified by the symbol
@@ -49,34 +49,35 @@ module AbstractController
         end
       end
     end
-
+    
     def _render_template(template, options)
       _action_view._render_template_with_layout(template, options[:_layout])
     end
-
+        
   private
+  
     def _layout() end # This will be overwritten
-
+    
     def _layout_for_name(name)
       unless [String, FalseClass, NilClass].include?(name.class)
         raise ArgumentError, "String, false, or nil expected; you passed #{name.inspect}"
       end
-
+      
       name && view_paths.find_by_parts(name, {:formats => formats}, "layouts")
     end
-
+    
     def _default_layout(require_layout = false)
       if require_layout && !_layout
-        raise ArgumentError,
+        raise ArgumentError, 
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
-
+        
       begin
         layout = _layout_for_name(_layout)
       rescue NameError => e
-        raise NoMethodError,
+        raise NoMethodError, 
           "You specified #{@_layout.inspect} as the layout, but no such method was found"
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb
index c3bccd7778..5fb78f1755 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/action_controller/abstract/logger.rb
@@ -6,4 +6,4 @@ module AbstractController
       cattr_accessor :logger
     end
   end
-end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index b5c31a27ee..beb848f90e 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -15,22 +15,22 @@ module AbstractController
     end
 
     def _action_view
-      @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self)
+      @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self)      
     end
-
+        
     def render(options = {})
       self.response_body = render_to_body(options)
     end
-
+    
     # Raw rendering of a template to a Rack-compatible body.
     # ====
     # @option _prefix<String> The template's path prefix
     # @option _layout<String> The relative path to the layout template to use
-    #
+    # 
     # :api: plugin
     def render_to_body(options = {})
       name = options[:_template_name] || action_name
-
+      
       template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
       _render_template(template, options)
     end
@@ -39,7 +39,7 @@ module AbstractController
     # ====
     # @option _prefix<String> The template's path prefix
     # @option _layout<String> The relative path to the layout template to use
-    #
+    # 
     # :api: plugin
     def render_to_string(options = {})
       AbstractController::Renderer.body_to_s(render_to_body(options))
@@ -48,7 +48,7 @@ module AbstractController
     def _render_template(template, options)
       _action_view._render_template_with_layout(template)
     end
-
+    
     def view_paths() _view_paths end
 
     # Return a string representation of a Rack-compatible response body.
@@ -64,14 +64,15 @@ module AbstractController
     end
 
     module ClassMethods
+      
       def append_view_path(path)
         self.view_paths << path
       end
-
+      
       def view_paths
         self._view_paths
       end
-
+      
       def view_paths=(paths)
         self._view_paths = paths.is_a?(ActionView::PathSet) ?
                             paths : ActionView::Base.process_view_paths(paths)
-- 
cgit v1.2.3