Changeset 1437

Timestamp:

02/08/05 23:35:36 (4 years ago)

Author:

nahi

Message:

let wsdl2ruby.rb and xsd2ruby.rb be a library. bin/wsdl2ruby.rb and bin/xsd2ruby.rb use these libraries. let tests use the libraries. fixes #69.

Files:

• trunk/bin/wsdl2ruby.rb (modified) (3 diffs)
• trunk/bin/xsd2ruby.rb (modified) (3 diffs)
• trunk/lib/wsdl/soap/wsdl2ruby.rb (added)
• trunk/lib/wsdl/xmlSchema/xsd2ruby.rb (added)
• trunk/test/wsdl/any/test_any.rb (modified) (1 diff)
• trunk/test/wsdl/marshal/test_wsdlmarshal.rb (modified) (2 diffs)
• trunk/test/wsdl/ref/test_ref.rb (modified) (1 diff)
• trunk/test/wsdl/simpletype/rpc/test_rpc.rb (modified) (2 diffs)
• trunk/test/wsdl/soap/wsdl2ruby/section/test_section.rb (modified) (2 diffs)
• trunk/test/wsdl/soap/wsdl2ruby/test_wsdl2ruby.rb (modified) (2 diffs)

trunk/bin/wsdl2ruby.rb

@@ -3 +3 @@
-require 'getoptlong'
-require 'logger'
-
-
-
-
-
-
-
-
-
+
+
-
-class WSDL2RubyApp < Logger::Application
@@ -32 +25 @@
-    super('app')
-    STDERR.sync = true
-    @wsdl_location = nil
-    @opt = nil
-    @wsdl = nil
-    @name = nil
-    self.level = Logger::FATAL
-  end
-
-  def run
-
-
+
+
+
+
+
+
-      self.level = Logger::FATAL
-    else
-      self.level = Logger::INFO
-    end
-
-
-
-
+
+
-    0
-  end
-
-  def create_file
-    create_classdef if @opt.key?('classdef')
-    create_servant_skelton(@opt['servant_skelton']) if @opt.key?('servant_skelton')
-    create_cgi_stub(@opt['cgi_stub']) if @opt.key?('cgi_stub')
-    create_standalone_server_stub(@opt['standalone_server_stub']) if @opt.key?('standalone_server_stub')
-    create_driver(@opt['driver']) if @opt.key?('driver')
-    create_client_skelton(@opt['client_skelton']) if @opt.key?('client_skelton')
-  end
-
@@ -139 +121 @@
-    return wsdl, opt
-  end
-
-  def create_classdef
-    log(INFO) { "Creating class definition." }
-    @classdef_filename = @name + '.rb'
-    check_file(@classdef_filename) or return
-    File.open(@classdef_filename, "w") do |f|
-      f << WSDL::SOAP::ClassDefCreator.new(@wsdl).dump
-    end
-  end
-
-  def create_client_skelton(servicename)
-    log(INFO) { "Creating client skelton." }
-    servicename ||= @wsdl.services[0].name.name
-    @client_skelton_filename = servicename + 'Client.rb'
-    check_file(@client_skelton_filename) or return
-    File.open(@client_skelton_filename, "w") do |f|
-      f << shbang << "\n"
-      f << "require '#{ @driver_filename }'\n\n" if @driver_filename
-      f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl).dump(
-        create_name(servicename))
-    end
-  end
-
-  def create_servant_skelton(porttypename)
-    log(INFO) { "Creating servant skelton." }
-    @servant_skelton_filename = (porttypename || @name + 'Servant') + '.rb'
-    check_file(@servant_skelton_filename) or return
-    File.open(@servant_skelton_filename, "w") do |f|
-      f << "require '#{ @classdef_filename }'\n\n" if @classdef_filename
-      f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl).dump(
-        create_name(porttypename))
-    end
-  end
-
-  def create_cgi_stub(servicename)
-    log(INFO) { "Creating CGI stub." }
-    servicename ||= @wsdl.services[0].name.name
-    @cgi_stubFilename = servicename + '.cgi'
-    check_file(@cgi_stubFilename) or return
-    File.open(@cgi_stubFilename, "w") do |f|
-      f << shbang << "\n"
-      if @servant_skelton_filename
-        f << "require '#{ @servant_skelton_filename }'\n\n"
-      end
-      f << WSDL::SOAP::CGIStubCreator.new(@wsdl).dump(create_name(servicename))
-    end
-  end
-
-  def create_standalone_server_stub(servicename)
-    log(INFO) { "Creating standalone stub." }
-    servicename ||= @wsdl.services[0].name.name
-    @standalone_server_stub_filename = servicename + '.rb'
-    check_file(@standalone_server_stub_filename) or return
-    File.open(@standalone_server_stub_filename, "w") do |f|
-      f << shbang << "\n"
-      f << "require '#{ @servant_skelton_filename }'\n\n" if @servant_skelton_filename
-      f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl).dump(
-        create_name(servicename))
-    end
-  end
-
-  def create_driver(porttypename)
-    log(INFO) { "Creating driver." }
-    @driver_filename = (porttypename || @name) + 'Driver.rb'
-    check_file(@driver_filename) or return
-    File.open(@driver_filename, "w") do |f|
-      f << "require '#{ @classdef_filename }'\n\n" if @classdef_filename
-      f << WSDL::SOAP::DriverCreator.new(@wsdl).dump(
-        create_name(porttypename))
-    end
-  end
-
-  def check_file(filename)
-    if FileTest.exist?(filename)
-      if @opt.key?('force')
-        log(WARN) {
-          "File '#{ filename }' exists but overrides it."
-        }
-        true
-      else
-        log(WARN) {
-          "File '#{ filename }' exists.  #{ $0 } did not override it."
-        }
-        false
-      end
-    else
-      log(INFO) { "Creates file '#{ filename }'." }
-      true
-    end
-  end
-
-  def shbang
-    "#!/usr/bin/env ruby"
-  end
-
-  def create_name(name)
-    name ? XSD::QName.new(@wsdl.targetnamespace, name) : nil
-  end
-
-  def import(location)
-    WSDL::Importer.import(location)
-  end
-end
-

trunk/bin/xsd2ruby.rb

@@ -3 +3 @@
-require 'getoptlong'
-require 'logger'
-
-
-
-
-
+
+
-
-class XSD2RubyApp < Logger::Application
@@ -21 +18 @@
-  def initialize
-    super('app')
-
-
-
-
+
-    self.level = Logger::FATAL
-  end
-
-  def run
-
-
+
+
+
+
+
+
-      self.level = Logger::FATAL
-    else
-      self.level = Logger::INFO
-    end
-
-
-
-
+
+
-    0
-  end
-
-  def create_file
-    create_classdef
-  end
-
@@ -86 +78 @@
-    return xsd, opt
-  end
-
-  def create_classdef
-    log(INFO) { "Creating class definition." }
-    @classdef_filename = @name + '.rb'
-    check_file(@classdef_filename) or return
-    File.open(@classdef_filename, "w") do |f|
-      f << WSDL::SOAP::ClassDefCreator.new(@xsd).dump
-    end
-  end
-
-  def check_file(filename)
-    if FileTest.exist?(filename)
-      if @opt.key?('force')
-        log(WARN) {
-          "File '#{ filename }' exists but overrides it."
-        }
-        true
-      else
-        log(WARN) {
-          "File '#{ filename }' exists.  #{ $0 } did not override it."
-        }
-        false
-      end
-    else
-      log(INFO) { "Creates file '#{ filename }'." }
-      true
-    end
-  end
-
-  def create_classname(xsd)
-    name = xsd.targetnamespace.scan(/[a-zA-Z0-9]+$/)[0]
-    if name.nil?
-      'default'
-    else
-      XSD::CodeGen::GenSupport.safevarname(name)
-    end
-  end
-
-  def import(location)
-    WSDL::XMLSchema::Importer.import(location)
-  end
-end
-

trunk/test/wsdl/any/test_any.rb

@@ -11 +11 @@
-
-  def test_any
-
+
+
+
+
+
+
+
+
+
+
+
-    compare("expectedDriver.rb", "echoDriver.rb")
-    compare("expectedEcho.rb", "echo.rb")

trunk/test/wsdl/marshal/test_wsdlmarshal.rb

@@ -3 +3 @@
-require 'soap/mapping/wsdlencodedregistry'
-require 'soap/marshal'
+require 'wsdl/soap/wsdl2ruby'
-
-class WSDLMarshaller
@@ -55 +56 @@
-
-  def test_classdef
-
+
+
+
+
+
+
+
-    compare("person_org.rb", "Person.rb")
-    File.unlink(pathname('Person.rb'))

trunk/test/wsdl/ref/test_ref.rb

@@ -76 +76 @@
-
-  def test_classdef
-
+
+
+
+
+
+
+
-    compare("expectedProduct.rb", "product.rb")
-    File.unlink(pathname('product.rb'))

trunk/test/wsdl/simpletype/rpc/test_rpc.rb

@@ -1 +1 @@
-require 'test/unit'
-require 'wsdl/parser'
+require 'wsdl/soap/wsdl2ruby'
+
+
-module WSDL; module SimpleType
-
@@ -11 +14 @@
-
-  def test_rpc
-
+
+
+
+
+
+
+
+
+
+
+
-    compare("expectedEchoVersion.rb", "echo_version.rb")
-    compare("expectedDriver.rb", "echo_versionDriver.rb")

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

@@ -1 +1 @@
-require 'test/unit'
-require 'soap/marshal'
-; module WSDL2Ruby
+
-
-
@@ -46 +46 @@
-
-
-; end
+

trunk/test/wsdl/soap/wsdl2ruby/test_wsdl2ruby.rb

@@ -1 +1 @@
-require 'test/unit'
-require 'wsdl/parser'
-; module WSDL2Ruby
+
-
-
@@ -47 +47 @@
-
-
-; end
+