diff options
Diffstat (limited to 'actionservice/lib/action_service/protocol')
| -rw-r--r-- | actionservice/lib/action_service/protocol/abstract.rb | 6 | ||||
| -rw-r--r-- | actionservice/lib/action_service/protocol/soap.rb | 28 | ||||
| -rw-r--r-- | actionservice/lib/action_service/protocol/xmlrpc.rb | 6 |
3 files changed, 18 insertions, 22 deletions
diff --git a/actionservice/lib/action_service/protocol/abstract.rb b/actionservice/lib/action_service/protocol/abstract.rb index ed41c49951..bd02b6e829 100644 --- a/actionservice/lib/action_service/protocol/abstract.rb +++ b/actionservice/lib/action_service/protocol/abstract.rb @@ -89,15 +89,15 @@ module ActionService # :nodoc: attr :protocol attr :raw_body - attr_accessor :service_name + attr_accessor :web_service_name attr_accessor :public_method_name attr_accessor :content_type - def initialize(protocol, raw_body, service_name, public_method_name, content_type, options={}) + def initialize(protocol, raw_body, web_service_name, public_method_name, content_type, options={}) super(options) @protocol = protocol @raw_body = raw_body - @service_name = service_name + @web_service_name = web_service_name @public_method_name = public_method_name @content_type = content_type end diff --git a/actionservice/lib/action_service/protocol/soap.rb b/actionservice/lib/action_service/protocol/soap.rb index 24cc554b05..993e174e52 100644 --- a/actionservice/lib/action_service/protocol/soap.rb +++ b/actionservice/lib/action_service/protocol/soap.rb @@ -297,34 +297,34 @@ module ActionService # :nodoc: alias :map :lookup def map_container_services(container, &block) - dispatching_mode = container.service_dispatching_mode - services = nil + dispatching_mode = container.web_service_dispatching_mode + web_services = nil case dispatching_mode when :direct - api = container.class.service_api + api = container.class.web_service_api if container.respond_to?(:controller_class_name) - service_name = container.controller_class_name.sub(/Controller$/, '').underscore + web_service_name = container.controller_class_name.sub(/Controller$/, '').underscore else - service_name = container.class.name.demodulize.underscore + web_service_name = container.class.name.demodulize.underscore end - services = { service_name => api } + web_services = { web_service_name => api } when :delegated - services = {} - container.class.services.each do |service_name, service_info| + web_services = {} + container.class.web_services.each do |web_service_name, web_service_info| begin - object = container.service_object(service_name) + object = container.web_service_object(web_service_name) rescue Exception => e - raise(ProtocolError, "failed to retrieve service object for mapping: #{e.message}") + raise(ProtocolError, "failed to retrieve web service object for web service '#{web_service_name}': #{e.message}") end - services[service_name] = object.class.service_api + web_services[web_service_name] = object.class.web_service_api end end - services.each do |service_name, api| + web_services.each do |web_service_name, api| if api.nil? - raise(ProtocolError, "no service API set while in :#{dispatching_mode} mode") + raise(ProtocolError, "no web service API set while in :#{dispatching_mode} mode") end map_api(api) do |api_methods| - yield service_name, api, api_methods if block_given? + yield web_service_name, api, api_methods if block_given? end end end diff --git a/actionservice/lib/action_service/protocol/xmlrpc.rb b/actionservice/lib/action_service/protocol/xmlrpc.rb index 7d29868b59..32b8e00327 100644 --- a/actionservice/lib/action_service/protocol/xmlrpc.rb +++ b/actionservice/lib/action_service/protocol/xmlrpc.rb @@ -28,9 +28,6 @@ module ActionService # :nodoc: end class XmlRpcProtocol < AbstractProtocol # :nodoc: - - public - def self.create_protocol_request(container_class, action_pack_request) helper = XMLRPC::XmlRpcHelper.instance service_name = action_pack_request.parameters['action'] @@ -160,7 +157,7 @@ module ActionService # :nodoc: case name when 'system.listMethods' methods = [] - api = service_class.service_api + api = service_class.web_service_api api.api_methods.each do |name, info| methods << api.public_api_method_name(name) end @@ -181,7 +178,6 @@ module ActionService # :nodoc: end end end - end end end |