diff options
author | Marcel Molina <marcel@vernix.org> | 2006-04-29 18:10:14 +0000 |
---|---|---|
committer | Marcel Molina <marcel@vernix.org> | 2006-04-29 18:10:14 +0000 |
commit | 61864909628f5ac2f20d3337e0274dab016ac7c5 (patch) | |
tree | 86a8cc11110b1009f23fe0c72a6138f8ac45d31a /actionwebservice/lib/action_web_service/container | |
parent | df26041c8990d4a0276e7a4c77cc771ac38e176e (diff) | |
download | rails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.gz rails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.bz2 rails-61864909628f5ac2f20d3337e0274dab016ac7c5.zip |
Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib/action_web_service/container')
3 files changed, 3 insertions, 5 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 b74b5ba6d4..e96ee0692d 100644 --- a/actionwebservice/lib/action_web_service/container/action_controller_container.rb +++ b/actionwebservice/lib/action_web_service/container/action_controller_container.rb @@ -1,7 +1,7 @@ module ActionWebService # :nodoc: module Container # :nodoc: module ActionController # :nodoc: - def self.append_features(base) # :nodoc: + def self.included(base) # :nodoc: class << base include ClassMethods alias_method :inherited_without_api, :inherited diff --git a/actionwebservice/lib/action_web_service/container/delegated_container.rb b/actionwebservice/lib/action_web_service/container/delegated_container.rb index 12a857e4e3..5477f8d103 100644 --- a/actionwebservice/lib/action_web_service/container/delegated_container.rb +++ b/actionwebservice/lib/action_web_service/container/delegated_container.rb @@ -4,8 +4,7 @@ module ActionWebService # :nodoc: class ContainerError < ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: base.extend(ClassMethods) base.send(:include, ActionWebService::Container::Delegated::InstanceMethods) end diff --git a/actionwebservice/lib/action_web_service/container/direct_container.rb b/actionwebservice/lib/action_web_service/container/direct_container.rb index b53c542fc8..8818d8f459 100644 --- a/actionwebservice/lib/action_web_service/container/direct_container.rb +++ b/actionwebservice/lib/action_web_service/container/direct_container.rb @@ -4,8 +4,7 @@ module ActionWebService # :nodoc: class ContainerError < ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: base.extend(ClassMethods) end |