diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
commit | 4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 (patch) | |
tree | 6bfb95c899c61b10406a03f8e9a6211b93fecd6b /actionpack/lib/action_controller/new_base | |
parent | de203245afd2bbf7f93f3241fcf3a71a88101d47 (diff) | |
download | rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.gz rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.bz2 rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.zip |
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.
Diffstat (limited to 'actionpack/lib/action_controller/new_base')
12 files changed, 27 insertions, 31 deletions
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 |