mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eb3f829be9
== 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
166 lines
3.9 KiB
Ruby
166 lines
3.9 KiB
Ruby
# WSDL4R - WSDL XML Instance parser library.
|
|
# 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;
|
|
# either the dual license version in 2003, or any later version.
|
|
|
|
|
|
require 'xsd/qname'
|
|
require 'xsd/ns'
|
|
require 'xsd/charset'
|
|
require 'xsd/datatypes'
|
|
require 'xsd/xmlparser'
|
|
require 'wsdl/xmlSchema/data'
|
|
|
|
|
|
module WSDL
|
|
module XMLSchema
|
|
|
|
|
|
class Parser
|
|
include XSD
|
|
|
|
class ParseError < Error; end
|
|
class FormatDecodeError < ParseError; end
|
|
class UnknownElementError < FormatDecodeError; end
|
|
class UnknownAttributeError < FormatDecodeError; end
|
|
class UnexpectedElementError < FormatDecodeError; end
|
|
class ElementConstraintError < FormatDecodeError; end
|
|
class AttributeConstraintError < FormatDecodeError; end
|
|
|
|
private
|
|
|
|
class ParseFrame
|
|
attr_reader :ns
|
|
attr_reader :name
|
|
attr_accessor :node
|
|
|
|
private
|
|
|
|
def initialize(ns, name, node)
|
|
@ns = ns
|
|
@name = name
|
|
@node = node
|
|
end
|
|
end
|
|
|
|
public
|
|
|
|
def initialize(opt = {})
|
|
@parser = XSD::XMLParser.create_parser(self, opt)
|
|
@parsestack = nil
|
|
@lastnode = nil
|
|
@ignored = {}
|
|
@location = opt[:location]
|
|
@originalroot = opt[:originalroot]
|
|
end
|
|
|
|
def parse(string_or_readable)
|
|
@parsestack = []
|
|
@lastnode = nil
|
|
@textbuf = ''
|
|
@parser.do_parse(string_or_readable)
|
|
@lastnode
|
|
end
|
|
|
|
def charset
|
|
@parser.charset
|
|
end
|
|
|
|
def start_element(name, attrs)
|
|
lastframe = @parsestack.last
|
|
ns = parent = nil
|
|
if lastframe
|
|
ns = lastframe.ns.clone_ns
|
|
parent = lastframe.node
|
|
else
|
|
ns = XSD::NS.new
|
|
parent = nil
|
|
end
|
|
attrs = XSD::XMLParser.filter_ns(ns, attrs)
|
|
node = decode_tag(ns, name, attrs, parent)
|
|
@parsestack << ParseFrame.new(ns, name, node)
|
|
end
|
|
|
|
def characters(text)
|
|
lastframe = @parsestack.last
|
|
if lastframe
|
|
# Need not to be cloned because character does not have attr.
|
|
ns = lastframe.ns
|
|
decode_text(ns, text)
|
|
else
|
|
p text if $DEBUG
|
|
end
|
|
end
|
|
|
|
def end_element(name)
|
|
lastframe = @parsestack.pop
|
|
unless name == lastframe.name
|
|
raise UnexpectedElementError.new("closing element name '#{name}' does not match with opening element '#{lastframe.name}'")
|
|
end
|
|
decode_tag_end(lastframe.ns, lastframe.node)
|
|
@lastnode = lastframe.node
|
|
end
|
|
|
|
private
|
|
|
|
def decode_tag(ns, name, attrs, parent)
|
|
o = nil
|
|
elename = ns.parse(name)
|
|
if !parent
|
|
if elename == SchemaName
|
|
o = Schema.parse_element(elename)
|
|
o.location = @location
|
|
else
|
|
raise UnknownElementError.new("unknown element: #{elename}")
|
|
end
|
|
o.root = @originalroot if @originalroot # o.root = o otherwise
|
|
else
|
|
if elename == AnnotationName
|
|
# only the first annotation element is allowed for each element.
|
|
o = Annotation.new
|
|
else
|
|
o = parent.parse_element(elename)
|
|
end
|
|
unless o
|
|
unless @ignored.key?(elename)
|
|
warn("ignored element: #{elename} of #{parent.class}")
|
|
@ignored[elename] = elename
|
|
end
|
|
o = Documentation.new # which accepts any element.
|
|
end
|
|
# node could be a pseudo element. pseudo element has its own parent.
|
|
o.root = parent.root
|
|
o.parent = parent if o.parent.nil?
|
|
end
|
|
attrs.each do |key, value|
|
|
attr_ele = ns.parse(key, true)
|
|
value_ele = ns.parse(value, true)
|
|
value_ele.source = value # for recovery; value may not be a QName
|
|
if attr_ele == IdAttrName
|
|
o.id = value_ele
|
|
else
|
|
unless o.parse_attr(attr_ele, value_ele)
|
|
unless @ignored.key?(attr_ele)
|
|
warn("ignored attr: #{attr_ele}")
|
|
@ignored[attr_ele] = attr_ele
|
|
end
|
|
end
|
|
end
|
|
end
|
|
o
|
|
end
|
|
|
|
def decode_tag_end(ns, node)
|
|
node.parse_epilogue
|
|
end
|
|
|
|
def decode_text(ns, text)
|
|
@textbuf << text
|
|
end
|
|
end
|
|
|
|
|
|
end
|
|
end
|