Skip to content

Commit

Permalink
Merge pull request #17 from grosser/grosser/cleanup
Browse files Browse the repository at this point in the history 
Grosser/cleanup
  • Loading branch information
@tjarratt
tjarratt committed Dec 27, 2013
2 parents 375e8b1 + 09981ab commit 52aba47
Show file tree
Hide file tree
Showing 5 changed files with 268 additions and 295 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
soap2r (1.5.8)
soap2r (1.5.9)
httpclient (>= 2.1.1)

GEM
Expand All @@ -17,4 +17,4 @@ PLATFORMS
DEPENDENCIES
bump
rake
soap5r!
soap2r!
324 changes: 160 additions & 164 deletions lib/soap/rpc/driver.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,204 +18,200 @@


module SOAP
module RPC


class Driver
include AttrProxy

attr_proxy :endpoint_url, true
attr_proxy :mapping_registry, true
attr_proxy :literal_mapping_registry, true
attr_proxy :allow_unqualified_element, true
attr_proxy :default_encodingstyle, true
attr_proxy :generate_explicit_type, true
attr_proxy :use_default_namespace, true
attr_proxy :return_response_as_xml, true
attr_proxy :headerhandler
attr_proxy :filterchain
attr_proxy :streamhandler
attr_proxy :test_loopback_response
attr_proxy :reset_stream

attr_reader :proxy
attr_reader :options
attr_accessor :soapaction

def inspect
"#<#{self.class}:#{@proxy.inspect}>"
end
module RPC
class Driver
include AttrProxy

attr_proxy :endpoint_url, true
attr_proxy :mapping_registry, true
attr_proxy :literal_mapping_registry, true
attr_proxy :allow_unqualified_element, true
attr_proxy :default_encodingstyle, true
attr_proxy :generate_explicit_type, true
attr_proxy :use_default_namespace, true
attr_proxy :return_response_as_xml, true
attr_proxy :headerhandler
attr_proxy :filterchain
attr_proxy :streamhandler
attr_proxy :test_loopback_response
attr_proxy :reset_stream

attr_reader :proxy
attr_reader :options
attr_accessor :soapaction

def inspect
"#<#{self.class}:#{@proxy.inspect}>"
end

def httpproxy
options["protocol.http.proxy"]
end
def httpproxy
options["protocol.http.proxy"]
end

def httpproxy=(httpproxy)
options["protocol.http.proxy"] = httpproxy
end
def httpproxy=(httpproxy)
options["protocol.http.proxy"] = httpproxy
end

def wiredump_dev
options["protocol.http.wiredump_dev"]
end
def wiredump_dev
options["protocol.http.wiredump_dev"]
end

def wiredump_dev=(wiredump_dev)
options["protocol.http.wiredump_dev"] = wiredump_dev
end
def wiredump_dev=(wiredump_dev)
options["protocol.http.wiredump_dev"] = wiredump_dev
end

def mandatorycharset
options["protocol.mandatorycharset"]
end
def mandatorycharset
options["protocol.mandatorycharset"]
end

def mandatorycharset=(mandatorycharset)
options["protocol.mandatorycharset"] = mandatorycharset
end
def mandatorycharset=(mandatorycharset)
options["protocol.mandatorycharset"] = mandatorycharset
end

def wiredump_file_base
options["protocol.wiredump_file_base"]
end
def wiredump_file_base
options["protocol.wiredump_file_base"]
end

def wiredump_file_base=(wiredump_file_base)
options["protocol.wiredump_file_base"] = wiredump_file_base
end
def wiredump_file_base=(wiredump_file_base)
options["protocol.wiredump_file_base"] = wiredump_file_base
end

def initialize(endpoint_url, namespace = nil, soapaction = nil)
@namespace = namespace
@soapaction = soapaction
@options = setup_options
@wiredump_file_base = nil
@proxy = Proxy.new(endpoint_url, @soapaction, @options)
end
def initialize(endpoint_url, namespace = nil, soapaction = nil)
@namespace = namespace
@soapaction = soapaction
@options = setup_options
@wiredump_file_base = nil
@proxy = Proxy.new(endpoint_url, @soapaction, @options)
end

def loadproperty(propertyname)
unless options.loadproperty(propertyname)
raise LoadError.new("No such property to load -- #{propertyname}")
end
end
def loadproperty(propertyname)
unless options.loadproperty(propertyname)
raise LoadError.new("No such property to load -- #{propertyname}")
end
end

def add_rpc_method(name, *params)
add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
end
def add_rpc_method(name, *params)
add_rpc_method_with_soapaction_as(name, name, @soapaction, *params)
end

def add_rpc_method_as(name, name_as, *params)
add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
end
def add_rpc_method_as(name, name_as, *params)
add_rpc_method_with_soapaction_as(name, name_as, @soapaction, *params)
end

def add_rpc_method_with_soapaction(name, soapaction, *params)
add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
end
def add_rpc_method_with_soapaction(name, soapaction, *params)
add_rpc_method_with_soapaction_as(name, name, soapaction, *params)
end

def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
param_def = SOAPMethod.create_rpc_param_def(params)
qname = XSD::QName.new(@namespace, name_as)
@proxy.add_rpc_method(qname, soapaction, name, param_def)
add_rpc_method_interface(name, param_def)
end
def add_rpc_method_with_soapaction_as(name, name_as, soapaction, *params)
param_def = SOAPMethod.create_rpc_param_def(params)
qname = XSD::QName.new(@namespace, name_as)
@proxy.add_rpc_method(qname, soapaction, name, param_def)
add_rpc_method_interface(name, param_def)
end

# add_method is for shortcut of typical rpc/encoded method definition.
alias add_method add_rpc_method
alias add_method_as add_rpc_method_as
alias add_method_with_soapaction add_rpc_method_with_soapaction
alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as
# add_method is for shortcut of typical rpc/encoded method definition.
alias add_method add_rpc_method
alias add_method_as add_rpc_method_as
alias add_method_with_soapaction add_rpc_method_with_soapaction
alias add_method_with_soapaction_as add_rpc_method_with_soapaction_as

def add_document_method(name, soapaction, req_qname, res_qname)
param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
@proxy.add_document_method(soapaction, name, param_def)
add_document_method_interface(name, param_def)
end
def add_document_method(name, soapaction, req_qname, res_qname)
param_def = SOAPMethod.create_doc_param_def(req_qname, res_qname)
@proxy.add_document_method(soapaction, name, param_def)
add_document_method_interface(name, param_def)
end

def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
@proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
add_rpc_method_interface(name, param_def)
end
def add_rpc_operation(qname, soapaction, name, param_def, opt = {})
@proxy.add_rpc_operation(qname, soapaction, name, param_def, opt)
add_rpc_method_interface(name, param_def)
end

def add_document_operation(soapaction, name, param_def, opt = {})
@proxy.add_document_operation(soapaction, name, param_def, opt)
add_document_method_interface(name, param_def)
end
def add_document_operation(soapaction, name, param_def, opt = {})
@proxy.add_document_operation(soapaction, name, param_def, opt)
add_document_method_interface(name, param_def)
end

def invoke(headers, body)
if headers and !headers.is_a?(SOAPHeader)
headers = create_header(headers)
end
set_wiredump_file_base(body.elename.name)
env = @proxy.invoke(headers, body)
if env.nil?
return nil, nil
else
return env.header, env.body
end
end
def invoke(headers, body)
if headers and !headers.is_a?(SOAPHeader)
headers = create_header(headers)
end
set_wiredump_file_base(body.elename.name)
env = @proxy.invoke(headers, body)
if env.nil?
return nil, nil
else
return env.header, env.body
end
end

def call(name, *params)
set_wiredump_file_base(name)
@proxy.call(name, *params)
end
def call(name, *params)
set_wiredump_file_base(name)
@proxy.call(name, *params)
end

private
private

def attrproxy
@proxy
end
def attrproxy
@proxy
end

def set_wiredump_file_base(name)
if @wiredump_file_base
@proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
end
end
def set_wiredump_file_base(name)
if @wiredump_file_base
@proxy.set_wiredump_file_base("#{@wiredump_file_base}_#{name}")
end
end

def create_header(headers)
header = SOAPHeader.new()
headers.each do |content, mustunderstand, encodingstyle|
header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
end
header
end
def create_header(headers)
header = SOAPHeader.new()
headers.each do |content, mustunderstand, encodingstyle|
header.add(SOAPHeaderItem.new(content, mustunderstand, encodingstyle))
end
header
end

def setup_options
if opt = Property.loadproperty(::SOAP::PropertyName)
opt = opt["client"]
end
opt ||= Property.new
opt.add_hook("protocol.mandatorycharset") do |key, value|
@proxy.mandatorycharset = value
end
opt.add_hook("protocol.wiredump_file_base") do |key, value|
@wiredump_file_base = value
end
opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
opt
end
def setup_options
if opt = Property.loadproperty(::SOAP::PropertyName)
opt = opt["client"]
end
opt ||= Property.new
opt.add_hook("protocol.mandatorycharset") do |key, value|
@proxy.mandatorycharset = value
end
opt.add_hook("protocol.wiredump_file_base") do |key, value|
@wiredump_file_base = value
end
opt["protocol.http.charset"] ||= XSD::Charset.xml_encoding_label
opt["protocol.http.proxy"] ||= Env::HTTP_PROXY
opt["protocol.http.no_proxy"] ||= Env::NO_PROXY
opt
end

def add_rpc_method_interface(name, param_def)
param_count = RPC::SOAPMethod.param_count(param_def,
RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
add_method_interface(name, param_count)
end
def add_rpc_method_interface(name, param_def)
param_count = RPC::SOAPMethod.param_count(param_def,
RPC::SOAPMethod::IN, RPC::SOAPMethod::INOUT)
add_method_interface(name, param_count)
end

def add_document_method_interface(name, param_def)
param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
add_method_interface(name, param_count)
end
def add_document_method_interface(name, param_def)
param_count = RPC::SOAPMethod.param_count(param_def, RPC::SOAPMethod::IN)
add_method_interface(name, param_count)
end

# Mapping.define_singleton_method calls define_method with proc and it
# exhausts much memory for each singleton Object. just instance_eval instead
# of it.
def add_method_interface(name, param_count)
instance_eval <<-EOS
# Mapping.define_singleton_method calls define_method with proc and it
# exhausts much memory for each singleton Object. just instance_eval instead
# of it.
def add_method_interface(name, param_count)
instance_eval <<-EOS
def #{name}(*arg)
unless arg.size == #{param_count}
raise ArgumentError.new(
"wrong number of arguments (\#{arg.size} for #{param_count})")
end
call(#{name.dump}, *arg)
end
EOS
self.method(name)
EOS
self.method(name)
end
end
end
end


end
end
Loading

0 comments on commit 52aba47

Please sign in to comment.