soap4r 1.5.7 → 1.5.8

data/test/wsdl/soap/wsdl2ruby/soapenc/test_soapenc.rb

@@ -31,7 +31,7 @@ class TestSOAPENC < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('echo.rb'))
     end

data/test/wsdl/soaptype/test_soaptype.rb

@@ -40,7 +40,7 @@ class TestSOAPTYPE < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('echo.rb'))
       File.unlink(pathname('echoMappingRegistry.rb'))

data/test/wsdl/test_multiplefault.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'wsdl/parser'
 require 'wsdl/soap/classDefCreator'
+require 'wsdl/soap/classNameCreator'
 
 
 module WSDL
@@ -13,7 +14,8 @@ class TestMultipleFault < Test::Unit::TestCase
 
   def test_multiplefault
     @wsdl = WSDL::Parser.new.parse(File.open(@@filename) { |f| f.read })
-    classdefstr = WSDL::SOAP::ClassDefCreator.new(@wsdl).dump
+    name_creator = WSDL::SOAP::ClassNameCreator.new
+    classdefstr = WSDL::SOAP::ClassDefCreator.new(@wsdl, name_creator).dump
     yield_eval_binding(classdefstr) do |b|
       assert_equal(
 	WSDL::TestMultipleFault::AuthenticationError,

data/test/xsd/codegen/test_classdef.rb

@@ -91,6 +91,36 @@ class TestClassDefCreator < Test::Unit::TestCase
     EOD
   end
 
+  def test_innermodule
+    c = ClassDef.new("Foo")
+    c.def_const("BAR", 1)
+    c.def_method('baz') { "Qux.new.quxx" }
+    c2 = ClassDef.new("Qux")
+    c2.def_method('quxx') { "Quxx::QUXXX" }
+    m3 = ModuleDef.new("Quxx")
+    m3.def_const("QUXXX", 2)
+    c.innermodule << c2 << m3
+    assert_equal(format(<<-EOD), c.dump)
+      class Foo
+        BAR = 1
+
+        class Qux
+          def quxx
+            Quxx::QUXXX
+          end
+        end
+
+        module Quxx
+          QUXXX = 2
+        end
+
+        def baz
+          Qux.new.quxx
+        end
+      end
+    EOD
+  end
+
   def test_full
     c = ClassDef.new("Foo::Bar::HobbitName", String)
     c.def_require("foo/bar")

data/test/xsd/test_ns.rb

@@ -14,6 +14,27 @@ class TestNS < Test::Unit::TestCase
       XSD::QName.new(XSD::NS::Namespace, "lang")]
     assert_equal("EN", lang)
   end
+
+  def test_no_default_namespace
+    env = SOAP::Processor.unmarshal(NO_DEFAULT_NAMESPACE)
+    array = env.body.root_node["array"]
+    item = array["item"]
+    assert_equal("urn:ns", array.elename.namespace)
+    assert_equal(nil, item.elename.namespace)
+  end
+
+NO_DEFAULT_NAMESPACE = <<__XML__
+<?xml version="1.0" encoding="utf-8"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+  <env:Body>
+    <response xmlns="urn:ns">
+      <array>
+        <item attr="1" xmlns=""/>
+      </array>
+    </response>
+  </env:Body>
+</env:Envelope>
+__XML__
 end
 
 

data/test/xsd/test_xsd.rb

@@ -445,7 +445,7 @@ class TestXSD < Test::Unit::TestCase
     targets = [
       "P1Y2M3DT4H5M6S",
       "P1234Y5678M9012DT3456H7890M1234.5678S",
-      "P0DT3456H7890M1234.5678S",
+      "PT3456H7890M1234.5678S",
       "P1234Y5678M9012D",
       "-P1234Y5678M9012DT3456H7890M1234.5678S",
       "P5678M9012DT3456H7890M1234.5678S",
@@ -457,12 +457,13 @@ class TestXSD < Test::Unit::TestCase
       "P123400000000000Y",
       "-P567800000000000M",
       "+P901200000000000D",
-      "P0DT345600000000000H",
-      "-P0DT789000000000000M",
-      "+P0DT123400000000000.000000000005678S",
+      "PT345600000000000H",
+      "-PT789000000000000M",
+      "+PT123400000000000.000000000005678S",
       "P1234YT1234.5678S",
       "-P5678MT7890M",
       "+P9012DT3456H",
+      "PT5S",
     ]
     targets.each do |str|
       assert_parsed_result(XSD::XSDDuration, str)

data/test/xsd/xsd2ruby/expected_mysample.rb

@@ -1,9 +1,10 @@
 require 'xsd/qname'
 
-module XSD::XSD2Ruby
+module XSD; module XSD2Ruby
 
 
 # {urn:mysample}question
+#   something - SOAP::SOAPString
 class Question
   attr_accessor :something
 
@@ -13,6 +14,11 @@ class Question
 end
 
 # {urn:mysample}section
+#   sectionID - SOAP::SOAPInt
+#   name - SOAP::SOAPString
+#   description - SOAP::SOAPString
+#   index - SOAP::SOAPInt
+#   firstQuestion - XSD::XSD2Ruby::Question
 class Section
   attr_accessor :sectionID
   attr_accessor :name
@@ -34,6 +40,11 @@ class SectionArray < ::Array
 end
 
 # {urn:mysample}sectionElement
+#   sectionID - SOAP::SOAPInt
+#   name - SOAP::SOAPString
+#   description - SOAP::SOAPString
+#   index - SOAP::SOAPInt
+#   firstQuestion - XSD::XSD2Ruby::Question
 class SectionElement
   attr_accessor :sectionID
   attr_accessor :name
@@ -51,4 +62,4 @@ class SectionElement
 end
 
 
-end
+end; end

data/test/xsd/xsd2ruby/expected_mysample_mapping_registry.rb

@@ -4,13 +4,12 @@ require 'mysample.rb'
 module XSD; module XSD2Ruby
 
 module MysampleMappingRegistry
+  NsMysample = "urn:mysample"
   Registry = ::SOAP::Mapping::LiteralRegistry.new
 
   Registry.register(
     :class => XSD::XSD2Ruby::Question,
-    :schema_ns => "urn:mysample",
-    :schema_type => "question",
-    :schema_qualified => false,
+    :schema_type => XSD::QName.new(NsMysample, "question"),
     :schema_element => [
       ["something", ["SOAP::SOAPString", XSD::QName.new(nil, "something")]]
     ]
@@ -18,9 +17,7 @@ module MysampleMappingRegistry
 
   Registry.register(
     :class => XSD::XSD2Ruby::Section,
-    :schema_ns => "urn:mysample",
-    :schema_type => "section",
-    :schema_qualified => false,
+    :schema_type => XSD::QName.new(NsMysample, "section"),
     :schema_element => [
       ["sectionID", ["SOAP::SOAPInt", XSD::QName.new(nil, "sectionID")]],
       ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]],
@@ -32,8 +29,7 @@ module MysampleMappingRegistry
 
   Registry.register(
     :class => XSD::XSD2Ruby::SectionArray,
-    :schema_ns => "urn:mysample",
-    :schema_type => "sectionArray",
+    :schema_type => XSD::QName.new(NsMysample, "sectionArray"),
     :schema_element => [
       ["element", ["XSD::XSD2Ruby::Section[]", XSD::QName.new(nil, "element")], [1, nil]]
     ]
@@ -41,9 +37,7 @@ module MysampleMappingRegistry
 
   Registry.register(
     :class => XSD::XSD2Ruby::SectionElement,
-    :schema_ns => "urn:mysample",
-    :schema_name => "sectionElement",
-    :schema_qualified => true,
+    :schema_name => XSD::QName.new(NsMysample, "sectionElement"),
     :schema_element => [
       ["sectionID", ["SOAP::SOAPInt", XSD::QName.new(nil, "sectionID")]],
       ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]],

data/test/xsd/xsd2ruby/section.xsd

@@ -11,6 +11,14 @@
     </xsd:sequence>
   </xsd:complexType>
 
+  <xsd:element name="section">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="different" type="xsd:int" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
   <xsd:complexType name="section">
     <xsd:sequence>
       <xsd:element name="sectionID" type="xsd:int" />

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: soap4r
 version: !ruby/object:Gem::Version 
-  version: 1.5.7
-date: 2007-07-16 00:00:00 +09:00
+  version: 1.5.8
+date: 2007-09-24 00:00:00 +09:00
 summary: An implementation of SOAP 1.1 for Ruby.
 require_paths: 
 - lib
@@ -31,6 +31,7 @@ authors:
 files: 
 - bin/wsdl2ruby.rb
 - bin/xsd2ruby.rb
+- lib/tags
 - lib/xsd
 - lib/xsd/datatypes.rb
 - lib/xsd/namedelements.rb
@@ -55,17 +56,24 @@ files:
 - lib/xsd/datatypes1999.rb
 - lib/wsdl
 - lib/wsdl/xmlSchema
+- lib/wsdl/xmlSchema/fractiondigits.rb
 - lib/wsdl/xmlSchema/union.rb
+- lib/wsdl/xmlSchema/importHandler.rb
+- lib/wsdl/xmlSchema/minexclusive.rb
 - lib/wsdl/xmlSchema/complexRestriction.rb
+- lib/wsdl/xmlSchema/totaldigits.rb
+- lib/wsdl/xmlSchema/group.rb
 - lib/wsdl/xmlSchema/include.rb
 - lib/wsdl/xmlSchema/annotation.rb
 - lib/wsdl/xmlSchema/content.rb
+- lib/wsdl/xmlSchema/maxexclusive.rb
 - lib/wsdl/xmlSchema/element.rb
 - lib/wsdl/xmlSchema/choice.rb
 - lib/wsdl/xmlSchema/unique.rb
 - lib/wsdl/xmlSchema/sequence.rb
 - lib/wsdl/xmlSchema/list.rb
 - lib/wsdl/xmlSchema/any.rb
+- lib/wsdl/xmlSchema/maxinclusive.rb
 - lib/wsdl/xmlSchema/attribute.rb
 - lib/wsdl/xmlSchema/complexType.rb
 - lib/wsdl/xmlSchema/enumeration.rb
@@ -75,14 +83,18 @@ files:
 - lib/wsdl/xmlSchema/simpleType.rb
 - lib/wsdl/xmlSchema/parser.rb
 - lib/wsdl/xmlSchema/pattern.rb
+- lib/wsdl/xmlSchema/whitespace.rb
 - lib/wsdl/xmlSchema/all.rb
 - lib/wsdl/xmlSchema/schema.rb
 - lib/wsdl/xmlSchema/xsd2ruby.rb
 - lib/wsdl/xmlSchema/simpleContent.rb
+- lib/wsdl/xmlSchema/mininclusive.rb
 - lib/wsdl/xmlSchema/complexContent.rb
+- lib/wsdl/xmlSchema/anyAttribute.rb
 - lib/wsdl/xmlSchema/minlength.rb
 - lib/wsdl/xmlSchema/simpleExtension.rb
 - lib/wsdl/xmlSchema/simpleRestriction.rb
+- lib/wsdl/xmlSchema/attributeGroup.rb
 - lib/wsdl/xmlSchema/data.rb
 - lib/wsdl/xmlSchema/import.rb
 - lib/wsdl/xmlSchema/importer.rb
@@ -99,6 +111,7 @@ files:
 - lib/wsdl/types.rb
 - lib/wsdl/part.rb
 - lib/wsdl/soap
+- lib/wsdl/soap/servletStubCreator.rb
 - lib/wsdl/soap/body.rb
 - lib/wsdl/soap/methodDefCreator.rb
 - lib/wsdl/soap/encodedMappingRegistryCreator.rb
@@ -120,6 +133,7 @@ files:
 - lib/wsdl/soap/headerfault.rb
 - lib/wsdl/soap/classDefCreator.rb
 - lib/wsdl/soap/mappingRegistryCreator.rb
+- lib/wsdl/soap/classNameCreator.rb
 - lib/wsdl/soap/binding.rb
 - lib/wsdl/soap/data.rb
 - lib/wsdl/soap/header.rb
@@ -165,6 +179,7 @@ files:
 - lib/soap/mapping/wsdlliteralregistry.rb
 - lib/soap/mapping/schemadefinition.rb
 - lib/soap/mapping/literalregistry.rb
+- lib/soap/nestedexception.rb
 - lib/soap/element.rb
 - lib/soap/charset.rb
 - lib/soap/qname.rb
@@ -183,6 +198,7 @@ files:
 - lib/soap/header
 - lib/soap/header/simplehandler.rb
 - lib/soap/header/handlerset.rb
+- lib/soap/header/mappinghandler.rb
 - lib/soap/header/handler.rb
 - lib/soap/property.rb
 - lib/soap/attachment.rb
@@ -191,6 +207,7 @@ files:
 - lib/soap/standaloneServer.rb
 - lib/soap/server.rb
 - lib/soap/rpcRouter.rb
+- lib/soap/ns.rb
 - lib/soap/compat.rb
 - lib/soap/soap.rb
 - lib/soap/namespace.rb
@@ -261,11 +278,11 @@ files:
 - test/wsdl/raa
 - test/wsdl/raa/README.txt
 - test/wsdl/raa/RAAService.rb
-- test/wsdl/raa/RAAServant.rb
-- test/wsdl/raa/RAA.rb
 - test/wsdl/raa/raa.wsdl
 - test/wsdl/raa/test_raa.rb
-- test/wsdl/raa/server.rb
+- test/wsdl/raa/expectedDriver.rb
+- test/wsdl/raa/expectedMappingRegistry.rb
+- test/wsdl/raa/expectedClassDef.rb
 - test/wsdl/document
 - test/wsdl/document/test_rpc.rb
 - test/wsdl/document/test_number.rb
@@ -278,6 +295,7 @@ files:
 - test/wsdl/document/test_nosoapaction.rb
 - test/wsdl/any
 - test/wsdl/any/expectedDriver.rb
+- test/wsdl/any/expectedMappingRegistry.rb
 - test/wsdl/any/expectedEcho.rb
 - test/wsdl/any/any.wsdl
 - test/wsdl/any/test_any.rb
@@ -304,7 +322,6 @@ files:
 - test/wsdl/map/map.wsdl
 - test/wsdl/map/test_map.rb
 - test/wsdl/axisArray
-- test/wsdl/axisArray/itemList.rb
 - test/wsdl/axisArray/test_axisarray.rb
 - test/wsdl/axisArray/axisArray.wsdl
 - test/wsdl/qualified
@@ -333,9 +350,21 @@ files:
 - test/wsdl/soap/wsdl2ruby/expectedServant.rb
 - test/wsdl/soap/wsdl2ruby/expectedService.rb
 - test/wsdl/soap/wsdl2ruby/test_wsdl2ruby.rb
+- test/wsdl/anonymous
+- test/wsdl/anonymous/test_anonymous.rb
+- test/wsdl/anonymous/expectedDriver.rb
+- test/wsdl/anonymous/expectedMappingRegistry.rb
+- test/wsdl/anonymous/expectedClassDef.rb
+- test/wsdl/anonymous/lp.wsdl
 - test/wsdl/oneway
 - test/wsdl/oneway/test_oneway.rb
 - test/wsdl/oneway/oneway.wsdl
+- test/wsdl/group
+- test/wsdl/group/expectedClassdef.rb
+- test/wsdl/group/test_rpc.rb
+- test/wsdl/group/group.wsdl
+- test/wsdl/group/expectedDriver.rb
+- test/wsdl/group/expectedMappingRegistry.rb
 - test/wsdl/soaptype
 - test/wsdl/soaptype/soaptype.wsdl
 - test/wsdl/soaptype/test_soaptype.rb
@@ -432,6 +461,8 @@ files:
 - test/soap/marshal/test_struct.rb
 - test/soap/marshal/test_marshal.rb
 - test/soap/marshal/marshaltestlib.rb
+- test/soap/test_generator.rb
+- test/soap/test_nestedexception.rb
 - test/soap/helloworld
 - test/soap/helloworld/test_helloworld.rb
 - test/soap/helloworld/hw_s.rb
@@ -497,6 +528,7 @@ files:
 - test/soap/swa
 - test/soap/swa/test_file.rb
 - test/soap/fault
+- test/soap/fault/test_soaparray.rb
 - test/soap/fault/test_customfault.rb
 - test/soap/test_mapping.rb
 - test/16runner.rb
@@ -521,5 +553,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.1.1
     version: 

data/test/wsdl/axisArray/itemList.rb

@@ -1,14 +0,0 @@
-require 'xsd/qname'
-
-# {urn:jp.gr.jin.rrr.example.itemListType}Item
-class Item
-  attr_accessor :name
-
-  def initialize(name = nil)
-    @name = name
-  end
-end
-
-# {urn:jp.gr.jin.rrr.example.itemListType}ItemList
-class ItemList < ::Array
-end

data/test/wsdl/raa/RAA.rb

@@ -1,120 +0,0 @@
-require 'xsd/qname'
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Category
-class Category
-  @@schema_type = "Category"
-  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
-  @@schema_element = [
-    ["major", ["SOAP::SOAPString", XSD::QName.new(nil, "major")]],
-    ["minor", ["SOAP::SOAPString", XSD::QName.new(nil, "minor")]]
-  ]
-
-  attr_accessor :major
-  attr_accessor :minor
-
-  def initialize(major = nil, minor = nil)
-    @major = major
-    @minor = minor
-  end
-end
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Product
-class Product
-  @@schema_type = "Product"
-  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
-  @@schema_element = [
-    ["id", ["SOAP::SOAPInt", XSD::QName.new(nil, "id")]],
-    ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]],
-    ["short_description", ["SOAP::SOAPString", XSD::QName.new(nil, "short_description")]],
-    ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
-    ["status", ["SOAP::SOAPString", XSD::QName.new(nil, "status")]],
-    ["homepage", ["SOAP::SOAPAnyURI", XSD::QName.new(nil, "homepage")]],
-    ["download", ["SOAP::SOAPAnyURI", XSD::QName.new(nil, "download")]],
-    ["license", ["SOAP::SOAPString", XSD::QName.new(nil, "license")]],
-    ["description", ["SOAP::SOAPString", XSD::QName.new(nil, "description")]]
-  ]
-
-  attr_accessor :id
-  attr_accessor :name
-  attr_accessor :short_description
-  attr_accessor :version
-  attr_accessor :status
-  attr_accessor :homepage
-  attr_accessor :download
-  attr_accessor :license
-  attr_accessor :description
-
-  def initialize(id = nil, name = nil, short_description = nil, version = nil, status = nil, homepage = nil, download = nil, license = nil, description = nil)
-    @id = id
-    @name = name
-    @short_description = short_description
-    @version = version
-    @status = status
-    @homepage = homepage
-    @download = download
-    @license = license
-    @description = description
-  end
-end
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Owner
-class Owner
-  @@schema_type = "Owner"
-  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
-  @@schema_element = [
-    ["id", ["SOAP::SOAPInt", XSD::QName.new(nil, "id")]],
-    ["email", ["SOAP::SOAPAnyURI", XSD::QName.new(nil, "email")]],
-    ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]]
-  ]
-
-  attr_accessor :id
-  attr_accessor :email
-  attr_accessor :name
-
-  def initialize(id = nil, email = nil, name = nil)
-    @id = id
-    @email = email
-    @name = name
-  end
-end
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Info
-class Info
-  @@schema_type = "Info"
-  @@schema_ns = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
-  @@schema_element = [
-    ["category", ["Category", XSD::QName.new(nil, "category")]],
-    ["product", ["Product", XSD::QName.new(nil, "product")]],
-    ["owner", ["Owner", XSD::QName.new(nil, "owner")]],
-    ["created", ["SOAP::SOAPDateTime", XSD::QName.new(nil, "created")]],
-    ["updated", ["SOAP::SOAPDateTime", XSD::QName.new(nil, "updated")]]
-  ]
-
-  attr_accessor :category
-  attr_accessor :product
-  attr_accessor :owner
-  attr_accessor :created
-  attr_accessor :updated
-
-  def initialize(category = nil, product = nil, owner = nil, created = nil, updated = nil)
-    @category = category
-    @product = product
-    @owner = owner
-    @created = created
-    @updated = updated
-  end
-end
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}InfoArray
-class InfoArray < ::Array
-  @@schema_element = [
-    ["item", ["Info", XSD::QName.new(nil, "item")]]
-  ]
-end
-
-# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}StringArray
-class StringArray < ::Array
-  @@schema_element = [
-    ["item", ["String", XSD::QName.new(nil, "item")]]
-  ]
-end