lib/wsdl/soap/wsdl2ruby.rb in rubyjedi-soap4r-1.5.8.20100619003610 vs lib/wsdl/soap/wsdl2ruby.rb in rubyjedi-soap4r-2.0.2.1

@@ -1,15 +1,16 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - WSDL to ruby mapping library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <[e-mail]>.
 
 # 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;
 # either the dual license version in 2003, or any later version.
 
 
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'xsd/qname'
 require 'wsdl/importer'
 require 'wsdl/soap/classDefCreator'
 require 'wsdl/soap/servantSkeltonCreator'
 require 'wsdl/soap/driverCreator'
@@ -73,22 +74,24 @@
   def create_classdef
     @logger.info { "Creating class definition." }
     @classdef_filename = @name + '.rb'
     check_file(@classdef_filename) or return
     write_file(@classdef_filename) do |f|
-      f.puts "# encoding: ASCII-8BIT"
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
       f << WSDL::SOAP::ClassDefCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
 
   def create_mapping_registry
     @logger.info { "Creating mapping registry definition." }
     @mr_filename = @name + 'MappingRegistry.rb'
     check_file(@mr_filename) or return
     write_file(@mr_filename) do |f|
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@classdef_filename}'\n" if @classdef_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n" if @classdef_filename
       f << WSDL::SOAP::MappingRegistryCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
 
   def create_client_skelton(servicename)
@@ -97,23 +100,25 @@
     servicename ||= @wsdl.services[0].name.name
     @client_skelton_filename = servicename + 'Client.rb'
     check_file(@client_skelton_filename) or return
     write_file(@client_skelton_filename) do |f|
       f << shbang << "\n"
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@driver_filename}'\n\n" if @driver_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@driver_filename}'\n\n" if @driver_filename
       f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
   def create_servant_skelton(porttypename)
     @logger.info { "Creating servant skelton." }
     @servant_skelton_filename = (porttypename || @name + 'Servant') + '.rb'
     check_file(@servant_skelton_filename) or return
     write_file(@servant_skelton_filename) do |f|
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@classdef_filename}'\n\n" if @classdef_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n\n" if @classdef_filename
       f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(porttypename))
     end
   end
 
   def create_cgi_stub(servicename)
@@ -121,13 +126,14 @@
     servicename ||= @wsdl.services[0].name.name
     @cgi_stubFilename = servicename + '.cgi'
     check_file(@cgi_stubFilename) or return
     write_file(@cgi_stubFilename) do |f|
       f << shbang << "\n"
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::CGIStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
   def create_standalone_server_stub(servicename)
@@ -135,13 +141,14 @@
     servicename ||= @wsdl.services[0].name.name
     @standalone_server_stub_filename = servicename + '.rb'
     check_file(@standalone_server_stub_filename) or return
     write_file(@standalone_server_stub_filename) do |f|
       f << shbang << "\n"
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
   def create_servlet_stub(servicename)
@@ -149,13 +156,14 @@
     servicename ||= @wsdl.services[0].name.name
     @servlet_stub_filename = servicename + 'Servlet.rb'
     check_file(@servlet_stub_filename) or return
     write_file(@servlet_stub_filename) do |f|
       f << shbang << "\n"
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::ServletStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
   def create_driver(porttypename, drivername_postfix)
@@ -163,12 +171,13 @@
     @driver_filename = (porttypename || @name) + 'Driver.rb'
     creator = WSDL::SOAP::DriverCreator.new(@wsdl, @name_creator, @modulepath)
     creator.drivername_postfix = drivername_postfix
     check_file(@driver_filename) or return
     write_file(@driver_filename) do |f|
-      f.puts "# encoding: ASCII-8BIT"
-      f << "require '#{@classdef_filename}'\n" if @classdef_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n" if @classdef_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << creator.dump(create_name(porttypename))
     end
   end
 
   def write_file(filename)