Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4312 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 4 insertions, 8 deletions

diff --git a/actionwebservice/lib/action_web_service/container/action_controller_container.rb b/actionwebservice/lib/action_web_service/container/action_controller_container.rb
index e96ee0692d..bbc28083c3 100644
--- a/actionwebservice/lib/action_web_service/container/action_controller_container.rb
+++ b/actionwebservice/lib/action_web_service/container/action_controller_container.rb
@@ -4,10 +4,8 @@ module ActionWebService # :nodoc:
       def self.included(base) # :nodoc:
         class << base
           include ClassMethods
-          alias_method :inherited_without_api, :inherited
-          alias_method :inherited, :inherited_with_api
-          alias_method :web_service_api_without_require, :web_service_api
-          alias_method :web_service_api, :web_service_api_with_require
+          alias_method_chain :inherited, :api
+          alias_method_chain :web_service_api, :require
         end
       end
 
diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
index f1fd6137f5..a338aedbc1 100644
--- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -7,8 +7,7 @@ module ActionWebService # :nodoc:
       def self.included(base) # :nodoc:
         class << base
           include ClassMethods
-          alias_method :inherited_without_action_controller, :inherited
-          alias_method :inherited, :inherited_with_action_controller
+          alias_method_chain :inherited, :action_controller
         end
         base.class_eval do
           alias_method :web_service_direct_invoke_without_controller, :web_service_direct_invoke
diff --git a/actionwebservice/lib/action_web_service/invocation.rb b/actionwebservice/lib/action_web_service/invocation.rb
index c37e923fc7..2a9121ee26 100644
--- a/actionwebservice/lib/action_web_service/invocation.rb
+++ b/actionwebservice/lib/action_web_service/invocation.rb
@@ -126,8 +126,7 @@ module ActionWebService # :nodoc:
     module InstanceMethods # :nodoc:
       def self.included(base)
         base.class_eval do
-          alias_method :perform_invocation_without_interception, :perform_invocation
-          alias_method :perform_invocation, :perform_invocation_with_interception
+          alias_method_chain :perform_invocation, :interception
         end
       end