rtiss_soap4r 2.1.1 → 3.0.0.beta

data/lib/soap/mapping/factory.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Mapping factory.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -38,12 +37,12 @@ class Factory
   end
 
   def setiv2soap(node, obj, map)
-    if obj.class.class_variable_defined?('@@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(/^@/, '')
+        name = var.to_s.sub(/^@/, '').to_sym
         elename = Mapping.name2elename(name)
         node.add(elename,
           Mapping._obj2soap(obj.instance_variable_get(var), map))
@@ -55,7 +54,7 @@ private
 
   def setdefinediv2soap(ele, obj, map)
     definition = Mapping.schema_definition_classdef(obj.class)
-    definition.elements.each do |eledef|
+    definition&.elements&.each do |eledef|
       child = Mapping.get_attribute(obj, eledef.varname)
       # extract method
       if child.nil?
@@ -181,16 +180,27 @@ class DateTimeFactory_ < Factory
 
   def obj2soap(soap_class, obj, info, map)
     if !@allow_original_mapping and
-	Time === obj and !obj.instance_variables.empty?
+       Time === obj and !obj.instance_variables.empty?
       return nil
     end
-    soap_obj = nil
-    begin
-      soap_obj = soap_class.new(obj)
-    rescue XSD::ValueSpaceError
-      return nil
+
+    if obj.is_a?(DateTime) || obj.is_a?(Time)
+      formatted_obj = format_datetime(obj)
+      begin
+        soap_obj = soap_class.new(formatted_obj)
+      rescue XSD::ValueSpaceError
+        return nil
+      end
+      mark_marshalled_obj(obj, soap_obj)
+    else
+      begin
+        soap_obj = soap_class.new(obj)
+      rescue XSD::ValueSpaceError
+        return nil
+      end
+      mark_marshalled_obj(obj, soap_obj)
     end
-    mark_marshalled_obj(obj, soap_obj)
+
     soap_obj
   end
 
@@ -199,10 +209,29 @@ class DateTimeFactory_ < Factory
       obj = node.to_obj(obj_class)
       return false if obj.nil?
       mark_unmarshalled_obj(node, obj)
-      return true, obj
+      [true, obj]
     else
-      return false
+      false
+    end
+  end
+
+  private
+
+  def format_datetime(obj)
+    if obj.is_a?(DateTime)
+      formatted = obj.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
+      if formatted[-5..-1] =~ /[+-]\d{4}/
+        formatted = formatted[0..-3] + ':' + formatted[-2..-1]
+      end
+      return formatted
+    elsif obj.is_a?(Time)
+      formatted = obj.strftime('%Y-%m-%dT%H:%M:%S.%3N%z')
+      if formatted[-5..-1] =~ /[+-]\d{4}/
+        formatted = formatted[0..-3] + ':' + formatted[-2..-1]
+      end
+      return formatted
     end
+    obj
   end
 end
 

data/lib/soap/mapping/literalregistry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - literal mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -75,7 +74,7 @@ private
   end
 
   def any2soap(obj, qname, obj_class)
-    ele = nil
+    #ele = nil
     if obj.is_a?(SOAP::Mapping::Object)
       return mappingobj2soap(obj, qname)
     end
@@ -356,11 +355,9 @@ private
   # Mapping.define_attr_accessor calls define_method with proc and it exhausts
   # much memory for each singleton Object.  just instance_eval instead of it.
   def define_xmlattr_accessor(obj, qname)
-    # untaint depends GenSupport.safemethodname
-    name = Mapping.safemethodname('xmlattr_' + qname.name).untaint
+    name = Mapping.safemethodname('xmlattr_' + qname.name)
     unless obj.respond_to?(name)
-      # untaint depends QName#dump
-      qnamedump = qname.dump.untaint
+      qnamedump = qname.dump
       obj.instance_eval <<-EOS
         def #{name}
           @__xmlattr[#{qnamedump}]

data/lib/soap/mapping/mapping.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Ruby type mapping utility.
 # Copyright (C) 2000-2007  NAKAMURA Hiroshi <nahi@ruby-lang.org>.
 
@@ -127,7 +126,7 @@ module Mapping
   def self._obj2soap(obj, registry, type = nil)
     if obj.respond_to?(:to_xmlpart)
       SOAPRawData.new(obj)
-    elsif defined?(::REXML) && defined?(::REXML::Element) && obj.is_a?(::REXML::Element)
+    elsif defined?(::REXML) and obj.is_a?(::REXML::Element)
       SOAPRawData.new(SOAPREXMLElementWrap.new(obj))
     elsif referent = Thread.current[:SOAPMapping][:MarshalKey][obj.__id__] and
         !Thread.current[:SOAPMapping][:NoReference]
@@ -166,9 +165,10 @@ module Mapping
   #   ex. a.b => a.2eb
   #
   def self.name2elename(name)
-    name.to_s.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
+    name = name.to_s
+    name.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
       '.' << $1.unpack('H2' * $1.size).join('.')
-    }.gsub(/::/n, '..')
+    }.gsub(/::/n, '..').to_sym
   end
 
   def self.elename2name(name)
@@ -251,10 +251,11 @@ module Mapping
 
   def self.obj2element(obj)
     name = namespace = nil
-    if obj.instance_variable_defined?('@schema_type')
+    ivars = obj.instance_variables
+    if ivars.include?('@schema_type')
       name = obj.instance_variable_get('@schema_type')
     end
-    if obj.instance_variable_defined?('@schema_ns')
+    if ivars.include?('@schema_ns')
       namespace = obj.instance_variable_get('@schema_ns')
     end
     if !name or !namespace
@@ -332,8 +333,7 @@ module Mapping
       end
     else
       values.each do |attr_name, value|
-        # untaint depends GenSupport.safevarname
-        name = Mapping.safevarname(attr_name).untaint
+        name = Mapping.safevarname(attr_name)
         setter = name + "="
         if obj.respond_to?(setter)
           obj.__send__(setter, value)
@@ -439,7 +439,7 @@ module Mapping
   end
 
   def self.create_schema_definition(klass, definition)
-    schema_ns = definition[:schema_ns]
+    #schema_ns = definition[:schema_ns]
     schema_name = definition[:schema_name]
     schema_type = definition[:schema_type]
     is_anonymous = definition[:is_anonymous]
@@ -455,8 +455,7 @@ module Mapping
           schema_element.is_concrete_definition
         definition.elements = schema_element
       else
-        default_ns = schema_ns
-        default_ns ||= schema_name.namespace if schema_name
+        default_ns = schema_name.namespace if schema_name
         default_ns ||= schema_type.namespace if schema_type
         definition.elements = parse_schema_definition(schema_element, default_ns)
         if klass < ::Array
@@ -542,7 +541,7 @@ module Mapping
 
     def class_schema_variable(sym, klass)
       var = "@@#{sym}"
-      klass.class_variable_defined?(var) ? klass.class_eval(var) : nil
+      klass.class_variables.include?(var) ? klass.class_eval(var) : nil
     end
 
     def protect_mapping(opt)

data/lib/soap/mapping/registry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -106,10 +105,8 @@ private
   # Mapping.define_attr_accessor calls define_method with proc and it exhausts
   # much memory for each singleton Object.  just instance_eval instead of it.
   def __define_attr_accessor(qname)
-    # untaint depends GenSupport.safemethodname
-    name = Mapping.safemethodname(qname.name).untaint
-    # untaint depends on QName#dump
-    qnamedump = qname.dump.untaint
+    name = Mapping.safemethodname(qname.name)
+    qnamedump = qname.dump
     singleton = false
     unless self.respond_to?(name)
       singleton = true

data/lib/soap/mapping/rubytypeFactory.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Ruby type mapping factory.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,6 +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 'continuation'
 
 module SOAP
 module Mapping
@@ -193,7 +193,7 @@ class RubytypeFactory < Factory
         param.add('member', ele_member)
         addiv2soapattr(param, obj, map)
       end
-    when ::IO, ::Binding, ::Data, ::Dir, ::File::Stat,
+    when ::IO, ::Binding, ::Dir, ::File::Stat,
         ::MatchData, Method, ::Proc, ::Process::Status, ::Thread,
         ::ThreadGroup, ::UnboundMethod
       return nil

data/lib/soap/mapping/schemadefinition.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Ruby type mapping schema definition utility.
 # Copyright (C) 2000-2007  NAKAMURA Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/mapping/typeMap.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Base type mapping definition
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -103,5 +102,4 @@ TypeMap = {
   SOAP::SOAPPositiveInteger::SOAPENCType => SOAPPositiveInteger,
 }
 
-
 end

data/lib/soap/mapping/wsdlencodedregistry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - WSDL encoded mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -124,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/mapping/wsdlliteralregistry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - WSDL literal mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/mapping.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Ruby type mapping utility.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/marshal.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Marshalling/Unmarshalling Ruby's object using SOAP Encoding.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/mimemessage.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - MIME Message implementation.
 # Copyright (C) 2002  Jamie Herre.
 
@@ -50,18 +49,17 @@ 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*.+$/
-	  parse_line(header_cache) if header_cache
-	  header_cache = line.sub(/\r?\n\z/, '')
-	when /^\A\s+(.*)$/
-	  # a continuous line at the beginning line crashes here.
-	  header_cache << line
-	else
-	  raise RuntimeError.new("unexpected header: #{line.inspect}")
-	end
+      str.split(/\r?\n/).each do |line|
+        case line
+        when /^\A[^\: \t]+:\s*.+$/
+          parse_line(header_cache) if header_cache
+          header_cache = line.sub(/\r?\n\z/, '')
+        when /^\A\s+(.*)$/
+          # a continuous line at the beginning line crashes here.
+          header_cache << line
+        else
+          raise RuntimeError.new("unexpected header: #{line.inspect}")
+        end
       end
       parse_line(header_cache) if header_cache
       self
@@ -78,17 +76,45 @@ class MIMEMessage
     end
 
     def parse_rhs(str)
-      a = str.split(/;+\s+/)
+      if str.is_a?(Hash)
+        header = Header.new
+        header.str = str.inspect
+        header.root = str['content-type'] || str['Content-Type'] || ''
+        str.each do |k, v|
+          header[k.downcase] = v
+        end
+        return header
+      end
+
+      parts = []
+      in_quote = false
+      current_part = ''
+
+      str.each_char do |c|
+        if c == '"'
+          in_quote = !in_quote
+          current_part << c
+        elsif c == ';' && !in_quote
+          parts << current_part.strip
+          current_part = ''
+        else
+          current_part << c
+        end
+      end
+      parts << current_part.strip if current_part.strip != ''
+
       header = Header.new
       header.str = str
-      header.root = a.shift
-      a.each do |pair|
-	if pair =~ /(\w+)\s*=\s*"?([^"]+)"?/
-	  header[$1.downcase] = $2
-	else
-	  raise RuntimeError.new("unexpected header component: #{pair.inspect}")
-	end
+      header.root = parts.shift
+
+      parts.each do |pair|
+        if pair =~ /(\w+)\s*=\s*"([^"]*)"/
+          header[$1.downcase] = $2
+        elsif pair =~ /(\w+)\s*=\s*([^;]*)/
+          header[$1.downcase] = $2.strip
+        end
       end
+
       header
     end
 
@@ -168,12 +194,11 @@ class MIMEMessage
   end
 
   def parse(head, str)
-    @headers = Headers.parse(head + "\r\n" + "From: jfh\r\n")
+    @headers = Headers.parse(head)
     boundary = @headers['content-type']['boundary']
     if boundary != nil
       parts = str.split(/--#{Regexp.quote(boundary)}\s*(?:\r\n|--\r\n)/)
-      part = parts.shift	# preamble must be ignored.
-      @parts = parts.collect { |part| Part.parse(part) }
+      @parts = parts.collect { |part| Part.parse(part) unless part.strip.empty? }.compact
     else
       @parts = [Part.parse(str)]
     end
@@ -234,9 +259,9 @@ class MIMEMessage
     str
   end
 
-  def to_s
-    str = headers_str + "\r\n\r\n" + conent_str
-  end
+  # def to_s
+  #   str = headers_str + "\r\n\r\n" + conent_str
+  # end
 end
 
 

data/lib/soap/nestedexception.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Nested exception implementation
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -21,7 +20,7 @@ module NestedException
   end
 
   def set_backtrace(backtrace)
-    if defined?(@cause) and @cause.respond_to?(:backtrace)
+    if @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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - net/http wrapper
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -177,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
+    when URI::HTTPS then
       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
+    when URI::HTTP then
       # OK
     else
       raise RuntimeError.new("Cannot connect to #{url} (Not HTTP.)")

data/lib/soap/ns.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP Namespace library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -14,10 +13,6 @@ 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/parser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP XML Instance Parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -8,6 +7,7 @@
 
 
 require 'xsd/xmlparser'
+require 'xsd/xmlparser/nokogiri'
 require 'soap/soap'
 require 'soap/ns'
 require 'soap/baseData'

data/lib/soap/processor.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - marshal/unmarshal interface.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/property.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # soap/property.rb: SOAP4R - Property implementation.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,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 'stringio'
 module SOAP
 
 
@@ -33,7 +32,6 @@ module SOAP
 #     aaa.hhh = iii
 #
 class Property
-  FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
 
   include Enumerable
 
@@ -66,22 +64,13 @@ class Property
 
   KEY_REGSRC = '([^=:\\\\]*(?:\\\\.[^=:\\\\]*)*)'
   DEF_REGSRC = '\\s*' + KEY_REGSRC + '\\s*[=:]\\s*(.*)'
-  #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')
-  
+  COMMENT_REGEXP = Regexp.new("^(?:#.*|)$")
+  CATDEF_REGEXP = Regexp.new("^\\[\\s*#{KEY_REGSRC}\\s*\\]$")
+  LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
   def load(stream)
+    stream = StringIO.new(stream) if stream.is_a?(String)
     key_prefix = ""
-    if stream.respond_to?(:each_line) # Ruby 1.9 and beyond
-      stream = stream.each_line      
-    elsif stream.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6
-      stream = stream.lines
-    end
-    stream.each_with_index do |line, lineno|
+    stream.readlines.each_with_index do |line, lineno|
       line.sub!(/\r?\n\z/u, '')
       case line
       when COMMENT_REGEXP
@@ -327,4 +316,18 @@ private
 end
 
 
-end
+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

data/lib/soap/proxy.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - Proxy library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/rpc/cgistub.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - CGI/mod_ruby stub library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -7,12 +6,12 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'soap/streamHandler'
+require_relative '../streamHandler.rb'
 require 'webrick/httpresponse'
 require 'webrick/httpstatus'
 require 'logger'
-require 'logger-application' unless defined?(Logger::Application)
-require 'soap/rpc/soaplet'
+require 'logger/application'
+require_relative '../rpc/soaplet'
 
 
 module SOAP