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
191 lines
3.9 KiB
Ruby
191 lines
3.9 KiB
Ruby
# XSD4R - Generating module definition code
|
|
# Copyright (C) 2004 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/codegen/gensupport'
|
|
require 'xsd/codegen/methoddef'
|
|
require 'xsd/codegen/commentdef'
|
|
|
|
|
|
module XSD
|
|
module CodeGen
|
|
|
|
|
|
class ModuleDef
|
|
include GenSupport
|
|
include CommentDef
|
|
|
|
def initialize(name)
|
|
@name = name
|
|
@comment = nil
|
|
@const = []
|
|
@code = []
|
|
@requirepath = []
|
|
@methoddef = []
|
|
end
|
|
|
|
def def_require(path)
|
|
@requirepath << path
|
|
end
|
|
|
|
def def_const(const, value)
|
|
unless safeconstname?(const)
|
|
raise ArgumentError.new("#{const} seems to be unsafe")
|
|
end
|
|
@const << [const, value]
|
|
end
|
|
|
|
def def_code(code)
|
|
@code << code
|
|
end
|
|
|
|
def def_method(name, *params)
|
|
add_method(MethodDef.new(name, *params) { yield if block_given? }, :public)
|
|
end
|
|
alias def_publicmethod def_method
|
|
|
|
def def_protectedmethod(name, *params)
|
|
add_method(MethodDef.new(name, *params) { yield if block_given? },
|
|
:protected)
|
|
end
|
|
|
|
def def_privatemethod(name, *params)
|
|
add_method(MethodDef.new(name, *params) { yield if block_given? }, :private)
|
|
end
|
|
|
|
def add_method(m, visibility = :public)
|
|
@methoddef << [visibility, m]
|
|
end
|
|
|
|
def dump
|
|
buf = ""
|
|
unless @requirepath.empty?
|
|
buf << dump_requirepath
|
|
end
|
|
buf << dump_emptyline unless buf.empty?
|
|
package = @name.split(/::/)[0..-2]
|
|
buf << dump_package_def(package) unless package.empty?
|
|
buf << dump_comment if @comment
|
|
buf << dump_module_def
|
|
spacer = false
|
|
unless @const.empty?
|
|
buf << dump_emptyline if spacer
|
|
spacer = true
|
|
buf << dump_const
|
|
end
|
|
unless @code.empty?
|
|
buf << dump_emptyline if spacer
|
|
spacer = true
|
|
buf << dump_code
|
|
end
|
|
unless @methoddef.empty?
|
|
buf << dump_emptyline if spacer
|
|
spacer = true
|
|
buf << dump_methods
|
|
end
|
|
buf << dump_module_def_end
|
|
buf << dump_package_def_end(package) unless package.empty?
|
|
buf.gsub(/^\s+$/, '')
|
|
end
|
|
|
|
private
|
|
|
|
def dump_requirepath
|
|
format(
|
|
@requirepath.collect { |path|
|
|
%Q(require '#{path}')
|
|
}.join("\n")
|
|
)
|
|
end
|
|
|
|
def dump_const
|
|
dump_static(
|
|
@const.sort.collect { |var, value|
|
|
%Q(#{var} = #{dump_value(value)})
|
|
}.join("\n")
|
|
)
|
|
end
|
|
|
|
def dump_code
|
|
dump_static(@code.join("\n"))
|
|
end
|
|
|
|
def dump_static(str)
|
|
format(str, 2)
|
|
end
|
|
|
|
def dump_methods
|
|
methods = {}
|
|
@methoddef.each do |visibility, method|
|
|
(methods[visibility] ||= []) << method
|
|
end
|
|
str = ""
|
|
[:public, :protected, :private].each do |visibility|
|
|
if methods[visibility]
|
|
str << "\n" unless str.empty?
|
|
str << visibility.to_s << "\n\n" unless visibility == :public
|
|
str << methods[visibility].collect { |m| format(m.dump, 2) }.join("\n")
|
|
end
|
|
end
|
|
str
|
|
end
|
|
|
|
def dump_value(value)
|
|
if value.respond_to?(:to_src)
|
|
value.to_src
|
|
else
|
|
value
|
|
end
|
|
end
|
|
|
|
def dump_package_def(package)
|
|
format(package.collect { |ele| "module #{ele}" }.join("; ")) + "\n\n"
|
|
end
|
|
|
|
def dump_package_def_end(package)
|
|
"\n\n" + format(package.collect { |ele| "end" }.join("; "))
|
|
end
|
|
|
|
def dump_module_def
|
|
name = @name.to_s.split(/::/)
|
|
format("module #{name.last}")
|
|
end
|
|
|
|
def dump_module_def_end
|
|
format("end")
|
|
end
|
|
end
|
|
|
|
|
|
end
|
|
end
|
|
|
|
|
|
if __FILE__ == $0
|
|
require 'xsd/codegen/moduledef'
|
|
include XSD::CodeGen
|
|
m = ModuleDef.new("Foo::Bar::HobbitName")
|
|
m.def_require("foo/bar")
|
|
m.def_require("baz")
|
|
m.comment = <<-EOD
|
|
foo
|
|
bar
|
|
baz
|
|
EOD
|
|
m.def_method("foo") do
|
|
<<-EOD
|
|
foo.bar = 1
|
|
baz.each do |ele|
|
|
ele + 1
|
|
end
|
|
EOD
|
|
end
|
|
m.def_method("baz", "qux")
|
|
#m.def_protectedmethod("aaa")
|
|
m.def_privatemethod("bbb")
|
|
puts m.dump
|
|
end
|