rubyjedi-soap4r 1.5.8.01 → 1.5.8.20100616125722

data/bin/wsdl2ruby.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift File.join(File.dirname(__FILE__),'../lib') if ENV['DEBUG_SOAP4R']
 
 require 'getoptlong'
 require 'logger'

data/bin/xsd2ruby.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
+$:.unshift File.join(File.dirname(__FILE__),'../lib') if ENV['DEBUG_SOAP4R']
 
 require 'getoptlong'
 require 'logger'
 require 'wsdl/xmlSchema/xsd2ruby'
 
-
 class XSD2RubyApp < Logger::Application
 private
 

data/lib/soap/baseData.rb

@@ -1079,7 +1079,7 @@ private
     "#{typename}[" << ',' * (rank - 1) << ']'
   end
 
-  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
+  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$', nil, 'n')
 
   def self.parse_type(string)
     TypeParseRegexp =~ string

data/lib/soap/element.rb

@@ -103,8 +103,6 @@ class SOAPBody < SOAPStruct
     if data
       if data.respond_to?(:to_xmlpart)
         data = SOAP::SOAPRawData.new(data)
-      elsif defined?(::Nokogiri) and data.is_a?(::Nokogiri::XML::Document)
-        data = SOAP::SOAPRawData.new(SOAP::SOAPREXMLElementWrap.new(data.children[0]))
       elsif defined?(::REXML) and data.is_a?(::REXML::Element)
         data = SOAP::SOAPRawData.new(SOAP::SOAPREXMLElementWrap.new(data))
       end

data/lib/soap/generator.rb

@@ -269,8 +269,7 @@ private
   end
 
   def get_encode_char_regexp
-    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||=
-      Regexp.new("[#{EncodeMap.keys.join}]")
+    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||= Regexp.new("[#{EncodeMap.keys.join}]", nil, (RUBY_VERSION.to_f >= 1.9) ? 'n' : XSD::Charset.encoding) # RubyJedi: compatible with Ruby 1.8.6 and above
   end
 
   def find_handler(encodingstyle)

data/lib/soap/mapping/encodedregistry.rb

@@ -463,6 +463,7 @@ private
       else
         child = Mapping.get_attribute(obj, eledef.varname)
         if child.respond_to?(:each) and eledef.as_array?
+          child = child.lines if child.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
           child.each do |item|
             ele.add(name, typedobj2soap(item, eledef.mapped_class))
           end

data/lib/soap/mapping/factory.rb

@@ -37,12 +37,12 @@ class Factory
   end
 
   def setiv2soap(node, obj, map)
-    if obj.class.class_variables.include?(:@@schema_element)
+    if obj.class.class_variables.include?('@@schema_element')
       setdefinediv2soap(node, obj, map)
     else
       # should we sort instance_variables? how?
       obj.instance_variables.each do |var|
-        name = var.to_s.sub(/^@/, '').to_sym
+        name = var.to_s.sub(/^@/, '')
         elename = Mapping.name2elename(name)
         node.add(elename,
           Mapping._obj2soap(obj.instance_variable_get(var), map))

data/lib/soap/mapping/mapping.rb

@@ -165,10 +165,9 @@ module Mapping
   #   ex. a.b => a.2eb
   #
   def self.name2elename(name)
-    name = name.to_s
-    name.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
+    name.to_s.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
       '.' << $1.unpack('H2' * $1.size).join('.')
-    }.gsub(/::/n, '..').to_sym
+    }.gsub(/::/n, '..')
   end
 
   def self.elename2name(name)
@@ -541,7 +540,7 @@ module Mapping
   private
 
     def class_schema_variable(sym, klass)
-      var = "@@#{sym}".to_sym
+      var = "@@#{sym}"
       klass.class_variables.include?(var) ? klass.class_eval(var) : nil
     end
 

data/lib/soap/mapping/registry.rb

@@ -50,21 +50,6 @@ class Object
     @__xmlele
   end
 
-	def to_hash
-		result = {}
-		@__xmlele.each do |qname, value|
-			result[qname.name.to_sym] = begin
-				case value
-				when SOAP::Mapping::Object
-					value.to_hash
-				else
-					value
-				end
-			end
-		end	
-		result
-	end
-
   def [](qname)
     qname = Mapping.to_qname(qname)
     @__xmlele.each do |k, v|

data/lib/soap/mapping/rubytypeFactory.rb

@@ -5,7 +5,6 @@
 # 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 'continuation'
 
 module SOAP
 module Mapping

data/lib/soap/mapping/wsdlencodedregistry.rb

@@ -123,8 +123,8 @@ private
   end
 
   def simpleobj2soap(obj, type)
-    return SOAPNil.new unless obj
     type.check_lexical_format(obj)
+    return SOAPNil.new if obj.nil?      # TODO: check nillable.
     if type.base
       ele = base2soap(obj, TypeMap[type.base])
       ele.type = type.name

data/lib/soap/mimemessage.rb

@@ -49,6 +49,7 @@ class MIMEMessage
 
     def parse(str)
       header_cache = nil
+      str = str.lines if str.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above      
       str.each do |line|
 	case line
 	when /^\A[^\: \t]+:\s*.+$/

data/lib/soap/nestedexception.rb

@@ -20,7 +20,7 @@ module NestedException
   end
 
   def set_backtrace(backtrace)
-    if @cause and @cause.respond_to?(:backtrace)
+    if defined?(@cause) and @cause.respond_to?(:backtrace)
       @original_backtrace = backtrace
 =begin
       # for agressive backtrace abstraction: 'here' only should not be good

data/lib/soap/netHttpClient.rb

@@ -176,13 +176,13 @@ private
     http.open_timeout = @connect_timeout if @connect_timeout
     http.read_timeout = @receive_timeout if @receive_timeout
     case url
-    when URI::HTTPS then
+    when URI::HTTPS
       if SSLEnabled
-	      http.use_ssl = true
+	http.use_ssl = true
       else
-	      raise RuntimeError.new("Cannot connect to #{url} (OpenSSL is not installed.)")
+	raise RuntimeError.new("Cannot connect to #{url} (OpenSSL is not installed.)")
       end
-    when URI::HTTP then
+    when URI::HTTP
       # OK
     else
       raise RuntimeError.new("Cannot connect to #{url} (Not HTTP.)")

data/lib/soap/ns.rb

@@ -13,6 +13,10 @@ require 'soap/soap'
 
 module SOAP
 
+## Rubyjedi: Provide these (deprecated) constants for backward compatibility with older ActionWebService
+SOAPNamespaceTag = 'env'
+XSDNamespaceTag  = 'xsd'
+XSINamespaceTag  = 'xsi'
 
 class NS < XSD::NS
   KNOWN_TAG = XSD::NS::KNOWN_TAG.dup.update(

data/lib/soap/property.rb

@@ -65,12 +65,18 @@ class Property
 
   KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
   DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
-  COMMENT_REGEXP = Regexp.new("^(?:#.*|)$")
-  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$")
-  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
+  #COMMENT_REGEXP = Regexp.new('^(?:#.*|)$', nil, 'u')
+  #CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$", nil, 'u')
+  #LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$", nil, 'u')
+
+  COMMENT_REGEXP = Regexp.new('^(?:#.*|)$') # RubyJedi: Attempt at 1.9 Compatibility // , nil, 'u')
+  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$") # RubyJedi: Attempt at 1.9 Compatibility // , nil, 'u')
+  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$") # RubyJedi: Attempt at 1.9 Compatibility // , nil, 'u')
+  
   def load(stream)
     key_prefix = ""
-    stream.each_line.each_with_index do |line, lineno|
+    stream = stream.lines if stream.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
+    stream.each_with_index do |line, lineno|
       line.sub!(/\r?\n\z/u, '')
       case line
       when COMMENT_REGEXP
@@ -320,14 +326,14 @@ end
 
 
 # for ruby/1.6.
-unless Enumerable.method_defined?(:inject)
-  module Enumerable
-    def inject(init)
-      result = init
-      each do |item|
-        result = yield(result, item)
-      end
-      result
-    end
-  end
-end
+#unless Enumerable.instance_methods.include?(:inject)
+#  module Enumerable
+#    def inject(init)
+#      result = init
+#      each do |item|
+#	result = yield(result, item)
+#      end
+#      result
+#    end
+#  end
+#end

data/lib/soap/rpc/element.rb

@@ -230,7 +230,7 @@ private
     mapped_class = SOAPMethod.parse_mapped_class(param.mapped_class)
     qname = param.qname
     if qname.nil? and mapped_class
-      qname = TypeMap.key(mapped_class)
+      qname = TypeMap.respond_to?(:key) ? TypeMap.key(mapped_class) : TypeMap.index(mapped_class) # RubyJedi: compatible with Ruby 1.8.6 and above 
     end
     case param.io_type
     when IN

data/lib/soap/rpc/standaloneServer.rb

@@ -14,7 +14,7 @@ module RPC
 
 
 class StandaloneServer < HTTPServer
-  def initialize(appname, default_namespace, host = "0.0.0.0", port = 8089)
+  def initialize(appname, default_namespace, host = "0.0.0.0", port = 8080)
     @appname = appname
     @default_namespace = default_namespace
     @host = host

data/lib/soap/soap.rb

@@ -5,16 +5,18 @@
 # 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 'soap/ruby18ext'
+
 require 'xsd/qname'
 require 'xsd/charset'
 require 'soap/nestedexception'
+require 'soap/version'
 
 
 module SOAP
 
 
-VERSION = Version = '1.6.1-SNAPSHOT'
+# VERSION = Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
+Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'

data/lib/soap/streamHandler.rb

@@ -142,7 +142,7 @@ public
 
   def initialize(options)
     super()
-    @client = Client.new(nil, "SOAP4R/#{ Version }")
+    @client = Client.new(nil, "RUBYJEDI-SOAP4R/#{ Version }")
     if @client.respond_to?(:request_filter)
       @client.request_filter << HttpPostRequestFilter.new(@filterchain)
     end

data/lib/soap/version.rb

@@ -0,0 +1,8 @@
+module SOAP
+  module VERSION #:nodoc:
+    MAJOR = 1
+    MINOR = 5
+    TINY  = 8
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/lib/soap/wsdlDriver.rb

@@ -5,7 +5,7 @@
 # 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 'soap/ruby18ext'
+
 require 'wsdl/parser'
 require 'wsdl/importer'
 require 'xsd/qname'
@@ -124,7 +124,7 @@ private
 
   def add_operation(drv, binding)
     name_creator = WSDL::SOAP::ClassNameCreator.new
-    modulepath = %w(WSDLDriverFactory)
+    modulepath = 'WSDLDriverFactory'
     methoddefcreator =
       WSDL::SOAP::MethodDefCreator.new(@wsdl, name_creator, modulepath, {})
     mdefs = methoddefcreator.create(binding.name)

data/lib/wsdl/parser.rb

@@ -113,10 +113,10 @@ private
     elename = ns.parse(name)
     if !parent
       if elename == DefinitionsName
-	      o = Definitions.parse_element(elename)
+	o = Definitions.parse_element(elename)
         o.location = @location
       else
-	      raise UnknownElementError.new("unknown element: #{elename}")
+	raise UnknownElementError.new("unknown element: #{elename}")
       end
       o.root = @originalroot if @originalroot   # o.root = o otherwise
     else
@@ -128,10 +128,10 @@ private
       end
       if o.nil?
         unless @ignored.key?(elename)
-          warn("ignored element: #{elename} : #{parent.inspect}")
+          warn("ignored element: #{elename}")
           @ignored[elename] = elename
         end
-	      o = Documentation.new	# which accepts any element.
+	o = Documentation.new	# which accepts any element.
       end
       # node could be a pseudo element.  pseudo element has its own parent.
       o.root = parent.root

data/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -51,7 +51,7 @@ module ClassDefCreatorSupport
 #
 __EOD__
     unless fault.empty?
-      str <<<<__EOD__
+      str += <<__EOD__
 # RAISES
 #{dump_fault_type(fault, element_definitions)}
 #

data/lib/wsdl/soap/clientSkeltonCreator.rb

@@ -33,7 +33,8 @@ class ClientSkeltonCreator
     result = ""
     if @modulepath
       result << "\n"
-      result << @modulepath.collect { |ele| "module #{ele}" }.join("; ")
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      
+      result << modulepath.collect { |ele| "module #{ele}" }.join("; ")
       result << "\n\n"
     end
     services.ports.each do |port|
@@ -42,7 +43,8 @@ class ClientSkeltonCreator
     end
     if @modulepath
       result << "\n\n"
-      result << @modulepath.collect { |ele| "end" }.join("; ")
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      
+      result << modulepath.collect { |ele| "end" }.join("; ")
       result << "\n"
     end
     result

data/lib/wsdl/soap/driverCreator.rb

@@ -33,7 +33,8 @@ class DriverCreator
   def dump(porttype = nil)
     result = "require 'soap/rpc/driver'\n\n"
     if @modulepath
-      @modulepath.each do |name|
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
+      modulepath.each do |name|
         result << "module #{name}\n"
       end
       result << "\n"
@@ -48,7 +49,8 @@ class DriverCreator
     end
     if @modulepath
       result << "\n"
-      @modulepath.each do |name|
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
+      modulepath.each do |name|
         result << "end\n"
       end
     end

data/lib/wsdl/soap/methodDefCreator.rb

@@ -165,7 +165,7 @@ __EOD__
     elsif definedtype = @complextypes[part.type]
       return ['::SOAP::SOAPElement', part.type]
     else
-    #  raise RuntimeError.new("part: #{part.name} cannot be resolved")
+      raise RuntimeError.new("part: #{part.name} cannot be resolved")
     end
   end
 

data/lib/wsdl/soap/servantSkeltonCreator.rb

@@ -31,7 +31,8 @@ class ServantSkeltonCreator
     result = ""
     if @modulepath
       result << "\n"
-      result << @modulepath.collect { |ele| "module #{ele}" }.join("; ")
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      
+      result << modulepath.collect { |ele| "module #{ele}" }.join("; ")
       result << "\n\n"
     end
     if porttype.nil?
@@ -44,7 +45,8 @@ class ServantSkeltonCreator
     end
     if @modulepath
       result << "\n\n"
-      result << @modulepath.collect { |ele| "end" }.join("; ")
+      modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      
+      result << modulepath.collect { |ele| "end" }.join("; ")
       result << "\n"
     end
     result

data/lib/wsdl/soap/wsdl2ruby.rb

@@ -58,7 +58,7 @@ private
   end
 
   def create_file
-    @modulepath = Array(@opt['module_path'])
+    @modulepath = @opt['module_path']
     create_classdef if @opt.key?('classdef')
     create_mapping_registry if @opt.key?('mapping_registry')
     create_servant_skelton(@opt['servant_skelton']) if @opt.key?('servant_skelton')

data/lib/wsdl/xmlSchema/parser.rb

@@ -111,10 +111,10 @@ private
     elename = ns.parse(name)
     if !parent
       if elename == SchemaName
-	      o = Schema.parse_element(elename)
+	o = Schema.parse_element(elename)
         o.location = @location
       else
-	      raise UnknownElementError.new("unknown element: #{elename}")
+	raise UnknownElementError.new("unknown element: #{elename}")
       end
       o.root = @originalroot if @originalroot   # o.root = o otherwise
     else
@@ -129,7 +129,7 @@ private
           warn("ignored element: #{elename} of #{parent.class}")
           @ignored[elename] = elename
         end
-	      o = Documentation.new	# which accepts any element.
+	o = Documentation.new	# which accepts any element.
       end
       # node could be a pseudo element.  pseudo element has its own parent.
       o.root = parent.root
@@ -140,7 +140,7 @@ private
       value_ele = ns.parse(value, false)
       value_ele.source = value  # for recovery; value may not be a QName
       if attr_ele == IdAttrName
-	      o.id = value_ele
+	o.id = value_ele
       else
         if o.parse_attr(attr_ele, value_ele).nil?
           unless @ignored.key?(attr_ele)