mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
== SOAP client and server == === for both client side and server side === * improved document/literal service support. style(rpc,document)/use(encoding, literal) combination are all supported. for the detail about combination, see test/soap/test_style.rb. * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to WSDL as well as obj2soap. closes #70. * let SOAP::Mapping::Object handle XML attribute for doc/lit service. you can set/get XML attribute via accessor methods which as a name 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name). === client side === * WSDLDriver capitalized name operation bug fixed. from 1.5.3-ruby1.8.2, operation which has capitalized name (such as KeywordSearchRequest in AWS) is defined as a method having uncapitalized name. (converted with GenSupport.safemethodname to handle operation name 'foo-bar'). it introduced serious incompatibility; in the past, it was defined as a capitalized. define capitalized method as well under that circumstance. * added new factory interface 'WSDLDriverFactory#create_rpc_driver' to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver are merged). 'WSDLDriverFactory#create_driver' still creates WSDLDriver for compatibility but it warns that the method is deprecated. please use create_rpc_driver instead of create_driver. * allow to use an URI object as an endpoint_url even with net/http, not http-access2. === server side === * added mod_ruby support to SOAP::CGIStub. rename a CGI script server.cgi to server.rb and let mod_ruby's RubyHandler handles the script. CGIStub detects if it's running under mod_ruby environment or not. * added fcgi support to SOAP::CGIStub. see the sample at sample/soap/calc/server.fcgi. (almost same as server.cgi but has fcgi handler at the bottom.) * allow to return a SOAPFault object to respond customized SOAP fault. * added the interface 'generate_explicit_type' for server side (CGIStub, HTTPServer). call 'self.generate_explicit_type = true' if you want to return simplified XML even if it's rpc/encoded service. == WSDL == === WSDL definition === * improved XML Schema support such as extension, restriction, simpleType, complexType + simpleContent, ref, length, import, include. * reduced "unknown element/attribute" warnings (warn only 1 time for each QName). * importing XSD file at schemaLocation with xsd:import. === code generation from WSDL === * generator crashed when there's '-' in defined element/attribute name. * added ApacheMap WSDL definition. * sample/{soap,wsdl}: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7aea792d3b
commit
eb3f829be9
211 changed files with 5997 additions and 9378 deletions
|
@ -1,5 +1,5 @@
|
|||
# WSDL4R - XMLSchema element definition for WSDL.
|
||||
# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
||||
# Copyright (C) 2002, 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;
|
||||
|
@ -14,23 +14,62 @@ module XMLSchema
|
|||
|
||||
|
||||
class Element < Info
|
||||
attr_accessor :name # required
|
||||
attr_accessor :type
|
||||
attr_accessor :local_complextype
|
||||
attr_accessor :constraint
|
||||
attr_accessor :maxoccurs
|
||||
attr_accessor :minoccurs
|
||||
attr_accessor :nillable
|
||||
class << self
|
||||
if RUBY_VERSION > "1.7.0"
|
||||
def attr_reader_ref(symbol)
|
||||
name = symbol.to_s
|
||||
self.__send__(:define_method, name, proc {
|
||||
instance_variable_get("@#{name}") ||
|
||||
(refelement ? refelement.__send__(name) : nil)
|
||||
})
|
||||
end
|
||||
else
|
||||
def attr_reader_ref(symbol)
|
||||
name = symbol.to_s
|
||||
module_eval <<-EOS
|
||||
def #{name}
|
||||
@#{name} || (refelement ? refelement.#{name} : nil)
|
||||
end
|
||||
EOS
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(name = nil, type = XSD::AnyTypeName)
|
||||
attr_writer :name # required
|
||||
attr_writer :type
|
||||
attr_writer :local_simpletype
|
||||
attr_writer :local_complextype
|
||||
attr_writer :constraint
|
||||
attr_writer :maxoccurs
|
||||
attr_writer :minoccurs
|
||||
attr_writer :nillable
|
||||
|
||||
attr_reader_ref :name
|
||||
attr_reader_ref :type
|
||||
attr_reader_ref :local_simpletype
|
||||
attr_reader_ref :local_complextype
|
||||
attr_reader_ref :constraint
|
||||
attr_reader_ref :maxoccurs
|
||||
attr_reader_ref :minoccurs
|
||||
attr_reader_ref :nillable
|
||||
|
||||
attr_accessor :ref
|
||||
|
||||
def initialize(name = nil, type = nil)
|
||||
super()
|
||||
@name = name
|
||||
@type = type
|
||||
@local_complextype = nil
|
||||
@local_simpletype = @local_complextype = nil
|
||||
@constraint = nil
|
||||
@maxoccurs = '1'
|
||||
@minoccurs = '1'
|
||||
@nillable = nil
|
||||
@ref = nil
|
||||
@refelement = nil
|
||||
end
|
||||
|
||||
def refelement
|
||||
@refelement ||= root.collect_elements[@ref]
|
||||
end
|
||||
|
||||
def targetnamespace
|
||||
|
@ -44,6 +83,9 @@ class Element < Info
|
|||
|
||||
def parse_element(element)
|
||||
case element
|
||||
when SimpleTypeName
|
||||
@local_simpletype = SimpleType.new
|
||||
@local_simpletype
|
||||
when ComplexTypeName
|
||||
@type = nil
|
||||
@local_complextype = ComplexType.new
|
||||
|
@ -62,19 +104,19 @@ class Element < Info
|
|||
@name = XSD::QName.new(targetnamespace, value.source)
|
||||
when TypeAttrName
|
||||
@type = value
|
||||
when RefAttrName
|
||||
@ref = value
|
||||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue