From 29c5ab0b77feaf975d83ab340d7194c9c4dffc9d Mon Sep 17 00:00:00 2001 From: nahi Date: Thu, 15 Sep 2005 14:33:53 +0000 Subject: * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5. #nnn is a ticket number at http://dev.ctor.org/soap4r * SOAP * allow to configure an envelope namespace of SOAP request. (#124) TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope' @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace @client.do_proc(...) * let SOAP request XML indent space configuable. see "soap.envelope.no_indent" option. (#130) * let external CES configuable. ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used by default. (#133) external CES ::= CES used in Ruby object of client and server internal CES ::= CES used in SOAP/OM * add iso-8859-1 external CES support. (#106) * fixed illegal 'qualified' handling of elements. it caused ASP.NET inteoperability problem. (#144) * added 'soap.envelope.use_numeric_character_reference' (boolean) option to let query XML use numeric character reference in XML, not plain UTF-8 character. !GoogleSearch server seems to not allow plain UTF-8 character since 2005-08-15 update. (#147) * SOAP::Header::SimpleHeader (de)serialization throws an exception on !SimpleHeader.on_(in|out)bound when header is a String. so we could not use a simple single element headerItem. fixed. thanks to emil. (#129) * out parameter of rpc operation did not work. (#132) * follow HTTP redirect only if using http-access2. (#125) (#145) * add a workaround for importing an WSDL whose path begins with drive letter. (#115) * WSDL * SOAP Data which is defined as a simpletype was not mapped correctly to Ruby obj when using wsdl2ruby.rb generated classdef file. (#123) * rpc/literal support. (#118) * re-implemented local element qualify/unqualify control. handles elementFormDefault and form in WSDL. (#119) * Array of an element which has simpleType causes a crash. (#128) * prarmeterOrder may not contain return part so it can be shorter than parts size. Thanks to Hugh. (#139) * Samples * added !BasicAuth client sample. (#117) * added Base64 client/server sample. * added Flickr SOAP interface client sample. (#122) * added !SalesForce client sample. (#135) * updated Thawte CA certificate for !GoogleAdWords sample. * updated a client script with the newer version made by Johan. thanks! * shortened long file names. (#120) * fixed typo in authheader sample. (#129) * updated deprecated method usage. (#138) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/wsdl/xmlSchema/element.rb | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'lib/wsdl/xmlSchema/element.rb') diff --git a/lib/wsdl/xmlSchema/element.rb b/lib/wsdl/xmlSchema/element.rb index 4a144cd522..fffb6485d0 100644 --- a/lib/wsdl/xmlSchema/element.rb +++ b/lib/wsdl/xmlSchema/element.rb @@ -18,9 +18,8 @@ class Element < Info if RUBY_VERSION > "1.7.0" def attr_reader_ref(symbol) name = symbol.to_s - iv = "@#{name}" define_method(name) { - instance_variable_get(iv) || + instance_variable_get("@#{name}") || (refelement ? refelement.__send__(name) : nil) } end @@ -37,6 +36,7 @@ class Element < Info end attr_writer :name # required + attr_writer :form attr_writer :type attr_writer :local_simpletype attr_writer :local_complextype @@ -46,6 +46,7 @@ class Element < Info attr_writer :nillable attr_reader_ref :name + attr_reader_ref :form attr_reader_ref :type attr_reader_ref :local_simpletype attr_reader_ref :local_complextype @@ -59,6 +60,7 @@ class Element < Info def initialize(name = nil, type = nil) super() @name = name + @form = nil @type = type @local_simpletype = @local_complextype = nil @constraint = nil @@ -70,18 +72,21 @@ class Element < Info end def refelement - @refelement ||= root.collect_elements[@ref] + @refelement ||= (@ref ? root.collect_elements[@ref] : nil) end def targetnamespace parent.targetnamespace end - def elementform - # ToDo: must be overwritten. + def elementformdefault parent.elementformdefault end + def elementform + self.form.nil? ? parent.elementformdefault : self.form + end + def parse_element(element) case element when SimpleTypeName @@ -102,7 +107,14 @@ class Element < Info def parse_attr(attr, value) case attr when NameAttrName - @name = XSD::QName.new(targetnamespace, value.source) + # namespace may be nil + if directelement? or elementform == 'qualified' + @name = XSD::QName.new(targetnamespace, value.source) + else + @name = XSD::QName.new(nil, value.source) + end + when FormAttrName + @form = value.source when TypeAttrName @type = value when RefAttrName @@ -110,14 +122,16 @@ class Element < Info when MaxOccursAttrName if parent.is_a?(All) if value.source != '1' - raise Parser::AttrConstraintError.new("cannot parse #{value} for #{attr}") + raise Parser::AttrConstraintError.new( + "cannot parse #{value} for #{attr}") end end @maxoccurs = value.source when MinOccursAttrName if parent.is_a?(All) unless ['0', '1'].include?(value.source) - raise Parser::AttrConstraintError.new("cannot parse #{value} for #{attr}") + raise Parser::AttrConstraintError.new( + "cannot parse #{value} for #{attr}") end end @minoccurs = value.source @@ -127,6 +141,12 @@ class Element < Info nil end end + +private + + def directelement? + parent.is_a?(Schema) + end end -- cgit v1.2.3