diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-22 13:03:38 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-22 13:03:38 +0000 |
commit | eb3f829be932514064a983eb98fa7f840137f985 (patch) | |
tree | c17440206af25b52f47b1c391f818e126a994d0a /lib/xsd/ns.rb | |
parent | 7aea792d3bdf42c349170e710953d7de29de57ab (diff) | |
download | ruby-eb3f829be932514064a983eb98fa7f840137f985.tar.gz |
* 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 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
Diffstat (limited to 'lib/xsd/ns.rb')
-rw-r--r-- | lib/xsd/ns.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/xsd/ns.rb b/lib/xsd/ns.rb index 66bd9caf43..b63a8a5cdd 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 <nahi@ruby-lang.org>. +# Copyright (C) 2000-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; @@ -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 - # <foo xmlns="urn:" xmlns:n1="urn:" bar="1" n1:baz="2" /> + # <foo xmlns="urn:a" xmlns:n1="urn:a" bar="1" n1:baz="2" /> # => - # {}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 |