From 4b4e517bf1d51e749a6cedb2dd5203b19ab080e5 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 12 Dec 2009 18:48:34 -0600
Subject: Relocate AbstractController exceptions into their proper parent
 modules

---
 actionpack/lib/abstract_controller.rb | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'actionpack/lib/abstract_controller.rb')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 688a2fe31c..af3623e97e 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -11,11 +11,4 @@ module AbstractController
   autoload :LocalizedCache
   autoload :Logger
   autoload :RenderingController
-
-  # === Exceptions
-  autoload_at "abstract_controller/exceptions" do
-    autoload :ActionNotFound
-    autoload :DoubleRenderError
-    autoload :Error
-  end
 end
-- 
cgit v1.2.3


From 9cc99498178f1e71da8b54f985d0483ea377421d Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 12 Dec 2009 19:28:03 -0600
Subject: All AbstractController modules are deferrable

---
 actionpack/lib/abstract_controller.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib/abstract_controller.rb')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index af3623e97e..92d2971ec3 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -4,11 +4,13 @@ require "active_support/core_ext/module/delegation"
 module AbstractController
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Callbacks
-  autoload :Helpers
-  autoload :Layouts
-  autoload :LocalizedCache
-  autoload :Logger
-  autoload :RenderingController
+  deferrable do
+    autoload :Base
+    autoload :Callbacks
+    autoload :Helpers
+    autoload :Layouts
+    autoload :LocalizedCache
+    autoload :Logger
+    autoload :RenderingController
+  end
 end
-- 
cgit v1.2.3


From 7ee5843c3cedfe36a680d5b28aa31eef45296c50 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 16 Dec 2009 11:56:51 -0600
Subject: Fully expand relative rails framework paths and make sure we aren't
 adding any to the load path more than once.

---
 actionpack/lib/abstract_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/abstract_controller.rb')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 92d2971ec3..109a3a3385 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,5 +1,9 @@
-require "active_support/core_ext/module/attr_internal"
-require "active_support/core_ext/module/delegation"
+activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
+
+require 'active_support'
+require 'active_support/core_ext/module/attr_internal'
+require 'active_support/core_ext/module/delegation'
 
 module AbstractController
   extend ActiveSupport::Autoload
-- 
cgit v1.2.3


From 8b4735fbd9d5f6bd0c5d04688cc5edcd9b00ccf0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@Yehuda-Katz.local>
Date: Sun, 20 Dec 2009 14:06:40 -0800
Subject: Add active_support/ruby/shim to the default requirements for AP
 components

---
 actionpack/lib/abstract_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/abstract_controller.rb')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 109a3a3385..d13a56a859 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -1,7 +1,7 @@
 activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
 $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 
-require 'active_support'
+require 'active_support/ruby/shim'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/delegation'
 
-- 
cgit v1.2.3


From 83f4d86a9330533ec9af21ba18b4ab28011b8981 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 20 Dec 2009 17:15:31 -0800
Subject: Rename the RenderingController module to just plain Rendering

---
 actionpack/lib/abstract_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/abstract_controller.rb')

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index d13a56a859..c15a1da98a 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -15,6 +15,6 @@ module AbstractController
     autoload :Layouts
     autoload :LocalizedCache
     autoload :Logger
-    autoload :RenderingController
+    autoload :Rendering
   end
 end
-- 
cgit v1.2.3