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
140 lines
2.7 KiB
Ruby
140 lines
2.7 KiB
Ruby
# XSD4R - XML Schema Namespace library
|
|
# Copyright (C) 2000-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/datatypes'
|
|
|
|
|
|
module XSD
|
|
|
|
|
|
class NS
|
|
class Assigner
|
|
def initialize
|
|
@count = 0
|
|
end
|
|
|
|
def assign(ns)
|
|
@count += 1
|
|
"n#{@count}"
|
|
end
|
|
end
|
|
|
|
attr_reader :default_namespace
|
|
|
|
class FormatError < Error; end
|
|
|
|
public
|
|
|
|
def initialize(tag2ns = {})
|
|
@tag2ns = tag2ns
|
|
@assigner = nil
|
|
@ns2tag = {}
|
|
@tag2ns.each do |tag, ns|
|
|
@ns2tag[ns] = tag
|
|
end
|
|
@default_namespace = nil
|
|
end
|
|
|
|
def assign(ns, tag = nil)
|
|
if (tag == '')
|
|
@default_namespace = ns
|
|
tag
|
|
else
|
|
@assigner ||= Assigner.new
|
|
tag ||= @assigner.assign(ns)
|
|
@ns2tag[ns] = tag
|
|
@tag2ns[tag] = ns
|
|
tag
|
|
end
|
|
end
|
|
|
|
def assigned?(ns)
|
|
@default_namespace == ns or @ns2tag.key?(ns)
|
|
end
|
|
|
|
def assigned_tag?(tag)
|
|
@tag2ns.key?(tag)
|
|
end
|
|
|
|
def clone_ns
|
|
cloned = NS.new(@tag2ns.dup)
|
|
cloned.assigner = @assigner
|
|
cloned.assign(@default_namespace, '') if @default_namespace
|
|
cloned
|
|
end
|
|
|
|
def name(name)
|
|
if (name.namespace == @default_namespace)
|
|
name.name
|
|
elsif @ns2tag.key?(name.namespace)
|
|
@ns2tag[name.namespace] + ':' << name.name
|
|
else
|
|
raise FormatError.new("namespace: #{name.namespace} not defined yet")
|
|
end
|
|
end
|
|
|
|
def compare(ns, name, rhs)
|
|
if (ns == @default_namespace)
|
|
return true if (name == rhs)
|
|
end
|
|
@tag2ns.each do |assigned_tag, assigned_ns|
|
|
if assigned_ns == ns && "#{assigned_tag}:#{name}" == rhs
|
|
return true
|
|
end
|
|
end
|
|
false
|
|
end
|
|
|
|
# $1 and $2 are necessary.
|
|
ParseRegexp = Regexp.new('^([^:]+)(?::(.+))?$')
|
|
|
|
def parse(str, local = false)
|
|
if ParseRegexp =~ str
|
|
if (name = $2) and (ns = @tag2ns[$1])
|
|
return XSD::QName.new(ns, name)
|
|
end
|
|
end
|
|
XSD::QName.new(local ? nil : @default_namespace, str)
|
|
end
|
|
|
|
# For local attribute key parsing
|
|
# <foo xmlns="urn:a" xmlns:n1="urn:a" bar="1" n1:baz="2" />
|
|
# =>
|
|
# {}bar, {urn:a}baz
|
|
def parse_local(elem)
|
|
ParseRegexp =~ elem
|
|
if $2
|
|
ns = @tag2ns[$1]
|
|
name = $2
|
|
if !ns
|
|
raise FormatError.new("unknown namespace qualifier: #{$1}")
|
|
end
|
|
elsif $1
|
|
ns = nil
|
|
name = $1
|
|
else
|
|
raise FormatError.new("illegal element format: #{elem}")
|
|
end
|
|
XSD::QName.new(ns, name)
|
|
end
|
|
|
|
def each_ns
|
|
@ns2tag.each do |ns, tag|
|
|
yield(ns, tag)
|
|
end
|
|
end
|
|
|
|
protected
|
|
|
|
def assigner=(assigner)
|
|
@assigner = assigner
|
|
end
|
|
end
|
|
|
|
|
|
end
|