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
203 lines
4.3 KiB
Ruby
203 lines
4.3 KiB
Ruby
# XSD4R - Generating class 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/moduledef'
|
|
require 'xsd/codegen/methoddef'
|
|
|
|
|
|
module XSD
|
|
module CodeGen
|
|
|
|
|
|
class ClassDef < ModuleDef
|
|
include GenSupport
|
|
|
|
def initialize(name, baseclass = nil)
|
|
super(name)
|
|
@baseclass = baseclass
|
|
@classvar = []
|
|
@attrdef = []
|
|
end
|
|
|
|
def def_classvar(var, value)
|
|
var = var.sub(/\A@@/, "")
|
|
unless safevarname?(var)
|
|
raise ArgumentError.new("#{var} seems to be unsafe")
|
|
end
|
|
@classvar << [var, value]
|
|
end
|
|
|
|
def def_attr(attrname, writable = true, varname = nil)
|
|
unless safevarname?(varname || attrname)
|
|
raise ArgumentError.new("#{varname || attrname} seems to be unsafe")
|
|
end
|
|
@attrdef << [attrname, writable, varname]
|
|
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_class_def
|
|
spacer = false
|
|
unless @classvar.empty?
|
|
spacer = true
|
|
buf << dump_classvar
|
|
end
|
|
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 @attrdef.empty?
|
|
buf << dump_emptyline if spacer
|
|
spacer = true
|
|
buf << dump_attributes
|
|
end
|
|
unless @methoddef.empty?
|
|
buf << dump_emptyline if spacer
|
|
spacer = true
|
|
buf << dump_methods
|
|
end
|
|
buf << dump_class_def_end
|
|
buf << dump_package_def_end(package) unless package.empty?
|
|
buf.gsub(/^\s+$/, '')
|
|
end
|
|
|
|
private
|
|
|
|
def dump_class_def
|
|
name = @name.to_s.split(/::/)
|
|
if @baseclass
|
|
format("class #{name.last} < #{@baseclass}")
|
|
else
|
|
format("class #{name.last}")
|
|
end
|
|
end
|
|
|
|
def dump_class_def_end
|
|
str = format("end")
|
|
end
|
|
|
|
def dump_classvar
|
|
dump_static(
|
|
@classvar.collect { |var, value|
|
|
%Q(@@#{var.sub(/^@@/, "")} = #{dump_value(value)})
|
|
}.join("\n")
|
|
)
|
|
end
|
|
|
|
def dump_attributes
|
|
str = ""
|
|
@attrdef.each do |attrname, writable, varname|
|
|
varname ||= attrname
|
|
if attrname == varname
|
|
str << format(dump_accessor(attrname, writable), 2)
|
|
end
|
|
end
|
|
@attrdef.each do |attrname, writable, varname|
|
|
varname ||= attrname
|
|
if attrname != varname
|
|
str << "\n" unless str.empty?
|
|
str << format(dump_attribute(attrname, writable, varname), 2)
|
|
end
|
|
end
|
|
str
|
|
end
|
|
|
|
def dump_accessor(attrname, writable)
|
|
if writable
|
|
"attr_accessor :#{attrname}"
|
|
else
|
|
"attr_reader :#{attrname}"
|
|
end
|
|
end
|
|
|
|
def dump_attribute(attrname, writable, varname)
|
|
str = nil
|
|
mr = MethodDef.new(attrname)
|
|
mr.definition = "@#{varname}"
|
|
str = mr.dump
|
|
if writable
|
|
mw = MethodDef.new(attrname + "=", 'value')
|
|
mw.definition = "@#{varname} = value"
|
|
str << "\n" + mw.dump
|
|
end
|
|
str
|
|
end
|
|
end
|
|
|
|
|
|
end
|
|
end
|
|
|
|
|
|
if __FILE__ == $0
|
|
require 'xsd/codegen/classdef'
|
|
include XSD::CodeGen
|
|
c = ClassDef.new("Foo::Bar::HobbitName", String)
|
|
c.def_require("foo/bar")
|
|
c.comment = <<-EOD
|
|
foo
|
|
bar
|
|
baz
|
|
EOD
|
|
c.def_const("FOO", 1)
|
|
c.def_classvar("@@foo", "var".dump)
|
|
c.def_classvar("baz", "1".dump)
|
|
c.def_attr("Foo", true, "foo")
|
|
c.def_attr("bar")
|
|
c.def_attr("baz", true)
|
|
c.def_attr("Foo2", true, "foo2")
|
|
c.def_attr("foo3", false, "foo3")
|
|
c.def_method("foo") do
|
|
<<-EOD
|
|
foo.bar = 1
|
|
\tbaz.each do |ele|
|
|
\t ele
|
|
end
|
|
EOD
|
|
end
|
|
c.def_method("baz", "qux") do
|
|
<<-EOD
|
|
[1, 2, 3].each do |i|
|
|
p i
|
|
end
|
|
EOD
|
|
end
|
|
|
|
m = MethodDef.new("qux", "quxx", "quxxx") do
|
|
<<-EOD
|
|
p quxx + quxxx
|
|
EOD
|
|
end
|
|
m.comment = "hello world\n123"
|
|
c.add_method(m)
|
|
c.def_code <<-EOD
|
|
Foo.new
|
|
Bar.z
|
|
EOD
|
|
c.def_code <<-EOD
|
|
Foo.new
|
|
Bar.z
|
|
EOD
|
|
c.def_privatemethod("foo", "baz", "*arg", "&block")
|
|
|
|
puts c.dump
|
|
end
|