From 810a605c34d97fa878cb5b615b9e95a2fee84ca8 Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 22 May 2005 13:03:38 +0000 Subject: * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4. == 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#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: http://svn.ruby-lang.org/repos/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/xsd/charset.rb | 2 +- lib/xsd/codegen/classdef.rb | 2 +- lib/xsd/codegen/commentdef.rb | 4 +-- lib/xsd/codegen/gensupport.rb | 67 ++++++++++++++++++++++++++++++++++++----- lib/xsd/codegen/methoddef.rb | 2 +- lib/xsd/codegen/moduledef.rb | 2 +- lib/xsd/datatypes.rb | 33 ++++++++++++++++++-- lib/xsd/iconvcharset.rb | 2 +- lib/xsd/mapping.rb | 42 ++++++++++++++++++++++++++ lib/xsd/namedelements.rb | 14 ++++++++- lib/xsd/ns.rb | 18 +++++------ lib/xsd/qname.rb | 6 ++++ lib/xsd/xmlparser.rb | 2 +- lib/xsd/xmlparser/xmlscanner.rb | 6 ++-- 14 files changed, 172 insertions(+), 30 deletions(-) create mode 100644 lib/xsd/mapping.rb (limited to 'lib/xsd') diff --git a/lib/xsd/charset.rb b/lib/xsd/charset.rb index acdea8bcf..ccd22a774 100644 --- a/lib/xsd/charset.rb +++ b/lib/xsd/charset.rb @@ -71,7 +71,7 @@ public end def Charset.encoding=(encoding) - STDERR.puts("xsd charset is set to #{encoding}") if $DEBUG + warn("xsd charset is set to #{encoding}") if $DEBUG @encoding = encoding end diff --git a/lib/xsd/codegen/classdef.rb b/lib/xsd/codegen/classdef.rb index 8f72e95ef..9eb1ce660 100644 --- a/lib/xsd/codegen/classdef.rb +++ b/lib/xsd/codegen/classdef.rb @@ -77,7 +77,7 @@ class ClassDef < ModuleDef end buf << dump_class_def_end buf << dump_package_def_end(package) unless package.empty? - buf + buf.gsub(/^\s+$/, '') end private diff --git a/lib/xsd/codegen/commentdef.rb b/lib/xsd/codegen/commentdef.rb index f98fade57..c9493a136 100644 --- a/lib/xsd/codegen/commentdef.rb +++ b/lib/xsd/codegen/commentdef.rb @@ -21,10 +21,10 @@ module CommentDef private def dump_comment - if /^#/ =~ @comment + if /\A#/ =~ @comment format(@comment) else - format(@comment).gsub(/^/, "# ") + format(@comment).gsub(/^/, '# ') end end end diff --git a/lib/xsd/codegen/gensupport.rb b/lib/xsd/codegen/gensupport.rb index df90550fa..854534154 100644 --- a/lib/xsd/codegen/gensupport.rb +++ b/lib/xsd/codegen/gensupport.rb @@ -9,6 +9,49 @@ module XSD module CodeGen +# from the file 'keywords' in 1.9. +KEYWORD = %w( +__LINE__ +__FILE__ +BEGIN +END +alias +and +begin +break +case +class +def +defined? +do +else +elsif +end +ensure +false +for +if +in +module +next +nil +not +or +redo +rescue +retry +return +self +super +then +true +undef +unless +until +when +while +yield +) module GenSupport def capitalize(target) @@ -25,7 +68,7 @@ module GenSupport safename = name.scan(/[a-zA-Z0-9_]+/).collect { |ele| GenSupport.capitalize(ele) }.join - unless /^[A-Z]/ =~ safename + if /^[A-Z]/ !~ safename or keyword?(safename) safename = "C_#{safename}" end safename @@ -33,12 +76,17 @@ module GenSupport module_function :safeconstname def safeconstname?(name) - /\A[A-Z][a-zA-Z0-9_]*\z/ =~ name + /\A[A-Z][a-zA-Z0-9_]*\z/ =~ name and !keyword?(name) end module_function :safeconstname? def safemethodname(name) - safevarname(name) + safename = name.scan(/[a-zA-Z0-9_]+/).join('_') + safename = uncapitalize(safename) + if /^[a-z]/ !~ safename + safename = "m_#{safename}" + end + safename end module_function :safemethodname @@ -50,18 +98,23 @@ module GenSupport def safevarname(name) safename = name.scan(/[a-zA-Z0-9_]+/).join('_') safename = uncapitalize(safename) - unless /^[a-z]/ =~ safename - safename = "m_#{safename}" + if /^[a-z]/ !~ safename or keyword?(safename) + safename = "v_#{safename}" end safename end module_function :safevarname def safevarname?(name) - /\A[a-z_][a-zA-Z0-9_]*\z/ =~ name + /\A[a-z_][a-zA-Z0-9_]*\z/ =~ name and !keyword?(name) end module_function :safevarname? + def keyword?(word) + KEYWORD.include?(word) + end + module_function :keyword? + def format(str, indent = nil) str = trim_eol(str) str = trim_indent(str) @@ -76,7 +129,7 @@ private def trim_eol(str) str.collect { |line| - line.sub(/\r?\n$/, "") + "\n" + line.sub(/\r?\n\z/, "") + "\n" }.join end diff --git a/lib/xsd/codegen/methoddef.rb b/lib/xsd/codegen/methoddef.rb index 24a9168d5..15892fc5b 100644 --- a/lib/xsd/codegen/methoddef.rb +++ b/lib/xsd/codegen/methoddef.rb @@ -34,7 +34,7 @@ class MethodDef buf = "" buf << dump_comment if @comment buf << dump_method_def - buf << dump_definition if @definition + buf << dump_definition if @definition and !@definition.empty? buf << dump_method_def_end buf end diff --git a/lib/xsd/codegen/moduledef.rb b/lib/xsd/codegen/moduledef.rb index dc2746b2e..744af2ff9 100644 --- a/lib/xsd/codegen/moduledef.rb +++ b/lib/xsd/codegen/moduledef.rb @@ -89,7 +89,7 @@ class ModuleDef end buf << dump_module_def_end buf << dump_package_def_end(package) unless package.empty? - buf + buf.gsub(/^\s+$/, '') end private diff --git a/lib/xsd/datatypes.rb b/lib/xsd/datatypes.rb index 5f77ea2e4..d0fc44d69 100644 --- a/lib/xsd/datatypes.rb +++ b/lib/xsd/datatypes.rb @@ -495,6 +495,18 @@ require 'date' module XSDDateTimeImpl SecInDay = 86400 # 24 * 60 * 60 + def to_obj(klass) + if klass == Time + to_time + elsif klass == Date + to_date + elsif klass == DateTime + to_datetime + else + nil + end + end + def to_time begin if @data.offset * SecInDay == Time.now.utc_offset @@ -511,6 +523,14 @@ module XSDDateTimeImpl end end + def to_date + Date.new0(@data.class.jd_to_ajd(@data.jd, 0, 0), 0, @data.start) + end + + def to_datetime + data + end + def tz2of(str) /^(?:Z|(?:([+\-])(\d\d):(\d\d))?)$/ =~ str sign = $1 @@ -539,9 +559,18 @@ module XSDDateTimeImpl end def screen_data(t) - if (t.is_a?(Date)) + # convert t to a DateTime as an internal representation. + if t.is_a?(DateTime) t - elsif (t.is_a?(Time)) + elsif t.is_a?(Date) + if t.respond_to?(:to_datetime) # from 1.9 + t.to_datetime + else + t = screen_data_str(t) + t <<= 12 if t.year < 0 + t + end + elsif t.is_a?(Time) sec, min, hour, mday, month, year = t.to_a[0..5] diffday = t.usec.to_r / 1000000 / SecInDay of = t.utc_offset.to_r / SecInDay diff --git a/lib/xsd/iconvcharset.rb b/lib/xsd/iconvcharset.rb index cac66515e..7e629d569 100644 --- a/lib/xsd/iconvcharset.rb +++ b/lib/xsd/iconvcharset.rb @@ -22,7 +22,7 @@ class IconvCharset out << e.success ch, str = e.failed.split(//, 2) out << '?' - STDERR.puts("Failed to convert #{ch}") + warn("Failed to convert #{ch}") retry end return out diff --git a/lib/xsd/mapping.rb b/lib/xsd/mapping.rb new file mode 100644 index 000000000..06d30d4cb --- /dev/null +++ b/lib/xsd/mapping.rb @@ -0,0 +1,42 @@ +# XSD4R - XML Mapping for Ruby +# Copyright (C) 2005 NAKAMURA, Hiroshi . + +# 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/parser" +require 'soap/encodingstyle/literalHandler' +require "soap/generator" +require "soap/mapping" +require "soap/mapping/wsdlliteralregistry" + + +module XSD + + +module Mapping + MappingRegistry = SOAP::Mapping::WSDLLiteralRegistry.new + MappingOpt = {:default_encodingstyle => SOAP::LiteralNamespace} + + def self.obj2xml(obj, elename = nil, io = nil) + if !elename.nil? and !elename.is_a?(XSD::QName) + elename = XSD::QName.new(nil, elename) + end + elename ||= XSD::QName.new(nil, SOAP::Mapping.name2elename(obj.class.to_s)) + soap = SOAP::Mapping.obj2soap(obj, MappingRegistry) + soap.elename = elename + generator = SOAP::SOAPGenerator.new(MappingOpt) + generator.generate(soap, io) + end + + def self.xml2obj(stream) + parser = SOAP::Parser.new(MappingOpt) + soap = parser.parse(stream) + SOAP::Mapping.soap2obj(soap, MappingRegistry) + end +end + + +end diff --git a/lib/xsd/namedelements.rb b/lib/xsd/namedelements.rb index f4d7c4f5a..a13396bb7 100644 --- a/lib/xsd/namedelements.rb +++ b/lib/xsd/namedelements.rb @@ -1,5 +1,5 @@ # XSD4R - WSDL named element collection. -# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi . +# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi . # 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; @@ -23,6 +23,12 @@ class NamedElements o end + def freeze + super + @elements.freeze + self + end + def empty? size == 0 end @@ -43,6 +49,10 @@ class NamedElements @elements.find { |item| item.name.name == name } end + def keys + collect { |element| element.name } + end + def each @elements.each do |element| yield(element) @@ -69,6 +79,8 @@ class NamedElements self end + Empty = NamedElements.new.freeze + protected def elements=(rhs) diff --git a/lib/xsd/ns.rb b/lib/xsd/ns.rb index 66bd9caf4..b63a8a5cd 100644 --- a/lib/xsd/ns.rb +++ b/lib/xsd/ns.rb @@ -1,5 +1,5 @@ # XSD4R - XML Schema Namespace library -# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . +# Copyright (C) 2000-2003, 2005 NAKAMURA, Hiroshi . # 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; @@ -20,7 +20,7 @@ class NS def assign(ns) @count += 1 - "n#{ @count }" + "n#{@count}" end end @@ -54,7 +54,7 @@ public end def assigned?(ns) - @ns2tag.key?(ns) + @default_namespace == ns or @ns2tag.key?(ns) end def assigned_tag?(tag) @@ -74,7 +74,7 @@ public elsif @ns2tag.key?(name.namespace) @ns2tag[name.namespace] + ':' << name.name else - raise FormatError.new('Namespace: ' << name.namespace << ' not defined yet.') + raise FormatError.new("namespace: #{name.namespace} not defined yet") end end @@ -83,7 +83,7 @@ public return true if (name == rhs) end @tag2ns.each do |assigned_tag, assigned_ns| - if assigned_ns == ns && "#{ assigned_tag }:#{ name }" == rhs + if assigned_ns == ns && "#{assigned_tag}:#{name}" == rhs return true end end @@ -103,22 +103,22 @@ public end # For local attribute key parsing - # + # # => - # {}bar, {urn:}baz + # {}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) + raise FormatError.new("unknown namespace qualifier: #{$1}") end elsif $1 ns = nil name = $1 else - raise FormatError.new("Illegal element format: #{ elem }") + raise FormatError.new("illegal element format: #{elem}") end XSD::QName.new(ns, name) end diff --git a/lib/xsd/qname.rb b/lib/xsd/qname.rb index ed1fa41f9..18b002764 100644 --- a/lib/xsd/qname.rb +++ b/lib/xsd/qname.rb @@ -24,6 +24,12 @@ class QName XSD::QName.new(@namespace, name) end + def dump + ns = @namespace.nil? ? 'nil' : @namespace.dump + name = @name.nil? ? 'nil' : @name.dump + "XSD::QName.new(#{ns}, #{name})" + end + def match(rhs) unless self.class === rhs return false diff --git a/lib/xsd/xmlparser.rb b/lib/xsd/xmlparser.rb index 1f87ae2e4..e79e36c58 100644 --- a/lib/xsd/xmlparser.rb +++ b/lib/xsd/xmlparser.rb @@ -45,8 +45,8 @@ end # Try to load XML processor. loaded = false [ - 'xsd/xmlparser/xmlscanner', 'xsd/xmlparser/xmlparser', + 'xsd/xmlparser/xmlscanner', 'xsd/xmlparser/rexmlparser', ].each do |lib| begin diff --git a/lib/xsd/xmlparser/xmlscanner.rb b/lib/xsd/xmlparser/xmlscanner.rb index c2ad51be5..c80dc2391 100644 --- a/lib/xsd/xmlparser/xmlscanner.rb +++ b/lib/xsd/xmlparser/xmlscanner.rb @@ -1,5 +1,5 @@ # XSD4R - XMLScan XML parser library. -# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi . +# Copyright (C) 2002, 2003, 2005 NAKAMURA, Hiroshi . # 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; @@ -21,12 +21,12 @@ class XMLScanner < XSD::XMLParser::Parser @attrs = {} @curattr = nil @scanner = XMLScan::XMLScanner.new(self) - @scanner.kcode = ::XSD::Charset.charset_str(charset) if charset + @scanner.kcode = XSD::Charset.charset_str(charset) if charset @scanner.parse(string_or_readable) end def scanner_kcode=(charset) - @scanner.kcode = ::XSD::Charset.charset_str(charset) if charset + @scanner.kcode = XSD::Charset.charset_str(charset) if charset self.xmldecl_encoding = charset end -- cgit