soap4r 1.5.7 → 1.5.8

data/lib/wsdl/soap/servantSkeltonCreator.rb

@@ -21,8 +21,9 @@ class ServantSkeltonCreator
 
   attr_reader :definitions
 
-  def initialize(definitions, modulepath = nil)
+  def initialize(definitions, name_creator, modulepath = nil)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
   end
 
@@ -52,7 +53,7 @@ class ServantSkeltonCreator
 private
 
   def dump_porttype(name)
-    class_name = create_class_name(name)
+    class_name = mapped_class_basename(name, @modulepath)
     c = XSD::CodeGen::ClassDef.new(class_name)
     element_definitions = @definitions.collect_elements
     operations = @definitions.porttype(name).operations

data/lib/wsdl/soap/servletStubCreator.rb

@@ -0,0 +1,107 @@
+# WSDL4R - Creating servlet stub code from WSDL.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# 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 'wsdl/info'
+require 'wsdl/soap/mappingRegistryCreator'
+require 'wsdl/soap/methodDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
+
+
+module WSDL
+module SOAP
+
+
+class ServletStubCreator
+  include ClassDefCreatorSupport
+
+  attr_reader :definitions
+
+  def initialize(definitions, name_creator, modulepath = nil)
+    @definitions = definitions
+    @name_creator = name_creator
+    @modulepath = modulepath
+  end
+
+  def dump(service_name)
+    warn("- Servlet stub can have only 1 port for now.  So creating stub for the first port and rests are ignored.")
+    services = @definitions.service(service_name)
+    unless services
+      raise RuntimeError.new("service not defined: #{service_name}")
+    end
+    ports = services.ports
+    if ports.empty?
+      raise RuntimeError.new("ports not found for #{service_name}")
+    end
+    port = ports[0]
+    if port.porttype.nil?
+      raise RuntimeError.new("porttype not found for #{port}")
+    end
+    dump_porttype(port.porttype)
+  end
+
+private
+
+  def dump_porttype(porttype)
+    class_name = mapped_class_name(porttype.name, @modulepath)
+    defined_const = {}
+    result = MethodDefCreator.new(@definitions, @name_creator, @modulepath, defined_const).dump(porttype.name)
+    methoddef = result[:methoddef]
+
+    wsdl_name = @definitions.name ? @definitions.name.name : 'default'
+    mrname = safeconstname(wsdl_name + 'MappingRegistry')
+    
+    c1 = XSD::CodeGen::ClassDef.new(class_name)
+    c1.def_require("soap/rpc/soaplet")
+    c1.def_code <<-EOD
+Methods = [
+#{methoddef.gsub(/^/, "  ")}
+]
+    EOD
+    defined_const.each do |ns, tag|
+      c1.def_const(tag, dq(ns))
+    end
+    c2 = XSD::CodeGen::ClassDef.new(class_name + "Servlet",
+      "::SOAP::RPC::SOAPlet")
+    c2.def_method("initialize", "router = nil") do
+      <<-EOD
+        super(router)
+        servant = #{class_name}.new
+        #{class_name}::Methods.each do |definitions|
+          opt = definitions.last
+          if opt[:request_style] == :document
+            @router.add_document_operation(servant, *definitions)
+          else
+            @router.add_rpc_operation(servant, *definitions)
+          end
+        end
+        @router.mapping_registry = #{mrname}::EncodedRegistry
+        @router.literal_mapping_registry = #{mrname}::LiteralRegistry
+      EOD
+    end
+    c1.dump + "\n" + c2.dump + format(<<-EOD)
+
+      if $0 == __FILE__
+        require 'webrick'
+        server = WEBrick::HTTPServer.new(
+          :BindAddress => "0.0.0.0",
+          :Port => 10080,
+          :DocumentRoot => "."
+        )
+        server.mount("/", #{c2.name}.new)
+        trap(:INT) do
+          server.shutdown
+        end
+        server.start
+      end
+    EOD
+  end
+end
+
+
+end
+end

data/lib/wsdl/soap/standaloneServerStubCreator.rb

@@ -21,8 +21,9 @@ class StandaloneServerStubCreator
 
   attr_reader :definitions
 
-  def initialize(definitions, modulepath = nil)
+  def initialize(definitions, name_creator, modulepath = nil)
     @definitions = definitions
+    @name_creator = name_creator
     @modulepath = modulepath
   end
 
@@ -41,14 +42,15 @@ class StandaloneServerStubCreator
     if port.porttype.nil?
       raise RuntimeError.new("porttype not found for #{port}")
     end
-    dump_porttype(port.porttype.name)
+    dump_porttype(port.porttype)
   end
 
 private
 
-  def dump_porttype(name)
-    class_name = create_class_name(name, @modulepath)
-    result = MethodDefCreator.new(@definitions, @modulepath).dump(name)
+  def dump_porttype(porttype)
+    class_name = mapped_class_name(porttype.name, @modulepath)
+    defined_const = {}
+    result = MethodDefCreator.new(@definitions, @name_creator, @modulepath, defined_const).dump(porttype.name)
     methoddef = result[:methoddef]
 
     wsdl_name = @definitions.name ? @definitions.name.name : 'default'
@@ -61,6 +63,9 @@ Methods = [
 #{methoddef.gsub(/^/, "  ")}
 ]
     EOD
+    defined_const.each do |ns, tag|
+      c1.def_const(tag, dq(ns))
+    end
     c2 = XSD::CodeGen::ClassDef.new(class_name + "App",
       "::SOAP::RPC::StandaloneServer")
     c2.def_method("initialize", "*arg") do

data/lib/wsdl/soap/wsdl2ruby.rb

@@ -14,7 +14,9 @@ require 'wsdl/soap/servantSkeltonCreator'
 require 'wsdl/soap/driverCreator'
 require 'wsdl/soap/clientSkeltonCreator'
 require 'wsdl/soap/standaloneServerStubCreator'
+require 'wsdl/soap/servletStubCreator'
 require 'wsdl/soap/cgiStubCreator'
+require 'wsdl/soap/classNameCreator'
 
 
 module WSDL
@@ -52,6 +54,7 @@ private
     @name = nil
     @classdef_filename = nil
     @mr_filename = nil
+    @name_creator = ClassNameCreator.new
   end
 
   def create_file
@@ -61,7 +64,8 @@ private
     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_servlet_stub(@opt['servlet_stub']) if @opt.key?('servlet_stub')
+    create_driver(@opt['driver'], @opt['drivername_postfix'] || '') if @opt.key?('driver')
     create_client_skelton(@opt['client_skelton']) if @opt.key?('client_skelton')
   end
 
@@ -70,7 +74,7 @@ private
     @classdef_filename = @name + '.rb'
     check_file(@classdef_filename) or return
     write_file(@classdef_filename) do |f|
-      f << WSDL::SOAP::ClassDefCreator.new(@wsdl, @modulepath).dump
+      f << WSDL::SOAP::ClassDefCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
 
@@ -80,7 +84,7 @@ private
     check_file(@mr_filename) or return
     write_file(@mr_filename) do |f|
       f << "require '#{@classdef_filename}'\n" if @classdef_filename
-      f << WSDL::SOAP::MappingRegistryCreator.new(@wsdl, @modulepath).dump
+      f << WSDL::SOAP::MappingRegistryCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
 
@@ -93,8 +97,7 @@ private
     write_file(@client_skelton_filename) do |f|
       f << shbang << "\n"
       f << "require '#{@driver_filename}'\n\n" if @driver_filename
-      f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl, @modulepath).dump(
-	create_name(servicename))
+      f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
@@ -104,8 +107,7 @@ private
     check_file(@servant_skelton_filename) or return
     write_file(@servant_skelton_filename) do |f|
       f << "require '#{@classdef_filename}'\n\n" if @classdef_filename
-      f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl, @modulepath).dump(
-	create_name(porttypename))
+      f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(porttypename))
     end
   end
 
@@ -118,7 +120,7 @@ private
       f << shbang << "\n"
       f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
       f << "require '#{@mr_filename}'\n" if @mr_filename
-      f << WSDL::SOAP::CGIStubCreator.new(@wsdl, @modulepath).dump(create_name(servicename))
+      f << WSDL::SOAP::CGIStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
@@ -131,20 +133,33 @@ private
       f << shbang << "\n"
       f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
       f << "require '#{@mr_filename}'\n" if @mr_filename
-      f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl, @modulepath).dump(
-	create_name(servicename))
+      f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
 
-  def create_driver(porttypename)
+  def create_servlet_stub(servicename)
+    @logger.info { "Creating servlet stub." }
+    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 << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require '#{@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)
     @logger.info { "Creating driver." }
     @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 << "require '#{@classdef_filename}'\n" if @classdef_filename
       f << "require '#{@mr_filename}'\n" if @mr_filename
-      f << WSDL::SOAP::DriverCreator.new(@wsdl, @modulepath).dump(
-	create_name(porttypename))
+      f << creator.dump(create_name(porttypename))
     end
   end
 

data/lib/wsdl/wsdl.rb

@@ -7,6 +7,7 @@
 
 
 require 'xsd/qname'
+require 'soap/nestedexception'
 
 
 module WSDL
@@ -17,7 +18,7 @@ Version = '0.0.2'
 Namespace = 'http://schemas.xmlsoap.org/wsdl/'
 SOAPBindingNamespace ='http://schemas.xmlsoap.org/wsdl/soap/'
 
-class Error < StandardError; end
+class Error < StandardError; include ::SOAP::NestedException; end
 
 
 end

data/lib/wsdl/xmlSchema/anyAttribute.rb

@@ -0,0 +1,48 @@
+# WSDL4R - XMLSchema anyAttribute definition for WSDL.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# 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 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class AnyAttribute < Info
+  attr_accessor :namespace
+  attr_accessor :processcontents
+
+  def initialize
+    super()
+    @namespace = '##any'
+    @processcontents = 'strict'
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NamespaceAttrName
+      @namespace = value.source
+    when ProcessContentsAttrName
+      @processcontents = value.source
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/attributeGroup.rb

@@ -0,0 +1,86 @@
+# WSDL4R - XMLSchema attributeGroup definition for WSDL.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# 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 'wsdl/info'
+
+
+module WSDL
+module XMLSchema
+
+
+class AttributeGroup < Info
+  class << self
+    if RUBY_VERSION > "1.7.0"
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        define_method(name) {
+          instance_variable_get("@#{name}") ||
+            (refelement ? refelement.__send__(name) : nil)
+        }
+      end
+    else
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @#{name} || (refelement ? refelement.#{name} : nil)
+          end
+        EOS
+      end
+    end
+  end
+
+  attr_writer :name	# required
+  attr_writer :attributes
+
+  attr_reader_ref :name
+  attr_reader_ref :attributes
+
+  attr_accessor :ref
+
+  def initialize
+    super
+    @name = nil
+    @attributes = nil
+    @ref = nil
+    @refelement = nil
+  end
+
+  def refelement
+    @refelement ||= root.collect_attributegroups[@ref]
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def parse_element(element)
+    case element
+    when AttributeName
+      @attributes ||= XSD::NamedElements.new
+      o = Attribute.new
+      @attributes << o
+      o
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when RefAttrName
+      @ref = value
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/choice.rb

@@ -39,8 +39,11 @@ class Choice < Content
       o = Choice.new
       @elements << o
       o
+    when GroupName
+      o = Group.new
+      @elements << o
+      o
     when AnyName
-      raise ElementConstraintError.new("duplicated element: any") if @any
       @any = Any.new
       @elements << @any
       @any

data/lib/wsdl/xmlSchema/complexContent.rb

@@ -85,7 +85,7 @@ class ComplexContent < Info
   def parse_attr(attr, value)
     case attr
     when MixedAttrName
-      @mixed = (value.source == 'true')
+      @mixed = to_boolean(value)
     else
       nil
     end