From de203245afd2bbf7f93f3241fcf3a71a88101d47 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 28 May 2009 09:49:02 -0500
Subject: Revert "Revert "Whitespace!""

This reverts commit 0cac68d3bed3e6bf8ec2eb994858e4a179046941.
---
 actionpack/lib/action_controller/abstract/helpers.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract/helpers.rb')

diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 41decfd0c7..7b1b197e1d 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -16,12 +16,12 @@ 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
 
@@ -57,7 +57,7 @@ module AbstractController
           ruby_eval
         end
       end
-      
+
       def helper(*args, &block)
         args.flatten.each do |arg|
           case arg
@@ -68,6 +68,5 @@ module AbstractController
         master_helper_module.module_eval(&block) if block_given?
       end
     end
-    
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 28 May 2009 11:35:36 -0500
Subject: Break up DependencyModule's dual function of providing a "depend_on"
 DSL and "included" block DSL into separate modules. But, unify both
 approaches under AS::Concern.

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

(limited to 'actionpack/lib/action_controller/abstract/helpers.rb')

diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 7b1b197e1d..43832f1e2d 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -1,6 +1,6 @@
 module AbstractController
   module Helpers
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on Renderer
 
-- 
cgit v1.2.3


From 669fd84910586d4c791b6f5bf4320f68ac7845aa Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 29 May 2009 17:03:23 -0500
Subject: AS::Concern redefines "include" to lazy include modules as
 dependencies

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

(limited to 'actionpack/lib/action_controller/abstract/helpers.rb')

diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 43832f1e2d..0a2776de9c 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Helpers
     extend ActiveSupport::Concern
 
-    depends_on Renderer
+    include Renderer
 
     included do
       extlib_inheritable_accessor :master_helper_module
-- 
cgit v1.2.3