mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
152 lines
4.4 KiB
Ruby
152 lines
4.4 KiB
Ruby
# WSDL4R - WSDL additional definitions for SOAP.
|
|
# Copyright (C) 2002, 2003 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 'wsdl/info'
|
|
require 'xsd/namedelements'
|
|
require 'soap/mapping'
|
|
|
|
|
|
module WSDL
|
|
|
|
|
|
class Definitions < Info
|
|
def self.soap_rpc_complextypes
|
|
types = XSD::NamedElements.new
|
|
types << array_complextype
|
|
types << fault_complextype
|
|
types << exception_complextype
|
|
types
|
|
end
|
|
|
|
def self.array_complextype
|
|
type = XMLSchema::ComplexType.new(::SOAP::ValueArrayName)
|
|
type.complexcontent = XMLSchema::ComplexContent.new
|
|
type.complexcontent.base = ::SOAP::ValueArrayName
|
|
attr = XMLSchema::Attribute.new
|
|
attr.ref = ::SOAP::AttrArrayTypeName
|
|
anytype = XSD::AnyTypeName.dup
|
|
anytype.name += '[]'
|
|
attr.arytype = anytype
|
|
type.complexcontent.attributes << attr
|
|
type
|
|
end
|
|
|
|
=begin
|
|
<xs:complexType name="Fault" final="extension">
|
|
<xs:sequence>
|
|
<xs:element name="faultcode" type="xs:QName" />
|
|
<xs:element name="faultstring" type="xs:string" />
|
|
<xs:element name="faultactor" type="xs:anyURI" minOccurs="0" />
|
|
<xs:element name="detail" type="tns:detail" minOccurs="0" />
|
|
</xs:sequence>
|
|
</xs:complexType>
|
|
=end
|
|
def self.fault_complextype
|
|
type = XMLSchema::ComplexType.new(::SOAP::EleFaultName)
|
|
faultcode = XMLSchema::Element.new(::SOAP::EleFaultCodeName, XSD::XSDQName::Type)
|
|
faultstring = XMLSchema::Element.new(::SOAP::EleFaultStringName, XSD::XSDString::Type)
|
|
faultactor = XMLSchema::Element.new(::SOAP::EleFaultActorName, XSD::XSDAnyURI::Type)
|
|
faultactor.minoccurs = 0
|
|
detail = XMLSchema::Element.new(::SOAP::EleFaultDetailName, XSD::AnyTypeName)
|
|
detail.minoccurs = 0
|
|
type.all_elements = [faultcode, faultstring, faultactor, detail]
|
|
type.final = 'extension'
|
|
type
|
|
end
|
|
|
|
def self.exception_complextype
|
|
type = XMLSchema::ComplexType.new(XSD::QName.new(
|
|
::SOAP::Mapping::RubyCustomTypeNamespace, 'SOAPException'))
|
|
excn_name = XMLSchema::Element.new(XSD::QName.new(nil, 'excn_type_name'), XSD::XSDString::Type)
|
|
cause = XMLSchema::Element.new(XSD::QName.new(nil, 'cause'), XSD::AnyTypeName)
|
|
backtrace = XMLSchema::Element.new(XSD::QName.new(nil, 'backtrace'), ::SOAP::ValueArrayName)
|
|
message = XMLSchema::Element.new(XSD::QName.new(nil, 'message'), XSD::XSDString::Type)
|
|
type.all_elements = [excn_name, cause, backtrace, message]
|
|
type
|
|
end
|
|
|
|
def soap_rpc_complextypes(binding)
|
|
types = rpc_operation_complextypes(binding)
|
|
types + self.class.soap_rpc_complextypes
|
|
end
|
|
|
|
def collect_faulttypes
|
|
result = []
|
|
collect_fault_messages.each do |m|
|
|
parts = message(m).parts
|
|
if parts.size != 1
|
|
raise RuntimeError.new("Expecting fault message to have only 1 part.")
|
|
end
|
|
if result.index(parts[0].type).nil?
|
|
result << parts[0].type
|
|
end
|
|
end
|
|
result
|
|
end
|
|
|
|
private
|
|
|
|
def collect_fault_messages
|
|
result = []
|
|
porttypes.each do |porttype|
|
|
porttype.operations.each do |operation|
|
|
operation.fault.each do |fault|
|
|
if result.index(fault.message).nil?
|
|
result << fault.message
|
|
end
|
|
end
|
|
end
|
|
end
|
|
result
|
|
end
|
|
|
|
def rpc_operation_complextypes(binding)
|
|
types = XSD::NamedElements.new
|
|
binding.operations.each do |op_bind|
|
|
if op_bind_rpc?(op_bind)
|
|
operation = op_bind.find_operation
|
|
if op_bind.input
|
|
type = XMLSchema::ComplexType.new(operation_input_name(operation))
|
|
message = messages[operation.input.message]
|
|
type.sequence_elements = elements_from_message(message)
|
|
types << type
|
|
end
|
|
if op_bind.output
|
|
type = XMLSchema::ComplexType.new(operation_output_name(operation))
|
|
message = messages[operation.output.message]
|
|
type.sequence_elements = elements_from_message(message)
|
|
types << type
|
|
end
|
|
end
|
|
end
|
|
types
|
|
end
|
|
|
|
def operation_input_name(operation)
|
|
operation.input.name || operation.name
|
|
end
|
|
|
|
def operation_output_name(operation)
|
|
operation.output.name ||
|
|
XSD::QName.new(operation.name.namespace, operation.name.name + "Response")
|
|
end
|
|
|
|
def op_bind_rpc?(op_bind)
|
|
op_bind.soapoperation and op_bind.soapoperation.operation_style == :rpc
|
|
end
|
|
|
|
def elements_from_message(message)
|
|
message.parts.collect { |part|
|
|
qname = XSD::QName.new(nil, part.name)
|
|
XMLSchema::Element.new(qname, part.type)
|
|
}
|
|
end
|
|
end
|
|
|
|
|
|
end
|