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
81 lines
1.9 KiB
Ruby
81 lines
1.9 KiB
Ruby
# WSDL4R - XSD importer library.
|
|
# Copyright (C) 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 'soap/httpconfigloader'
|
|
require 'wsdl/xmlSchema/parser'
|
|
|
|
|
|
module WSDL
|
|
module XMLSchema
|
|
|
|
|
|
class Importer
|
|
def self.import(location, originalroot = nil)
|
|
new.import(location, originalroot)
|
|
end
|
|
|
|
def initialize
|
|
@web_client = nil
|
|
end
|
|
|
|
def import(location, originalroot = nil)
|
|
unless location.is_a?(URI)
|
|
location = URI.parse(location)
|
|
end
|
|
content = parse(fetch(location), location, originalroot)
|
|
content.location = location
|
|
content
|
|
end
|
|
|
|
private
|
|
|
|
def parse(content, location, originalroot)
|
|
opt = {
|
|
:location => location,
|
|
:originalroot => originalroot
|
|
}
|
|
WSDL::XMLSchema::Parser.new(opt).parse(content)
|
|
end
|
|
|
|
def fetch(location)
|
|
warn("importing: #{location}") if $DEBUG
|
|
content = nil
|
|
if location.scheme == 'file' or
|
|
(location.relative? and FileTest.exist?(location.path))
|
|
content = File.open(location.path).read
|
|
else
|
|
client = web_client.new(nil, "WSDL4R")
|
|
client.proxy = ::SOAP::Env::HTTP_PROXY
|
|
client.no_proxy = ::SOAP::Env::NO_PROXY
|
|
if opt = ::SOAP::Property.loadproperty(::SOAP::PropertyName)
|
|
::SOAP::HTTPConfigLoader.set_options(client, opt["client.protocol.http"])
|
|
end
|
|
content = client.get_content(location)
|
|
end
|
|
content
|
|
end
|
|
|
|
def web_client
|
|
@web_client ||= begin
|
|
require 'http-access2'
|
|
if HTTPAccess2::VERSION < "2.0"
|
|
raise LoadError.new("http-access/2.0 or later is required.")
|
|
end
|
|
HTTPAccess2::Client
|
|
rescue LoadError
|
|
warn("Loading http-access2 failed. Net/http is used.") if $DEBUG
|
|
require 'soap/netHttpClient'
|
|
::SOAP::NetHttpClient
|
|
end
|
|
@web_client
|
|
end
|
|
end
|
|
|
|
|
|
end
|
|
end
|