diff options
Diffstat (limited to 'actionwebservice/lib')
7 files changed, 8 insertions, 15 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 diff --git a/actionwebservice/lib/action_web_service/dispatcher/abstract.rb b/actionwebservice/lib/action_web_service/dispatcher/abstract.rb index cf3af538ab..96016ef67e 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/abstract.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/abstract.rb @@ -5,8 +5,7 @@ module ActionWebService # :nodoc: class DispatcherError < ActionWebService::ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: base.class_inheritable_option(:web_service_dispatching_mode, :direct) base.class_inheritable_option(:web_service_exception_reporting, true) base.send(:include, ActionWebService::Dispatcher::InstanceMethods) 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 8f04ed292c..f1fd6137f5 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb @@ -4,8 +4,7 @@ require 'builder/xmlmarkup' module ActionWebService # :nodoc: module Dispatcher # :nodoc: module ActionController # :nodoc: - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: class << base include ClassMethods alias_method :inherited_without_action_controller, :inherited diff --git a/actionwebservice/lib/action_web_service/invocation.rb b/actionwebservice/lib/action_web_service/invocation.rb index 62f38b8ecd..c37e923fc7 100644 --- a/actionwebservice/lib/action_web_service/invocation.rb +++ b/actionwebservice/lib/action_web_service/invocation.rb @@ -3,8 +3,7 @@ module ActionWebService # :nodoc: class InvocationError < ActionWebService::ActionWebServiceError # :nodoc: end - def self.append_features(base) # :nodoc: - super + def self.included(base) # :nodoc: base.extend(ClassMethods) base.send(:include, ActionWebService::Invocation::InstanceMethods) end @@ -125,8 +124,7 @@ module ActionWebService # :nodoc: end module InstanceMethods # :nodoc: - def self.append_features(base) - super + def self.included(base) base.class_eval do alias_method :perform_invocation_without_interception, :perform_invocation alias_method :perform_invocation, :perform_invocation_with_interception diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb index e0e00d831b..8f15032c3a 100644 --- a/actionwebservice/lib/action_web_service/scaffolding.rb +++ b/actionwebservice/lib/action_web_service/scaffolding.rb @@ -6,8 +6,7 @@ module ActionWebService class ScaffoldingError < ActionWebServiceError # :nodoc: end - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end |