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.

27 files changed, 42 insertions, 46 deletions

diff --git a/actionpack/lib/action_controller/abstract/benchmarker.rb b/actionpack/lib/action_controller/abstract/benchmarker.rb
index 9be06f48fb..6999329144 100644
--- a/actionpack/lib/action_controller/abstract/benchmarker.rb
+++ b/actionpack/lib/action_controller/abstract/benchmarker.rb
@@ -1,6 +1,6 @@
 module AbstractController
   module Benchmarker
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on Logger
 
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index 4314235ba9..6c67315c58 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -1,6 +1,6 @@
 module AbstractController
   module Callbacks
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on ActiveSupport::NewCallbacks
 
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
 
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index dd38485271..b3f21f7b22 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -1,6 +1,6 @@
 module AbstractController
   module Layouts
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on Renderer
 
diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb
index ce73888763..d6fa843485 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/action_controller/abstract/logger.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/logger'
 
 module AbstractController
   module Logger
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     class DelayedLog
       def initialize(&blk)
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 374ceb5b74..cd3e87d861 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -2,7 +2,7 @@ require "action_controller/abstract/logger"
 
 module AbstractController
   module Renderer
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on AbstractController::Logger
 
diff --git a/actionpack/lib/action_controller/base/chained/flash.rb b/actionpack/lib/action_controller/base/chained/flash.rb
index 2d084ba1ab..04d27bf090 100644
--- a/actionpack/lib/action_controller/base/chained/flash.rb
+++ b/actionpack/lib/action_controller/base/chained/flash.rb
@@ -26,7 +26,7 @@ module ActionController #:nodoc:
   #
   # See docs on the FlashHash class for more details about the flash.
   module Flash
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     # TODO : Remove the defined? check when new base is the main base
     depends_on Session if defined?(ActionController::Http)
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
index f5a678ca03..9df286ee24 100644
--- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb
+++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
@@ -1,6 +1,6 @@
 module ActionController
   module FilterParameterLogging
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     # TODO : Remove the defined? check when new base is the main base
     if defined?(ActionController::Http)
diff --git a/actionpack/lib/action_controller/base/helpers.rb b/actionpack/lib/action_controller/base/helpers.rb
index 96fa7896a9..f74158bc13 100644
--- a/actionpack/lib/action_controller/base/helpers.rb
+++ b/actionpack/lib/action_controller/base/helpers.rb
@@ -3,7 +3,7 @@ require 'active_support/dependencies'
 # FIXME: helper { ... } is broken on Ruby 1.9
 module ActionController #:nodoc:
   module Helpers #:nodoc:
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     included do
       # Initialize the base module to aggregate its helpers.
diff --git a/actionpack/lib/action_controller/base/request_forgery_protection.rb b/actionpack/lib/action_controller/base/request_forgery_protection.rb
index 0a0e20e1f1..368c6e9de8 100644
--- a/actionpack/lib/action_controller/base/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/base/request_forgery_protection.rb
@@ -3,7 +3,7 @@ module ActionController #:nodoc:
   end
 
   module RequestForgeryProtection
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     # TODO : Remove the defined? check when new base is the main base
     if defined?(ActionController::Http)
diff --git a/actionpack/lib/action_controller/base/streaming.rb b/actionpack/lib/action_controller/base/streaming.rb
index 5872ba99a2..5f56c95483 100644
--- a/actionpack/lib/action_controller/base/streaming.rb
+++ b/actionpack/lib/action_controller/base/streaming.rb
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
   # Methods for sending arbitrary data and for streaming files to the browser,
   # instead of rendering.
   module Streaming
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     # TODO : Remove the defined? check when new base is the main base
     if defined?(ActionController::Http)
diff --git a/actionpack/lib/action_controller/base/verification.rb b/actionpack/lib/action_controller/base/verification.rb
index 3fa5a105b1..31654e36f3 100644
--- a/actionpack/lib/action_controller/base/verification.rb
+++ b/actionpack/lib/action_controller/base/verification.rb
@@ -1,6 +1,6 @@
 module ActionController #:nodoc:
   module Verification #:nodoc:
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     # TODO : Remove the defined? check when new base is the main base
     if defined?(ActionController::Http)
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 2f2eec10f6..38cf1da6a8 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -24,7 +24,7 @@ module ActionController #:nodoc:
   #   ActionController::Base.cache_store = :mem_cache_store, "localhost"
   #   ActionController::Base.cache_store = MyOwnStore.new("parameter")
   module Caching
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     autoload :Actions, 'action_controller/caching/actions'
     autoload :Fragments, 'action_controller/caching/fragments'
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index 1d0cb601e3..f278c2da14 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Rails2Compatibility
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     class ::ActionController::ActionControllerError < StandardError #:nodoc:
     end
diff --git a/actionpack/lib/action_controller/new_base/conditional_get.rb b/actionpack/lib/action_controller/new_base/conditional_get.rb
index 38f3d3cf68..8bd6db500b 100644
--- a/actionpack/lib/action_controller/new_base/conditional_get.rb
+++ b/actionpack/lib/action_controller/new_base/conditional_get.rb
@@ -1,6 +1,6 @@
 module ActionController
   module ConditionalGet
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on RackConvenience
 
diff --git a/actionpack/lib/action_controller/new_base/helpers.rb b/actionpack/lib/action_controller/new_base/helpers.rb
index 1dece13114..c2ebd343e3 100644
--- a/actionpack/lib/action_controller/new_base/helpers.rb
+++ b/actionpack/lib/action_controller/new_base/helpers.rb
@@ -4,7 +4,7 @@ require 'active_support/dependencies'
 
 module ActionController
   module Helpers
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on AbstractController::Helpers
 
diff --git a/actionpack/lib/action_controller/new_base/hide_actions.rb b/actionpack/lib/action_controller/new_base/hide_actions.rb
index 10b8b582f5..b45e520bee 100644
--- a/actionpack/lib/action_controller/new_base/hide_actions.rb
+++ b/actionpack/lib/action_controller/new_base/hide_actions.rb
@@ -1,6 +1,6 @@
 module ActionController
   module HideActions
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     included do
       extlib_inheritable_accessor :hidden_actions
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb
index 9b4057caaa..727358c394 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/actionpack/lib/action_controller/new_base/layouts.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Layouts
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on ActionController::Renderer
     depends_on AbstractController::Layouts
diff --git a/actionpack/lib/action_controller/new_base/rack_convenience.rb b/actionpack/lib/action_controller/new_base/rack_convenience.rb
index e465acca6e..5dfa7d12f3 100644
--- a/actionpack/lib/action_controller/new_base/rack_convenience.rb
+++ b/actionpack/lib/action_controller/new_base/rack_convenience.rb
@@ -1,6 +1,6 @@
 module ActionController
   module RackConvenience
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     included do
       delegate :headers, :status=, :location=,
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
index f12198a710..04b954134f 100644
--- a/actionpack/lib/action_controller/new_base/render_options.rb
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -1,6 +1,6 @@
 module ActionController
   module RenderOptions
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     included do
       extlib_inheritable_accessor :_renderers
@@ -36,14 +36,12 @@ module ActionController
     end
   end
 
-  module RenderOption
-    extend ActiveSupport::DependencyModule
+  module RenderOption #:nodoc:
+    def self.extended(base)
+      base.extend ActiveSupport::Concern
+      base.depends_on ::ActionController::RenderOptions
 
-    included do
-      extend ActiveSupport::DependencyModule
-      depends_on ::ActionController::RenderOptions
-
-      def self.register_renderer(name)
+      def base.register_renderer(name)
         included { _add_render_option(name) }
       end
     end
@@ -51,7 +49,7 @@ module ActionController
 
   module Renderers
     module Json
-      include RenderOption
+      extend RenderOption
       register_renderer :json
 
       def _render_json(json, options)
@@ -63,7 +61,7 @@ module ActionController
     end
 
     module Js
-      include RenderOption
+      extend RenderOption
       register_renderer :js
 
       def _render_js(js, options)
@@ -73,7 +71,7 @@ module ActionController
     end
 
     module Xml
-      include RenderOption
+      extend RenderOption
       register_renderer :xml
 
       def _render_xml(xml, options)
@@ -82,8 +80,8 @@ module ActionController
       end
     end
 
-    module Rjs
-      include RenderOption
+    module RJS
+      extend RenderOption
       register_renderer :update
 
       def _render_update(proc, options)
@@ -94,14 +92,12 @@ module ActionController
     end
 
     module All
-      extend ActiveSupport::DependencyModule
+      extend ActiveSupport::Concern
 
-      included do
-        include ::ActionController::Renderers::Json
-        include ::ActionController::Renderers::Js
-        include ::ActionController::Renderers::Xml
-        include ::ActionController::Renderers::Rjs
-      end
+      depends_on ActionController::Renderers::Json
+      depends_on ActionController::Renderers::Js
+      depends_on ActionController::Renderers::Xml
+      depends_on ActionController::Renderers::RJS
     end
   end
 end
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 737a0d6fcf..e132d4fdbb 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Renderer
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on AbstractController::Renderer
 
diff --git a/actionpack/lib/action_controller/new_base/rescuable.rb b/actionpack/lib/action_controller/new_base/rescuable.rb
index 4450a1131a..029e643d93 100644
--- a/actionpack/lib/action_controller/new_base/rescuable.rb
+++ b/actionpack/lib/action_controller/new_base/rescuable.rb
@@ -15,7 +15,7 @@ module ActionController #:nodoc:
   # behavior is achieved by overriding the <tt>rescue_action_in_public</tt>
   # and <tt>rescue_action_locally</tt> methods.
   module Rescue
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     included do
       include ActiveSupport::Rescuable
diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/new_base/session.rb
index 9ee3e9e136..a585630230 100644
--- a/actionpack/lib/action_controller/new_base/session.rb
+++ b/actionpack/lib/action_controller/new_base/session.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Session
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on RackConvenience
 
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb
index 97aadfe78f..e8d210d149 100644
--- a/actionpack/lib/action_controller/new_base/testing.rb
+++ b/actionpack/lib/action_controller/new_base/testing.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Testing
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on RackConvenience
 
diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/new_base/url_for.rb
index 87bc689134..902cac4d15 100644
--- a/actionpack/lib/action_controller/new_base/url_for.rb
+++ b/actionpack/lib/action_controller/new_base/url_for.rb
@@ -1,6 +1,6 @@
 module ActionController
   module UrlFor
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     depends_on RackConvenience
 
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index cc157816e2..af4ccb7837 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -301,7 +301,7 @@ module ActionController
     # A module used to extend ActionController::Base, so that integration tests
     # can capture the controller used to satisfy a request.
     module ControllerCapture #:nodoc:
-      extend ActiveSupport::DependencyModule
+      extend ActiveSupport::Concern
 
       included do
         alias_method_chain :initialize, :capture
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index f2429e8cef..eacf117bea 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -171,7 +171,7 @@ module ActionView
   #   <% end %>
   module Partials
     extend ActiveSupport::Memoizable
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
     
     included do
       attr_accessor :_partial