soap4r 1.5.7 → 1.5.8

data/lib/xsd/mapping.rb

@@ -28,22 +28,30 @@ module Mapping
   end
 
   class Mapper
-    MAPPING_OPT = {:default_encodingstyle => SOAP::LiteralNamespace}
+    MAPPING_OPT = {
+      :default_encodingstyle => SOAP::LiteralNamespace,
+      :root_type_hint => true
+    }.freeze
 
     def initialize(registry)
       @registry = registry
     end
 
     def obj2xml(obj, elename = nil, io = nil)
-      if !elename.nil? and !elename.is_a?(XSD::QName)
-        elename = XSD::QName.new(nil, elename)
+      opt = MAPPING_OPT.dup
+      unless elename
+        if definition = @registry.elename_schema_definition_from_class(obj.class)
+          elename = definition.elename
+          opt[:root_type_hint] = false
+        end
       end
-      soap = SOAP::Mapping.obj2soap(obj, @registry, elename)
+      elename = SOAP::Mapping.to_qname(elename) if elename
+      soap = SOAP::Mapping.obj2soap(obj, @registry, elename, opt)
       if soap.elename.nil? or soap.elename == XSD::QName::EMPTY
         soap.elename =
           XSD::QName.new(nil, SOAP::Mapping.name2elename(obj.class.to_s))
       end
-      generator = SOAP::SOAPGenerator.new(MAPPING_OPT)
+      generator = SOAP::Generator.new(opt)
       generator.generate(soap, io)
     end
 

data/lib/xsd/namedelements.rb

@@ -94,6 +94,14 @@ class NamedElements
     @cache.clear
   end
 
+  def find_all
+    o = NamedElements.new
+    each do |ele|
+      o << ele if yield(ele)
+    end
+    o
+  end
+
   Empty = NamedElements.new.freeze
 
 protected

data/lib/xsd/ns.rb

@@ -15,12 +15,23 @@ module XSD
 class NS
   Namespace = 'http://www.w3.org/XML/1998/namespace'
 
+  KNOWN_TAG = {
+    XSD::Namespace => 'xsd',
+    XSD::InstanceNamespace => 'xsi',
+  }
+
   class Assigner
-    def initialize
+    attr_reader :known_tag
+
+    def initialize(known_tag)
+      @known_tag = known_tag.dup
       @count = 0
     end
 
     def assign(ns)
+      if @known_tag.key?(ns)
+        return @known_tag[ns]
+      end
       @count += 1
       "n#{@count}"
     end
@@ -34,18 +45,26 @@ public
 
   def initialize(tag2ns = nil)
     @tag2ns = tag2ns || ns_default
-    @assigner = nil
-    @ns2tag = {}
     @ns2tag = @tag2ns.invert
+    @assigner = nil
     @default_namespace = nil
   end
 
+  def known_tag
+    @assigner ||= Assigner.new(default_known_tag)
+    @assigner.known_tag
+  end
+
   def assign(ns, tag = nil)
-    if (tag == '')
-      @default_namespace = ns
+    if tag == ''
+      if ns.empty?
+        @default_namespace = nil
+      else
+        @default_namespace = ns
+      end
       tag
     else
-      @assigner ||= Assigner.new
+      @assigner ||= Assigner.new(default_known_tag)
       tag ||= @assigner.assign(ns)
       @ns2tag[ns] = tag
       @tag2ns[tag] = ns
@@ -57,24 +76,37 @@ public
     @default_namespace == ns or @ns2tag.key?(ns)
   end
 
+  def assigned_as_tagged?(ns)
+    @ns2tag.key?(ns)
+  end
+
   def assigned_tag?(tag)
     @tag2ns.key?(tag)
   end
 
   def clone_ns
-    cloned = NS.new(@tag2ns.dup)
+    cloned = self.class.new(@tag2ns.dup)
     cloned.assigner = @assigner
     cloned.assign(@default_namespace, '') if @default_namespace
     cloned
   end
 
-  def name(name)
-    if (name.namespace == @default_namespace)
-      name.name
-    elsif tag = @ns2tag[name.namespace]
-      "#{tag}:#{name.name}"
+  def name(qname)
+    if qname.namespace == @default_namespace
+      qname.name
+    elsif tag = @ns2tag[qname.namespace]
+      "#{tag}:#{qname.name}"
+    else
+      raise FormatError.new("namespace: #{qname.namespace} not defined yet")
+    end
+  end
+
+  # no default namespace
+  def name_attr(qname)
+    if tag = @ns2tag[qname.namespace]
+      "#{tag}:#{qname.name}"
     else
-      raise FormatError.new("namespace: #{name.namespace} not defined yet")
+      raise FormatError.new("namespace: #{qname.namespace} not defined yet")
     end
   end
 
@@ -91,7 +123,7 @@ public
   end
 
   # $1 and $2 are necessary.
-  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z')
+  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z', nil, 'NONE')
 
   def parse(str, local = false)
     if ParseRegexp =~ str
@@ -140,6 +172,10 @@ private
   def ns_default
     {'xml' => Namespace}
   end
+
+  def default_known_tag
+    KNOWN_TAG
+  end
 end
 
 

data/lib/xsd/qname.rb

@@ -24,8 +24,9 @@ class QName
     XSD::QName.new(@namespace, name)
   end
 
-  def dump
-    ns = @namespace.nil? ? 'nil' : @namespace.dump
+  def dump(predefined_ns = nil)
+    ns = predefined_ns
+    ns ||= @namespace.nil? ? 'nil' : @namespace.dump
     name = @name.nil? ? 'nil' : @name.dump
     "XSD::QName.new(#{ns}, #{name})"
   end

data/lib/xsd/xmlparser.rb

@@ -19,7 +19,7 @@ module XMLParser
   module_function :create_parser
 
   # $1 is necessary.
-  NSParseRegexp = Regexp.new('^xmlns:?(.*)$')
+  NSParseRegexp = Regexp.new('^xmlns:?(.*)$', nil, 'NONE')
 
   def filter_ns(ns, attrs)
     ns_updated = false
@@ -28,12 +28,13 @@ module XMLParser
     end
     newattrs = {}
     attrs.each do |key, value|
-      if (NSParseRegexp =~ key)
+      if NSParseRegexp =~ key
         unless ns_updated
           ns = ns.clone_ns
           ns_updated = true
         end
-	# '' means 'default namespace'.
+	# tag == '' means 'default namespace'
+        # value == '' means 'no default namespace'
 	tag = $1 || ''
 	ns.assign(value, tag)
       else

data/test/soap/asp.net/test_aspdotnet.rb

@@ -36,7 +36,7 @@ class TestASPDotNet < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     @client.reset_stream if @client
   end
 

data/test/soap/auth/test_basic.rb

@@ -15,7 +15,7 @@ class TestBasic < Test::Unit::TestCase
 
   def setup
     @logger = Logger.new(STDERR)
-    @logger.level = Logger::Severity::ERROR
+    @logger.level = Logger::Severity::FATAL
     @url = "http://localhost:#{Port}/"
     @proxyurl = "http://localhost:#{ProxyPort}/"
     @server = @proxyserver = @client = nil
@@ -25,9 +25,9 @@ class TestBasic < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_client
+    teardown_client if @server
     teardown_proxyserver if @proxyserver
-    teardown_server
+    teardown_server if @client
   end
 
   def setup_server
@@ -41,6 +41,7 @@ class TestBasic < Test::Unit::TestCase
     htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
     htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
     @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Logger => @logger,
       :Realm => 'auth',
       :UserDB => htpasswd_userdb
     )

data/test/soap/auth/test_digest.rb

@@ -15,7 +15,7 @@ class TestDigest < Test::Unit::TestCase
 
   def setup
     @logger = Logger.new(STDERR)
-    @logger.level = Logger::Severity::ERROR
+    @logger.level = Logger::Severity::FATAL
     @url = "http://localhost:#{Port}/"
     @proxyurl = "http://localhost:#{ProxyPort}/"
     @server = @proxyserver = @client = nil
@@ -25,9 +25,9 @@ class TestDigest < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_client
+    teardown_client if @client
     teardown_proxyserver if @proxyserver
-    teardown_server
+    teardown_server if @server
   end
 
   def setup_server
@@ -41,6 +41,7 @@ class TestDigest < Test::Unit::TestCase
     htdigest = File.join(File.dirname(__FILE__), 'htdigest')
     htdigest_userdb = WEBrick::HTTPAuth::Htdigest.new(htdigest)
     @digest_auth = WEBrick::HTTPAuth::DigestAuth.new(
+      :Logger => @logger,
       :Algorithm => 'MD5',
       :Realm => 'auth',
       :UserDB => htdigest_userdb

data/test/soap/calc/test_calc.rb

@@ -25,10 +25,12 @@ class TestCalc < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @calc.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @calc.reset_stream if @calc
   end
 
   def test_calc

data/test/soap/calc/test_calc2.rb

@@ -29,10 +29,12 @@ class TestCalc2 < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @var.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @var.reset_stream if @var
   end
 
   def test_calc2

data/test/soap/calc/test_calc_cgi.rb

@@ -45,10 +45,12 @@ class TestCalcCGI < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @calc.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @calc.reset_stream if @calc
   end
 
   def test_calc_cgi

data/test/soap/fault/test_customfault.rb

@@ -36,10 +36,12 @@ class TestCustomFault < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   def test_custom_fault

data/test/soap/fault/test_soaparray.rb

@@ -0,0 +1,35 @@
+require 'soap/rpc/router'
+require 'soap/mapping/mapping'
+require 'soap/processor'
+require 'test/unit'
+
+
+module SOAP
+module Fault
+
+
+class TestSOAPArray < Test::Unit::TestCase
+
+  # simulate the soap fault creation and parsing on the client
+  def test_parse_fault
+    router = SOAP::RPC::Router.new('parse_SOAPArray_error')
+    soap_fault = pump_stack rescue router.create_fault_response($!)
+    env = SOAP::Processor.unmarshal(soap_fault.send_string)
+    soap_fault = SOAP::FaultError.new(env.body.fault)
+    # in literal service, RuntimeError is raised (not an ArgumentError)
+    # any chance to use Ruby's exception encoding in literal service?
+    assert_raises(RuntimeError) do
+      registry = SOAP::Mapping::LiteralRegistry.new
+      SOAP::Mapping.fault2exception(soap_fault, registry)
+    end
+  end
+
+  def pump_stack(max = 0)
+    raise ArgumentError if max > 10
+    pump_stack(max+1)
+  end
+end
+
+
+end
+end

data/test/soap/filter/test_filter.rb

@@ -88,8 +88,8 @@ class TestFilter < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/header/test_authheader.rb

@@ -172,8 +172,8 @@ class TestAuthHeader < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/header/test_authheader_cgi.rb

@@ -84,9 +84,9 @@ class TestAuthHeaderCGI < Test::Unit::TestCase
   end
 
   def teardown
-    @supportclient.delete_sessiondb
-    teardown_server
-    teardown_client
+    @supportclient.delete_sessiondb if @supportclient
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/header/test_simplehandler.rb

@@ -89,8 +89,8 @@ class TestSimpleHandler < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/helloworld/test_helloworld.rb

@@ -24,10 +24,12 @@ class TestHelloWorld < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   def test_hello_world