rtiss_soap4r 2.1.0 → 3.0.0.beta

data/RUBYS

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/Rakefile

@@ -0,0 +1,88 @@
+require 'rubygems'
+require 'bundler'
+require File.join(File.dirname(__FILE__), 'lib', 'soap', 'version')
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "rtiss_soap4r"
+  gem.version = SOAP::VERSION::STRING
+  gem.homepage = "https://github.com/rtiss/rtiss_soap4r"
+  gem.license = "MIT"
+  gem.summary = %Q{Ruby 3.2 compatible soap4r library}
+  gem.description = %Q{Ruby 3.2 compatible soap4r library}
+  gem.authors = ["Laurence A. Lee", "Hiroshi NAKAMURA", "Igor Jancev", "Lara Hofer"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+# require 'rcov/rcovtask'
+# Rcov::RcovTask.new do |test|
+#   test.libs << 'test'
+#   test.pattern = 'test/**/test_*.rb'
+#   test.verbose = true
+# end
+#
+# task :default => :test
+#
+# require 'rake/rdoctask'
+# Rake::RDocTask.new do |rdoc|
+#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
+#
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title = "soap4r-ruby1.9 #{version}"
+#   rdoc.rdoc_files.include('README*')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end
+
+
+## ---------------------------------------------------------------------------------------------------- ##
+#
+# Packaging tasks
+#
+## ---------------------------------------------------------------------------------------------------- ##
+
+
+def name
+  'rtiss_soap4r'
+end
+
+def version
+  SOAP::VERSION::STRING
+end
+
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag #{version}"
+  sh "git push origin master --tags"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+
+task :build do
+  sh "mkdir -p pkg"
+  sh "gem build #{name}.gemspec"
+  sh "mv #{name}-#{version}.gem pkg"
+end

data/bin/wsdl2ruby.rb

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
-# 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 'logger/application'
 require 'wsdl/soap/wsdl2ruby'
 
 

data/bin/xsd2ruby.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
-# 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 'logger/application'
 require 'wsdl/xmlSchema/xsd2ruby'
 
+
 class XSD2RubyApp < Logger::Application
 private
 

data/gemfiles/httpclient.gemfile

@@ -0,0 +1,26 @@
+source 'http://rubygems.org'
+gem 'rake'
+
+gem 'httpclient', '~> 2.9'
+gem 'htmlentities', '~> 4.3', '>= 4.3.4'    # Require this if OxParser's built-in "Special Character" conversion isn't sufficient for your needs.
+gem 'nokogiri', '~> 1.16', '>= 1.16.2'
+gem 'logger-application', :require=>'logger-application'
+gem 'xmlparser', '~> 0.7.2.1'
+gem 'oga', '~> 3.4'
+gem 'savon', '~> 2.15', '>= 2.15.1'
+
+if RUBY_PLATFORM =~ /java/
+  gem 'libxml-jruby'                 # libxmlparser (Java Equivalent)
+else
+  gem 'libxml-ruby', '~> 5.0', '>= 5.0.3'                # libxmlparser   ; Uses libxml2
+  gem 'ox', '~> 2.14', '>= 2.14.22'                         # oxparser       ; Uses its own custom C-library
+
+  #gem 'curb'
+end
+
+### Testing Support ###
+group :test do
+  gem 'test-unit'
+  gem 'rubyjedi-testunitxml', :git=>'https://github.com/rubyjedi/testunitxml.git', :branch=>'master'
+  gem "codeclimate-test-reporter", :require=>nil if RUBY_VERSION.to_f >= 1.9
+end

data/install.rb

@@ -0,0 +1,91 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require 'getoptlong'
+require 'rbconfig'
+require 'ftools'
+
+OptSet = [
+  ['--prefix','-p', GetoptLong::REQUIRED_ARGUMENT],
+]
+prefix = nil
+GetoptLong.new(*OptSet).each do |name, arg|
+  case name
+  when "--prefix"
+    prefix = arg
+  else
+    raise ArgumentError.new("Unknown type #{ arg }")
+  end
+end
+
+include Config
+RV = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
+ORG_PREFIX = CONFIG["prefix"]
+SRCPATH = File.join(File.dirname($0), 'lib')
+
+RUBYLIBDIR = CONFIG["rubylibdir"]
+SITELIBDIR = CONFIG["sitedir"] + "/" +  RV 
+
+if prefix
+  RUBYLIBDIR.sub!(/^#{Regexp.quote(ORG_PREFIX)}/, prefix)
+  SITELIBDIR.sub!(/^#{Regexp.quote(ORG_PREFIX)}/, prefix)
+end
+
+def install(from, to)
+  to_path = File.catname(from, to)
+  unless FileTest.exist?(to_path) and File.compare(from, to_path)
+    File.install(from, to_path, 0644, true)
+  end
+end
+
+def install_dir(srcbase, *path)
+  from_path = File.join(srcbase, *path)
+  unless FileTest.directory?(from_path)
+    raise RuntimeError.new("'#{ from_path }' not found.")
+  end
+  to_path_rubylib = File.join(RUBYLIBDIR, *path)
+  to_path_sitelib = File.join(SITELIBDIR, *path)
+  Dir[File.join(from_path, '*.rb')].each do |from_file|
+    basename = File.basename(from_file)
+    to_file_rubylib = File.join(to_path_rubylib, basename)
+    to_file_sitelib = File.join(to_path_sitelib, basename)
+    if File.exist?(to_file_rubylib)
+      if File.exist?(to_file_sitelib)
+        raise RuntimeError.new(
+          "trying to install '#{ to_file_rubylib }' but '#{ to_file_sitelib }' exists.  please remove '#{ to_file_sitelib }' first to avoid versioning problem and run installer again.")
+      end
+      install(from_file, to_path_rubylib)
+    else
+      File.mkpath(to_path_sitelib, true)
+      install(from_file, to_path_sitelib)
+    end
+  end
+end
+
+begin
+  install_dir(SRCPATH, 'soap')
+  install_dir(SRCPATH, 'soap', 'rpc')
+  install_dir(SRCPATH, 'soap', 'mapping')
+  install_dir(SRCPATH, 'soap', 'encodingstyle')
+  install_dir(SRCPATH, 'soap', 'header')
+  install_dir(SRCPATH, 'soap', 'filter')
+  install_dir(SRCPATH, 'wsdl')
+  install_dir(SRCPATH, 'wsdl', 'xmlSchema')
+  install_dir(SRCPATH, 'wsdl', 'soap')
+  install_dir(SRCPATH, 'xsd')
+  install_dir(SRCPATH, 'xsd', 'codegen')
+  install_dir(SRCPATH, 'xsd', 'xmlparser')
+
+  # xmlscan
+  xmlscansrcdir = File.join('redist', 'xmlscan', 'xmlscan-20050522', 'lib')
+  if File.exist?(xmlscansrcdir)
+    install_dir(xmlscansrcdir, 'xmlscan')
+  end
+
+  puts "install succeed!"
+
+rescue 
+  puts "install failed!"
+  puts $!
+
+end

data/lib/soap/attachment.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # soap/attachment.rb: SOAP4R - SwA implementation.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -34,11 +33,24 @@ class Attachment
   attr_reader :io
   attr_accessor :contenttype
 
-  def initialize(string_or_readable = nil)
-    @string_or_readable = string_or_readable
-    @contenttype = "application/octet-stream"
+  def initialize(value = nil)
     @contentid = nil
     @content = nil
+    @contenttype = "application/octet-stream"
+
+    case value
+    when File
+      @content = value.read
+      value.close
+    when String
+      @content = value
+    when IO, StringIO
+      @content = value.read
+    when nil
+      # Nichts zu tun
+    else
+      @content = value.to_s
+    end
   end
 
   def contentid
@@ -54,15 +66,11 @@ class Attachment
   end
 
   def content
-    if @content == nil and @string_or_readable != nil
-      @content = @string_or_readable.respond_to?(:read) ?
-	@string_or_readable.read : @string_or_readable
-    end
     @content
   end
 
   def to_s
-    content
+    content.to_s
   end
 
   def write(out)
@@ -75,9 +83,17 @@ class Attachment
     end
   end
 
+  def headers
+    {
+      'Content-Id' => mime_contentid,
+      'Content-Type' => contenttype,
+      'Content-Transfer-Encoding' => 'binary'
+    }
+  end
+
   def self.contentid(obj)
-    # this needs to be fixed
-    [obj.__id__.to_s, Process.pid.to_s].join('.')
+    # Verbesserte Version, die einen eindeutigeren ID generiert
+    [Time.now.to_f.to_s.gsub('.', ''), Process.pid.to_s, obj.__id__.to_s].join('.')
   end
 
   def self.mime_contentid(obj)

data/lib/soap/attrproxy.rb

@@ -1,4 +1,3 @@
-# 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,3 @@
-# encoding: UTF-8
 # soap/baseData.rb: SOAP4R - Base type library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -11,7 +10,7 @@ require 'xsd/datatypes'
 require 'soap/soap'
 require 'xsd/codegen/gensupport'
 require 'soap/mapping/mapping'
-
+require 'stringio'
 
 module SOAP
 
@@ -96,6 +95,11 @@ module SOAPBasetype
     super
     @qualified = nil
   end
+
+  def string
+    # Get the string from parent implementation and force UTF-8 encoding
+    super.force_encoding("UTF-8")
+  end
 end
 
 
@@ -423,6 +427,14 @@ class SOAPBase64 < XSD::XSDBase64Binary
 public
 
   def initialize(value = nil)
+    if value.is_a?(StringIO)
+      value = value.string
+    end
+
+    # Handle the encoding before passing to parent
+    if value.is_a?(String) && value.encoding != Encoding::UTF_8
+      value = value.dup.force_encoding("UTF-8")
+    end
     super(value)
     @type = Type
   end
@@ -1080,7 +1092,7 @@ private
     "#{typename}[" << ',' * (rank - 1) << ']'
   end
 
-  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$', nil, 'n')
+  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
 
   def self.parse_type(string)
     TypeParseRegexp =~ string

data/lib/soap/element.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP elements library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -104,7 +103,7 @@ class SOAPBody < SOAPStruct
     if data
       if data.respond_to?(:to_xmlpart)
         data = SOAP::SOAPRawData.new(data)
-      elsif defined?(::REXML) && defined?(::REXML::Element) && data.is_a?(::REXML::Element)
+      elsif defined?(::REXML) and 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,3 @@
-# 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,3 @@
-# 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,3 @@
-# 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,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP EncodingStyle handler library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/soap/filter/filterchain.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP filter chain.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -7,7 +6,7 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'soap/filter/handler'
+require_relative 'handler'
 
 
 module SOAP

data/lib/soap/filter/handler.rb

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

data/lib/soap/filter.rb

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

data/lib/soap/generator.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - SOAP XML Instance Generator library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -53,7 +52,7 @@ public
   def generate(obj, io = nil)
     @buf = io || ''
     @indent = ''
-    @encode_char_regexp = get_encode_char_regexp()
+    @encode_char_regexp = get_encode_char_regexp
 
     prologue
     @handlers.each do |uri, handler|
@@ -270,7 +269,8 @@ private
   end
 
   def get_encode_char_regexp
-    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
+    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||=
+      Regexp.new("[#{EncodeMap.keys.join}]")
   end
 
   def find_handler(encodingstyle)

data/lib/soap/header/handler.rb

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

data/lib/soap/http_logger.rb

@@ -12,9 +12,23 @@ module SOAP
       puts "Driver class: #{driver_class}"
       puts "Method: #{method_name}"
       puts "Request:"
-      puts Nokogiri::XML(request_string).root.to_xml
+      begin
+        puts Nokogiri::XML(request_string).root.to_xml
+      rescue => e
+        puts "NO VALID XML REQUEST:\n---------------------"
+        puts request_string
+        puts "---------------------"
+        puts e.backtrace
+      end
       puts "================================================================================================\nResponse:"
-      puts Nokogiri::XML(response_string).root.to_xml
+      begin
+        puts Nokogiri::XML(response_string).root.to_xml
+      rescue => e
+        puts "NO VALID XML RESPONSE:\n---------------------"
+        puts response_string
+        puts "---------------------"
+        puts e.backtrace
+      end
       puts "Response time: #{response_time}"
     end
   end

data/lib/soap/httpconfigloader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - HTTP config loader.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -7,7 +6,7 @@
 # either the dual license version in 2003, or any later version.
 
 
-require 'soap/property'
+require_relative 'property'
 
 
 module SOAP

data/lib/soap/mapping/encodedregistry.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # SOAP4R - encoded mapping registry.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -12,6 +11,8 @@ require 'soap/mapping/mapping'
 require 'soap/mapping/typeMap'
 require 'soap/mapping/factory'
 require 'soap/mapping/rubytypeFactory'
+
+
 module SOAP
 module Mapping
 
@@ -122,7 +123,6 @@ class EncodedRegistry
 
   StringFactory = StringFactory_.new
   BasetypeFactory = BasetypeFactory_.new
-  FixnumFactory = FixnumFactory_.new
   DateTimeFactory = DateTimeFactory_.new
   ArrayFactory = ArrayFactory_.new
   Base64Factory = Base64Factory_.new
@@ -146,7 +146,6 @@ class EncodedRegistry
       {:derived_class => true}],
     [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
       {:derived_class => true}],
-    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
     [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
       {:derived_class => true}],
     [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
@@ -212,7 +211,6 @@ class EncodedRegistry
       {:derived_class => true}],
     [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
       {:derived_class => true}],
-    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
     [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
       {:derived_class => true}],
     [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
@@ -404,26 +402,31 @@ private
   def addextend2obj(obj, attr)
     return unless attr
     attr.split(/ /).reverse_each do |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)
+      obj.extend(Mapping.module_from_name(mstr))
     end
   end
 
   def addextend2soap(node, obj)
-    return if [Symbol, Fixnum, Bignum, Float].any?{ |c| obj.is_a?(c) }
-    list = (class << obj; self; end).ancestors - obj.class.ancestors
-    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 }")
+    return if obj.is_a?(Symbol) || obj.is_a?(Integer) || obj.is_a?(Float) ||
+              obj.is_a?(TrueClass) || obj.is_a?(FalseClass) || obj.is_a?(NilClass)
+
+    begin
+      list = (class << obj; self; end).ancestors - obj.class.ancestors
+      list = list.reject{|c| c.class == Class } # Filter out singleton classes
+
+      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
-      name
-    }.join(" ")
-    node.extraattr[RubyExtendName] = extra_attrs
+    rescue TypeError
+      # Object doesn't support singleton methods, just return
+      return
+    end
   end
 
   def stubobj2soap(obj, definition)
@@ -466,7 +469,6 @@ 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