rubyjedi-soap4r 1.5.8.20100619003610 → 2.0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4118c67369de4b9eb331f5c3344c91bea9f0bfe0
+  data.tar.gz: 3db8c4453abb2dd7a1919d49c234f72e4b94bafc
+SHA512:
+  metadata.gz: 6f1a0a99e49d764a394a17889a5b9471bda0b300ddca09adb6c5fed4c1794c1a56c2f176e1a5c21d345c91ebe80c68562f0d3e903653b9b8d88039319caed9f7
+  data.tar.gz: 1a3b4a131a89d6e494da6529abee549a867823f29dceb8a649180014aa9938a533e4b68129f01180f3d9a8d34995f77c2ccc4417869c041340c5b125cd715a14

data/bin/wsdl2ruby.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 $:.unshift File.join(File.dirname(__FILE__),'../lib') if ENV['DEBUG_SOAP4R']
 
 require 'getoptlong'
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'wsdl/soap/wsdl2ruby'
 
 

data/bin/xsd2ruby.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 $:.unshift File.join(File.dirname(__FILE__),'../lib') if ENV['DEBUG_SOAP4R']
 
 require 'getoptlong'
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'wsdl/xmlSchema/xsd2ruby'
 
 class XSD2RubyApp < Logger::Application

data/lib/soap/attachment.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # soap/attachment.rb: SOAP4R - SwA implementation.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/attrproxy.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - attribute proxy interface.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/baseData.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # soap/baseData.rb: SOAP4R - Base type library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/element.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP elements library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -104,7 +104,7 @@ class SOAPBody < SOAPStruct
     if data
       if data.respond_to?(:to_xmlpart)
         data = SOAP::SOAPRawData.new(data)
-      elsif defined?(::REXML) and defined?(::REXML::Element) and data.is_a?(::REXML::Element)
+      elsif defined?(::REXML) && defined?(::REXML::Element) && data.is_a?(::REXML::Element)
         data = SOAP::SOAPRawData.new(SOAP::SOAPREXMLElementWrap.new(data))
       end
       if data.respond_to?(:elename)

data/lib/soap/encodingstyle/aspDotNetHandler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - ASP.NET EncodingStyle handler library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/encodingstyle/handler.rb

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

data/lib/soap/encodingstyle/literalHandler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - XML Literal EncodingStyle handler library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/encodingstyle/soapHandler.rb

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

data/lib/soap/filter.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP filter.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/filter/filterchain.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP filter chain.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/filter/handler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP envelope filter base class.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/filter/streamhandler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP stream filter base class.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/generator.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP XML Instance Generator library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -270,7 +270,7 @@ private
   end
 
   def get_encode_char_regexp
-    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
+    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||= Regexp.new("[#{EncodeMap.keys.join}]", nil, (RUBY_VERSION.to_f <= 1.8) ? XSD::Charset.encoding : nil) # RubyJedi: compatible with Ruby 1.8.6 and above
   end
 
   def find_handler(encodingstyle)

data/lib/soap/header/handler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP Header handler item
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/header/handlerset.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP Header handler set
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/header/mappinghandler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP Mapping header item handler
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/header/simplehandler.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP Simple header item handler
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/httpconfigloader.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - HTTP config loader.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/mapping.rb

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

data/lib/soap/mapping/encodedregistry.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - encoded mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -12,8 +12,6 @@ require 'soap/mapping/mapping'
 require 'soap/mapping/typeMap'
 require 'soap/mapping/factory'
 require 'soap/mapping/rubytypeFactory'
-
-
 module SOAP
 module Mapping
 
@@ -406,22 +404,26 @@ private
   def addextend2obj(obj, attr)
     return unless attr
     attr.split(/ /).reverse_each do |mstr|
-      obj.extend(Mapping.module_from_name(mstr))
+      ext_module = Mapping.module_from_name(mstr)
+      return if ext_module.is_a?(Class) # RubyJedi:  Apparently needed for Ruby 2.1 and above?
+      obj.extend(ext_module)
     end
   end
 
   def addextend2soap(node, obj)
-    return if obj.is_a?(Symbol) or obj.is_a?(Fixnum)
+    return if [Symbol, Fixnum, Bignum, Float].any?{ |c| obj.is_a?(c) }
     list = (class << obj; self; end).ancestors - obj.class.ancestors
-    unless list.empty?
-      node.extraattr[RubyExtendName] = list.collect { |c|
-        name = c.name
-	if name.nil? or name.empty?
-  	  raise TypeError.new("singleton can't be dumped #{ obj }")
-   	end
-	name
-      }.join(" ")
-    end
+    list = list.reject{|c| c.class == Class } ## As of Ruby 2.1 Singleton Classes are now included in the ancestry. Need to filter those out here.
+
+    return if list.empty?
+    extra_attrs = list.collect { |c|
+      name = c.name
+      if name.nil? or name.empty?
+        raise TypeError.new("singleton can't be dumped #{ obj }")
+      end
+      name
+    }.join(" ")
+    node.extraattr[RubyExtendName] = extra_attrs
   end
 
   def stubobj2soap(obj, definition)

data/lib/soap/mapping/factory.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Mapping factory.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -38,7 +38,7 @@ class Factory
   end
 
   def setiv2soap(node, obj, map)
-    if obj.class.class_variables.include?('@@schema_element')
+    if obj.class.class_variable_defined?('@@schema_element')
       setdefinediv2soap(node, obj, map)
     else
       # should we sort instance_variables? how?

data/lib/soap/mapping/literalregistry.rb

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

data/lib/soap/mapping/mapping.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Ruby type mapping utility.
 # Copyright (C) 2000-2007  NAKAMURA Hiroshi <nahi@ruby-lang.org>.
 
@@ -127,7 +127,7 @@ module Mapping
   def self._obj2soap(obj, registry, type = nil)
     if obj.respond_to?(:to_xmlpart)
       SOAPRawData.new(obj)
-    elsif defined?(::REXML) and defined?(::REXML::Element) and obj.is_a?(::REXML::Element)
+    elsif defined?(::REXML) && defined?(::REXML::Element) && obj.is_a?(::REXML::Element)
       SOAPRawData.new(SOAPREXMLElementWrap.new(obj))
     elsif referent = Thread.current[:SOAPMapping][:MarshalKey][obj.__id__] and
         !Thread.current[:SOAPMapping][:NoReference]
@@ -251,11 +251,10 @@ module Mapping
 
   def self.obj2element(obj)
     name = namespace = nil
-    ivars = obj.instance_variables
-    if ivars.include?('@schema_type')
+    if obj.instance_variable_defined?('@schema_type')
       name = obj.instance_variable_get('@schema_type')
     end
-    if ivars.include?('@schema_ns')
+    if obj.instance_variable_defined?('@schema_ns')
       namespace = obj.instance_variable_get('@schema_ns')
     end
     if !name or !namespace
@@ -456,7 +455,8 @@ module Mapping
           schema_element.is_concrete_definition
         definition.elements = schema_element
       else
-        default_ns = schema_name.namespace if schema_name
+        default_ns = schema_ns
+        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 +542,7 @@ module Mapping
 
     def class_schema_variable(sym, klass)
       var = "@@#{sym}"
-      klass.class_variables.include?(var) ? klass.class_eval(var) : nil
+      klass.class_variable_defined?(var) ? klass.class_eval(var) : nil
     end
 
     def protect_mapping(opt)

data/lib/soap/mapping/registry.rb

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

data/lib/soap/mapping/rubytypeFactory.rb

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

data/lib/soap/mapping/schemadefinition.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Base type mapping definition
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/mapping/wsdlencodedregistry.rb

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

data/lib/soap/mapping/wsdlliteralregistry.rb

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

data/lib/soap/marshal.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - MIME Message implementation.
 # Copyright (C) 2002  Jamie Herre.
 

data/lib/soap/nestedexception.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - Nested exception implementation
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/netHttpClient.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - net/http wrapper
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/ns.rb

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

data/lib/soap/parser.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - SOAP XML Instance Parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/processor.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # soap/property.rb: SOAP4R - Property implementation.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -76,7 +76,11 @@ class Property
   
   def load(stream)
     key_prefix = ""
-    stream = stream.lines if stream.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
+    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|
       line.sub!(/\r?\n\z/u, '')
       case line
@@ -323,18 +327,4 @@ private
 end
 
 
-end
-
-
-# for ruby/1.6.
-#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
+end

data/lib/soap/proxy.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # SOAP4R - CGI/mod_ruby stub library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -11,6 +11,7 @@ require 'soap/streamHandler'
 require 'webrick/httpresponse'
 require 'webrick/httpstatus'
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 require 'soap/rpc/soaplet'