From 07f237bdae9051cfc5bd38d7608f7a63de54e01b Mon Sep 17 00:00:00 2001 From: Leon Breedt Date: Sat, 25 Jun 2005 18:06:52 +0000 Subject: clean up cases where we override #inherited git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../container/action_controller_container.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'actionwebservice/lib/action_web_service/container/action_controller_container.rb') 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 06b47e9d79..d5afff09bb 100644 --- a/actionwebservice/lib/action_web_service/container/action_controller_container.rb +++ b/actionwebservice/lib/action_web_service/container/action_controller_container.rb @@ -2,13 +2,13 @@ module ActionWebService # :nodoc: module Container # :nodoc: module ActionController # :nodoc: def self.append_features(base) # :nodoc: - base.class_eval do - class << self - alias_method :inherited_without_api, :inherited - alias_method :web_service_api_without_require, :web_service_api - end + 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 end - base.extend(ClassMethods) end module ClassMethods @@ -43,7 +43,7 @@ module ActionWebService # :nodoc: end end - def web_service_api(definition=nil) # :nodoc: + def web_service_api_with_require(definition=nil) # :nodoc: return web_service_api_without_require if definition.nil? case definition when String, Symbol @@ -82,7 +82,7 @@ module ActionWebService # :nodoc: end private - def inherited(child) + def inherited_with_api(child) inherited_without_api(child) begin child.web_service_api(child.controller_path) rescue MissingSourceFile => e -- cgit v1.2.3