summaryrefslogtreecommitdiff
path: root/lib/soap/encodingstyle
diff options
context:
space:
mode:
Diffstat (limited to 'lib/soap/encodingstyle')
-rw-r--r--lib/soap/encodingstyle/aspDotNetHandler.rb13
-rw-r--r--lib/soap/encodingstyle/literalHandler.rb35
-rw-r--r--lib/soap/encodingstyle/soapHandler.rb26
3 files changed, 40 insertions, 34 deletions
diff --git a/lib/soap/encodingstyle/aspDotNetHandler.rb b/lib/soap/encodingstyle/aspDotNetHandler.rb
index e976433a7b..e4b2028f89 100644
--- a/lib/soap/encodingstyle/aspDotNetHandler.rb
+++ b/lib/soap/encodingstyle/aspDotNetHandler.rb
@@ -1,5 +1,5 @@
# SOAP4R - ASP.NET EncodingStyle handler library
-# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
# redistribute it and/or modify it under the same terms of Ruby's license;
@@ -30,7 +30,7 @@ class ASPDotNetHandler < Handler
def encode_data(generator, ns, qualified, data, parent)
attrs = {}
name = if qualified and data.elename.namespace
- SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+ SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
ns.name(data.elename)
else
data.elename.name
@@ -61,8 +61,8 @@ class ASPDotNetHandler < Handler
yield(child, true)
end
else
- raise EncodingStyleError.new("Unknown object:#{ data } in this encodingSt
-yle.")
+ raise EncodingStyleError.new(
+ "unknown object:#{data} in this encodingStyle")
end
end
@@ -119,7 +119,6 @@ yle.")
end
def decode_tag(ns, elename, attrs, parent)
- # ToDo: check if @textbuf is empty...
@textbuf = ''
o = SOAPUnknown.new(self, elename)
o.parent = parent
@@ -190,11 +189,11 @@ yle.")
end
when SOAPBasetype
- raise EncodingStyleError.new("SOAP base type must not have a child.")
+ raise EncodingStyleError.new("SOAP base type must not have a child")
else
# SOAPUnknown does not have parent.
- # raise EncodingStyleError.new("Illegal parent: #{ parent }.")
+ # raise EncodingStyleError.new("illegal parent: #{parent}")
end
end
diff --git a/lib/soap/encodingstyle/literalHandler.rb b/lib/soap/encodingstyle/literalHandler.rb
index 5b702785e6..9a494f9295 100644
--- a/lib/soap/encodingstyle/literalHandler.rb
+++ b/lib/soap/encodingstyle/literalHandler.rb
@@ -1,5 +1,5 @@
# SOAP4R - XML Literal EncodingStyle handler library
-# Copyright (C) 2001, 2003, 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2001, 2003-2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
# redistribute it and/or modify it under the same terms of Ruby's license;
@@ -29,11 +29,22 @@ class LiteralHandler < Handler
def encode_data(generator, ns, qualified, data, parent)
attrs = {}
name = if qualified and data.elename.namespace
- SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
+ SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
ns.name(data.elename)
else
data.elename.name
end
+ data.extraattr.each do |k, v|
+ if k.is_a?(XSD::QName)
+ if k.namespace
+ SOAPGenerator.assign_ns(attrs, ns, k.namespace)
+ k = ns.name(k)
+ else
+ k = k.name
+ end
+ end
+ attrs[k] = v
+ end
case data
when SOAPRawString
@@ -62,13 +73,14 @@ class LiteralHandler < Handler
yield(child, true)
end
when SOAPElement
- generator.encode_tag(name, attrs.update(data.extraattr))
+ generator.encode_tag(name, attrs)
generator.encode_rawstring(data.text) if data.text
data.each do |key, value|
yield(value, qualified)
end
else
- raise EncodingStyleError.new("Unknown object:#{ data } in this encodingStyle.")
+ raise EncodingStyleError.new(
+ "unknown object:#{data} in this encodingStyle")
end
end
@@ -78,7 +90,8 @@ class LiteralHandler < Handler
else
data.elename.name
end
- cr = data.is_a?(SOAPElement) && !data.text
+ cr = (data.is_a?(SOAPCompoundtype) or
+ (data.is_a?(SOAPElement) and !data.text))
generator.encode_tag_end(name, cr)
end
@@ -128,7 +141,6 @@ class LiteralHandler < Handler
end
def decode_tag(ns, elename, attrs, parent)
- # ToDo: check if @textbuf is empty...
@textbuf = ''
o = SOAPUnknown.new(self, elename, decode_attrs(ns, attrs))
o.parent = parent
@@ -172,21 +184,19 @@ class LiteralHandler < Handler
end
def decode_parent(parent, node)
+ return unless parent.node
case parent.node
when SOAPUnknown
newparent = parent.node.as_element
node.parent = newparent
parent.replace_node(newparent)
decode_parent(parent, node)
-
when SOAPElement
parent.node.add(node)
node.parent = parent.node
-
when SOAPStruct
parent.node.add(node.elename.name, node)
node.parent = parent.node
-
when SOAPArray
if node.position
parent.node[*(decode_arypos(node.position))] = node
@@ -195,13 +205,8 @@ class LiteralHandler < Handler
parent.node.add(node)
end
node.parent = parent.node
-
- when SOAPBasetype
- raise EncodingStyleError.new("SOAP base type must not have a child.")
-
else
- # SOAPUnknown does not have parent.
- raise EncodingStyleError.new("Illegal parent: #{ parent }.")
+ raise EncodingStyleError.new("illegal parent: #{parent.node}")
end
end
diff --git a/lib/soap/encodingstyle/soapHandler.rb b/lib/soap/encodingstyle/soapHandler.rb
index 134a2ae8b8..f9152e0df8 100644
--- a/lib/soap/encodingstyle/soapHandler.rb
+++ b/lib/soap/encodingstyle/soapHandler.rb
@@ -1,5 +1,5 @@
# SOAP4R - SOAP EncodingStyle handler library
-# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2001, 2003, 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
# This program is copyrighted free software by NAKAMURA, Hiroshi. You can
# redistribute it and/or modify it under the same terms of Ruby's license;
@@ -33,7 +33,7 @@ class SOAPHandler < Handler
attrs = encode_attrs(generator, ns, data, parent)
if parent && parent.is_a?(SOAPArray) && parent.position
- attrs[ns.name(AttrPositionName)] = "[#{ parent.position.join(',') }]"
+ attrs[ns.name(AttrPositionName)] = "[#{parent.position.join(',')}]"
end
name = nil
@@ -75,7 +75,7 @@ class SOAPHandler < Handler
end
else
raise EncodingStyleError.new(
- "Unknown object:#{ data } in this encodingStyle.")
+ "unknown object:#{data} in this encodingStyle")
end
end
@@ -156,7 +156,6 @@ class SOAPHandler < Handler
end
def decode_tag(ns, elename, attrs, parent)
- # ToDo: check if @textbuf is empty...
@textbuf = ''
is_nil, type, arytype, root, offset, position, href, id, extraattr =
decode_attrs(ns, attrs)
@@ -227,6 +226,7 @@ class SOAPHandler < Handler
end
def decode_parent(parent, node)
+ return unless parent.node
case parent.node
when SOAPUnknown
newparent = parent.node.as_struct
@@ -247,10 +247,8 @@ class SOAPHandler < Handler
parent.node.add(node)
end
node.parent = parent.node
- when SOAPBasetype
- raise EncodingStyleError.new("SOAP base type must not have a child.")
else
- raise EncodingStyleError.new("Illegal parent: #{ parent.node }.")
+ raise EncodingStyleError.new("illegal parent: #{parent.node}")
end
end
@@ -266,7 +264,7 @@ private
def create_arytype(ns, data)
XSD::QName.new(data.arytype.namespace,
- content_typename(data.arytype.name) + "[#{ data.size.join(',') }]")
+ content_typename(data.arytype.name) + "[#{data.size.join(',')}]")
end
def encode_attrs(generator, ns, data, parent)
@@ -383,7 +381,7 @@ private
def decode_definedtype(elename, typename, typedef, arytypestr)
unless typedef
- raise EncodingStyleError.new("Unknown type '#{ typename }'.")
+ raise EncodingStyleError.new("unknown type '#{typename}'")
end
if typedef.is_a?(::WSDL::XMLSchema::SimpleType)
decode_defined_simpletype(elename, typename, typedef, arytypestr)
@@ -421,6 +419,10 @@ private
end
o.definedtype = typedef
return o
+ when :TYPE_EMPTY
+ o = SOAPNil.decode(elename)
+ o.definedtype = typedef
+ return o
else
raise RuntimeError.new(
"Unknown kind of complexType: #{typedef.compoundtype}")
@@ -509,7 +511,7 @@ private
case qname.name
when XSD::NilLiteral
is_nil = NilLiteralMap[value] or
- raise EncodingStyleError.new("Cannot accept attribute value: #{ value } as the value of xsi:#{ XSD::NilLiteral } (expected 'true', 'false', '1', or '0').")
+ raise EncodingStyleError.new("cannot accept attribute value: #{value} as the value of xsi:#{XSD::NilLiteral} (expected 'true', 'false', '1', or '0')")
next
when XSD::AttrType
type = value
@@ -523,7 +525,7 @@ private
when AttrRoot
root = RootLiteralMap[value] or
raise EncodingStyleError.new(
- "Illegal root attribute value: #{ value }.")
+ "illegal root attribute value: #{value}")
next
when AttrOffset
offset = value
@@ -578,7 +580,7 @@ private
ref.__setobj__(o)
false
else
- raise EncodingStyleError.new("Unresolved reference: #{ ref.refid }.")
+ raise EncodingStyleError.new("unresolved reference: #{ref.refid}")
end
}
count -= 1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 13:53:49 +0000