soap4r 1.5.6 → 1.5.7

data/test/wsdl/qualified/test_qualified.rb

@@ -5,7 +5,7 @@ require 'soap/wsdlDriver'
 require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
-if defined?(HTTPAccess2)
+if defined?(HTTPClient)
 
 module WSDL
 

data/test/wsdl/qualified/test_unqualified.rb

@@ -5,7 +5,7 @@ require 'soap/wsdlDriver'
 require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
-if defined?(HTTPAccess2)
+if defined?(HTTPClient)
 
 module WSDL
 
@@ -87,20 +87,6 @@ class TestUnqualified < Test::Unit::TestCase
 
   LOGIN_REQUEST_QUALIFIED_UNTYPED =
 %q[<?xml version="1.0" encoding="utf-8" ?>
-<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <env:Body>
-    <n1:login xmlns:n1="urn:lp">
-      <username>NaHi</username>
-      <password>passwd</password>
-      <timezone>JST</timezone>
-    </n1:login>
-  </env:Body>
-</env:Envelope>]
-
-  LOGIN_REQUEST_QUALIFIED_TYPED =
-%q[<?xml version="1.0" encoding="utf-8" ?>
 <env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -138,7 +124,7 @@ class TestUnqualified < Test::Unit::TestCase
 
     @client.wiredump_dev = str = ''
     @client.login(Login.new('NaHi', 'passwd', 'JST'))
-    assert_equal(LOGIN_REQUEST_QUALIFIED_TYPED, parse_requestxml(str))
+    assert_equal(LOGIN_REQUEST_QUALIFIED_UNTYPED, parse_requestxml(str))
   end
 
   def parse_requestxml(str)

data/test/wsdl/rpc/test_rpc.rb

@@ -43,6 +43,7 @@ class TestRPC < Test::Unit::TestCase
     end
 
     def echo_basetype(arg1, arg2)
+      return nil if arg1.nil? and arg2.nil?
       raise unless arg1.is_a?(Date)
       arg1
     end
@@ -158,6 +159,8 @@ class TestRPC < Test::Unit::TestCase
     assert_nil(ret.family_name)
     assert_nil(ret.given_name)
     assert_nil(ret.age)
+    #
+    assert_nil(@client.echo_basetype(nil, nil))
   end
 
   def test_basetype_stub

data/test/wsdl/rpc/test_rpc_lit.rb

@@ -5,7 +5,7 @@ require 'soap/wsdlDriver'
 require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
-if defined?(HTTPAccess2) and defined?(OpenSSL)
+if defined?(HTTPClient) and defined?(OpenSSL)
 
 module WSDL; module RPC
 

data/test/wsdl/simpletype/rpc/expectedMappingRegistry.rb

@@ -10,7 +10,7 @@ module Echo_versionMappingRegistry
     :schema_ns => "urn:example.com:simpletype-rpc-type",
     :schema_type => "version_struct",
     :schema_element => [
-      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["version", ["Version", XSD::QName.new(nil, "version")]],
       ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
     ]
   )
@@ -39,7 +39,7 @@ module Echo_versionMappingRegistry
     :schema_type => "version_struct",
     :schema_qualified => false,
     :schema_element => [
-      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["version", ["Version", XSD::QName.new(nil, "version")]],
       ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
     ]
   )

data/test/wsdl/soap/wsdl2ruby/expectedMappingRegistry.rb

@@ -10,7 +10,7 @@ module Echo_versionMappingRegistry
     :schema_ns => "urn:example.com:simpletype-rpc-type",
     :schema_type => "version_struct",
     :schema_element => [
-      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["version", ["Version", XSD::QName.new(nil, "version")]],
       ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
     ]
   )
@@ -27,7 +27,7 @@ module Echo_versionMappingRegistry
     :schema_type => "version_struct",
     :schema_qualified => false,
     :schema_element => [
-      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["version", ["Version", XSD::QName.new(nil, "version")]],
       ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
     ]
   )

data/test/wsdl/soap/wsdl2ruby/section/test_section.rb

@@ -12,7 +12,7 @@ class TestSection < Test::Unit::TestCase
   RUBY = Config::CONFIG['RUBY_INSTALL_NAME']
 
   def setup
-    system("cd #{DIR} && #{RUBY} #{pathname("../../../../../bin/xsd2ruby.rb")} --xsd #{pathname("section.xsd")} --force --quiet")
+    system("cd #{DIR} && #{RUBY} #{pathname("../../../../../bin/xsd2ruby.rb")} --xsd #{pathname("section.xsd")} --classdef --force --quiet")
   end
 
   def teardown

data/test/xsd/xsd2ruby/expected_mysample.rb

@@ -0,0 +1,54 @@
+require 'xsd/qname'
+
+module XSD::XSD2Ruby
+
+
+# {urn:mysample}question
+class Question
+  attr_accessor :something
+
+  def initialize(something = nil)
+    @something = something
+  end
+end
+
+# {urn:mysample}section
+class Section
+  attr_accessor :sectionID
+  attr_accessor :name
+  attr_accessor :description
+  attr_accessor :index
+  attr_accessor :firstQuestion
+
+  def initialize(sectionID = nil, name = nil, description = nil, index = nil, firstQuestion = nil)
+    @sectionID = sectionID
+    @name = name
+    @description = description
+    @index = index
+    @firstQuestion = firstQuestion
+  end
+end
+
+# {urn:mysample}sectionArray
+class SectionArray < ::Array
+end
+
+# {urn:mysample}sectionElement
+class SectionElement
+  attr_accessor :sectionID
+  attr_accessor :name
+  attr_accessor :description
+  attr_accessor :index
+  attr_accessor :firstQuestion
+
+  def initialize(sectionID = nil, name = nil, description = nil, index = nil, firstQuestion = nil)
+    @sectionID = sectionID
+    @name = name
+    @description = description
+    @index = index
+    @firstQuestion = firstQuestion
+  end
+end
+
+
+end

data/test/xsd/xsd2ruby/expected_mysample_mapper.rb

@@ -0,0 +1,11 @@
+require 'mysample_mapping_registry.rb'
+
+module XSD; module XSD2Ruby
+
+class MysampleMapper < XSD::Mapping::Mapper
+  def initialize
+    super(MysampleMappingRegistry::Registry)
+  end
+end
+
+end; end

data/test/xsd/xsd2ruby/expected_mysample_mapping_registry.rb

@@ -0,0 +1,57 @@
+require 'xsd/mapping'
+require 'mysample.rb'
+
+module XSD; module XSD2Ruby
+
+module MysampleMappingRegistry
+  Registry = ::SOAP::Mapping::LiteralRegistry.new
+
+  Registry.register(
+    :class => XSD::XSD2Ruby::Question,
+    :schema_ns => "urn:mysample",
+    :schema_type => "question",
+    :schema_qualified => false,
+    :schema_element => [
+      ["something", ["SOAP::SOAPString", XSD::QName.new(nil, "something")]]
+    ]
+  )
+
+  Registry.register(
+    :class => XSD::XSD2Ruby::Section,
+    :schema_ns => "urn:mysample",
+    :schema_type => "section",
+    :schema_qualified => false,
+    :schema_element => [
+      ["sectionID", ["SOAP::SOAPInt", XSD::QName.new(nil, "sectionID")]],
+      ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]],
+      ["description", ["SOAP::SOAPString", XSD::QName.new(nil, "description")]],
+      ["index", ["SOAP::SOAPInt", XSD::QName.new(nil, "index")]],
+      ["firstQuestion", ["XSD::XSD2Ruby::Question", XSD::QName.new(nil, "firstQuestion")]]
+    ]
+  )
+
+  Registry.register(
+    :class => XSD::XSD2Ruby::SectionArray,
+    :schema_ns => "urn:mysample",
+    :schema_type => "sectionArray",
+    :schema_element => [
+      ["element", ["XSD::XSD2Ruby::Section[]", XSD::QName.new(nil, "element")], [1, nil]]
+    ]
+  )
+
+  Registry.register(
+    :class => XSD::XSD2Ruby::SectionElement,
+    :schema_ns => "urn:mysample",
+    :schema_name => "sectionElement",
+    :schema_qualified => true,
+    :schema_element => [
+      ["sectionID", ["SOAP::SOAPInt", XSD::QName.new(nil, "sectionID")]],
+      ["name", ["SOAP::SOAPString", XSD::QName.new(nil, "name")]],
+      ["description", ["SOAP::SOAPString", XSD::QName.new(nil, "description")]],
+      ["index", ["SOAP::SOAPInt", XSD::QName.new(nil, "index")]],
+      ["firstQuestion", ["XSD::XSD2Ruby::Question", XSD::QName.new(nil, "firstQuestion")]]
+    ]
+  )
+end
+
+end; end

data/test/xsd/xsd2ruby/section.xsd

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="urn:mysample"
+    xmlns:tns="urn:mysample"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:enc="http://schemas.xmlsoap.org/soap/encoding/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+  <xsd:complexType name="question">
+    <xsd:sequence>
+      <xsd:element name="something" type="xsd:string" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="section">
+    <xsd:sequence>
+      <xsd:element name="sectionID" type="xsd:int" />
+      <xsd:element name="name" type="xsd:string" />
+      <xsd:element name="description" type="xsd:string" />
+      <xsd:element name="index" type="xsd:int" />
+      <xsd:element name="firstQuestion" type="tns:question" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="sectionArray">
+    <xsd:sequence>
+      <xsd:element name="element" type="tns:section" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name="sectionElement">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="sectionID" type="xsd:int" />
+        <xsd:element name="name" type="xsd:string" />
+        <xsd:element name="description" type="xsd:string" />
+        <xsd:element name="index" type="xsd:int" />
+        <xsd:element name="firstQuestion" type="tns:question" />
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>

data/test/xsd/xsd2ruby/test_xsd2ruby.rb

@@ -0,0 +1,90 @@
+require 'test/unit'
+require 'wsdl/xmlSchema/xsd2ruby'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
+
+module XSD; module XSD2Ruby
+
+
+class TestXSD2Ruby < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def setup
+    Dir.chdir(DIR) do
+      gen = WSDL::XMLSchema::XSD2Ruby.new
+      gen.location = pathname("section.xsd")
+      gen.basedir = DIR
+      gen.logger.level = Logger::FATAL
+      gen.opt['module_path'] = "XSD::XSD2Ruby"
+      gen.opt['classdef'] = nil
+      gen.opt['mapping_registry'] = nil
+      gen.opt['mapper'] = nil
+      gen.opt['force'] = true
+      gen.run
+      TestUtil.require(DIR, 'mysample.rb', 'mysample_mapping_registry.rb', 'mysample_mapper.rb')
+    end
+  end
+
+  def teardown
+    unless $DEBUG
+      File.unlink(pathname("mysample.rb"))
+      File.unlink(pathname("mysample_mapping_registry.rb"))
+      File.unlink(pathname("mysample_mapper.rb"))
+    end
+    # leave generated file for debug.
+  end
+
+  def test_generate
+    compare("expected_mysample.rb", "mysample.rb")
+    compare("expected_mysample_mapping_registry.rb", "mysample_mapping_registry.rb")
+    compare("expected_mysample_mapper.rb", "mysample_mapper.rb")
+  end
+
+  def test_mapper
+    mapper = XSD::XSD2Ruby::MysampleMapper.new
+    # complexType
+    arg = XSD::XSD2Ruby::Section.new(10001, 'name', 'description', 1, Question.new("hello world"))
+    obj = mapper.xml2obj(mapper.obj2xml(arg))
+    assert_section_equal(arg, obj)
+    # element
+    arg = XSD::XSD2Ruby::SectionElement.new(10001, 'name', 'description', 1, Question.new("hello world"))
+    obj = mapper.xml2obj(mapper.obj2xml(arg))
+    assert_section_equal(arg, obj)
+    # array
+    ele = XSD::XSD2Ruby::Section.new(10001, 'name', 'description', 1, Question.new("hello world"))
+    arg = XSD::XSD2Ruby::SectionArray[ele, ele, ele]
+    obj = mapper.xml2obj(mapper.obj2xml(arg))
+    assert_equal(arg.class, obj.class)
+    assert_equal(arg.size, obj.size)
+    0.upto(arg.size - 1) do |idx|
+      assert_section_equal(arg[idx], obj[idx])
+    end
+  end
+
+private
+
+  def assert_section_equal(arg, obj)
+    assert_equal(arg.class, obj.class)
+    assert_equal(arg.sectionID, obj.sectionID)
+    assert_equal(arg.name, obj.name)
+    assert_equal(arg.description, obj.description)
+    assert_equal(arg.index, obj.index)
+    assert_equal(arg.firstQuestion.class, obj.firstQuestion.class)
+    assert_equal(arg.firstQuestion.something, obj.firstQuestion.something)
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def compare(expected, actual)
+    TestUtil.filecompare(pathname(expected), pathname(actual))
+  end
+
+  def loadfile(file)
+    File.open(pathname(file)) { |f| f.read }
+  end
+end
+
+
+end; end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: soap4r
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
-date: 2007-06-14 00:00:00 +09:00
+  version: 1.5.7
+date: 2007-07-16 00:00:00 +09:00
 summary: An implementation of SOAP 1.1 for Ruby.
 require_paths: 
 - lib
@@ -31,7 +31,6 @@ authors:
 files: 
 - bin/wsdl2ruby.rb
 - bin/xsd2ruby.rb
-- lib/tags
 - lib/xsd
 - lib/xsd/datatypes.rb
 - lib/xsd/namedelements.rb
@@ -51,7 +50,6 @@ files:
 - lib/xsd/xmlparser/parser.rb
 - lib/xsd/xmlparser/xmlparser.rb
 - lib/xsd/codegen.rb
-- lib/xsd/classloader.rb
 - lib/xsd/xmlparser.rb
 - lib/xsd/ns.rb
 - lib/xsd/datatypes1999.rb
@@ -135,6 +133,7 @@ files:
 - lib/soap/mappingRegistry.rb
 - lib/soap/filter
 - lib/soap/filter/filterchain.rb
+- lib/soap/filter/streamhandler.rb
 - lib/soap/filter/handler.rb
 - lib/soap/encodingstyle
 - lib/soap/encodingstyle/literalHandler.rb
@@ -162,7 +161,6 @@ files:
 - lib/soap/mapping/rubytypeFactory.rb
 - lib/soap/mapping/encodedregistry.rb
 - lib/soap/mapping/wsdlencodedregistry.rb
-- lib/soap/mapping/encodedregistry.rb~
 - lib/soap/mapping/factory.rb
 - lib/soap/mapping/wsdlliteralregistry.rb
 - lib/soap/mapping/schemadefinition.rb
@@ -208,6 +206,12 @@ files:
 - test/xsd
 - test/xsd/xmlschema.xml
 - test/xsd/test_xsd.rb
+- test/xsd/xsd2ruby
+- test/xsd/xsd2ruby/expected_mysample.rb
+- test/xsd/xsd2ruby/section.xsd
+- test/xsd/xsd2ruby/expected_mysample_mapper.rb
+- test/xsd/xsd2ruby/test_xsd2ruby.rb
+- test/xsd/xsd2ruby/expected_mysample_mapping_registry.rb
 - test/xsd/test_noencoding.rb
 - test/xsd/codegen
 - test/xsd/codegen/test_classdef.rb
@@ -233,11 +237,9 @@ files:
 - test/wsdl/abstract/abstract.wsdl
 - test/wsdl/rpc
 - test/wsdl/rpc/test_rpc.rb
-- test/wsdl/rpc/test-rpc-lit-qualified.wsdl
 - test/wsdl/rpc/test_rpc_lit.rb
 - test/wsdl/rpc/test-rpc-lit.wsdl
 - test/wsdl/rpc/rpc.wsdl
-- test/wsdl/rpc/test-rpc-lit12.wsdl
 - test/wsdl/test_multiplefault.rb
 - test/wsdl/marshal
 - test/wsdl/marshal/person.wsdl
@@ -346,6 +348,7 @@ files:
 - test/interopR2
 - test/interopR2/clientBEAWebLogic.rb
 - test/interopR2/client4S4C2.rb
+- test/interopR2/client.log
 - test/interopR2/rwikiInteropService.rb
 - test/interopR2/InteropTest.wsdl
 - test/interopR2/clientJSOAP.rb
@@ -374,7 +377,6 @@ files:
 - test/interopR2/clientSQLData.rb
 - test/interopR2/groupc.wsdl
 - test/interopR2/clientJAX-RPC.rb
-- test/interopR2/result_client.NetRemoting.txt
 - test/interopR2/iSimonReg.rb
 - test/interopR2/clientWhiteMesa.rb
 - test/interopR2/clienteSOAP.rb
@@ -461,8 +463,10 @@ files:
 - test/soap/test_envelopenamespace.rb
 - test/soap/struct
 - test/soap/struct/test_struct.rb
+- test/soap/test_nil.rb
 - test/soap/case
 - test/soap/case/test_mapping.rb
+- test/soap/test_cookie.rb
 - test/soap/test_property.rb
 - test/soap/test_streamhandler.rb
 - test/soap/header
@@ -478,19 +482,26 @@ files:
 - test/soap/styleuse/client.rb
 - test/soap/test_styleuse.rb
 - test/soap/test_no_indent.rb
+- test/soap/test_custom_ns.rb
+- test/soap/htpasswd
 - test/soap/literalArrayMapping
 - test/soap/literalArrayMapping/amazonEcDriver.rb
 - test/soap/literalArrayMapping/amazonresponse.xml
 - test/soap/literalArrayMapping/amazonEc.rb
 - test/soap/literalArrayMapping/test_definedarray.rb
+- test/soap/auth
+- test/soap/auth/htdigest
+- test/soap/auth/test_basic.rb
+- test/soap/auth/htpasswd
+- test/soap/auth/test_digest.rb
 - test/soap/swa
 - test/soap/swa/test_file.rb
 - test/soap/fault
 - test/soap/fault/test_customfault.rb
 - test/soap/test_mapping.rb
 - test/16runner.rb
-test_files: []
-
+test_files: 
+- test/runner.rb
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -502,5 +513,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: