soap4r 1.5.5.20061022 → 1.5.6

data/lib/wsdl/xmlSchema/complexExtension.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType extension definition for WSDL.
-# Copyright (C) 2005, 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -49,6 +49,13 @@ class ComplexExtension < Info
     result
   end
 
+  def nested_elements
+    result = XSD::NamedElements.new
+    result.concat(basetype.nested_elements)
+    result.concat(content.nested_elements) if content
+    result
+  end
+
   def attributes
     basetype.attributes + @attributes
   end

data/lib/wsdl/xmlSchema/complexRestriction.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType restriction definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -47,11 +47,15 @@ class ComplexRestriction < Info
     @content ? @content.elements : XSD::NamedElements::Empty
   end
 
+  def nested_elements
+    @content ? @content.nested_elements : XSD::NamedElements::Empty
+  end
+
   def check_type
     if @base == ::SOAP::ValueArrayName
       :TYPE_ARRAY
     else
-      basetype.check_type
+      basetype.check_type if basetype
     end
   end
   

data/lib/wsdl/xmlSchema/complexType.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType definition for WSDL.
-# Copyright (C) 2002, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -80,6 +80,14 @@ class ComplexType < Info
     end
   end
 
+  def nested_elements
+    if c = @complexcontent || @content
+      c.nested_elements
+    else
+      XSD::NamedElements::Empty
+    end
+  end
+
   def find_element(name)
     return nil if name.nil?
     elements.each do |element|

data/lib/wsdl/xmlSchema/content.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema content base definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -20,8 +20,8 @@ class Content < Info
 
   def initialize
     super()
-    @minoccurs = '1'
-    @maxoccurs = '1'
+    @minoccurs = 1
+    @maxoccurs = 1
     @elements = XSD::NamedElements.new
   end
 
@@ -41,6 +41,22 @@ class Content < Info
     false
   end
 
+  def map_as_array?
+    maxoccurs.nil? or maxoccurs != 1
+  end
+
+  def nested_elements
+    elements = XSD::NamedElements.new
+    @elements.each do |ele|
+      if ele.respond_to?(:nested_elements)
+        elements.concat(ele.nested_elements)
+      else
+        elements << ele
+      end
+    end
+    elements
+  end
+
   def <<(element)
     @elements << element
   end
@@ -60,9 +76,14 @@ class Content < Info
   def parse_attr(attr, value)
     case attr
     when MaxOccursAttrName
-      @maxoccurs = value.source
+      if value.source == 'unbounded'
+        @maxoccurs = nil
+      else
+        @maxoccurs = Integer(value.source)
+      end
+      value.source
     when MinOccursAttrName
-      @minoccurs = value.source
+      @minoccurs = Integer(value.source)
     else
       nil
     end

data/lib/wsdl/xmlSchema/data.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema data definitions.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -26,6 +26,7 @@ require 'wsdl/xmlSchema/choice'
 require 'wsdl/xmlSchema/sequence'
 require 'wsdl/xmlSchema/list'
 require 'wsdl/xmlSchema/attribute'
+require 'wsdl/xmlSchema/union'
 require 'wsdl/xmlSchema/unique'
 require 'wsdl/xmlSchema/enumeration'
 require 'wsdl/xmlSchema/length'
@@ -59,6 +60,7 @@ SequenceName = XSD::QName.new(XSD::Namespace, 'sequence')
 SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
 SimpleContentName = XSD::QName.new(XSD::Namespace, 'simpleContent')
 SimpleTypeName = XSD::QName.new(XSD::Namespace, 'simpleType')
+UnionName = XSD::QName.new(XSD::Namespace, 'union')
 UniqueName = XSD::QName.new(XSD::Namespace, 'unique')
 
 AbstractAttrName = XSD::QName.new(nil, 'abstract')
@@ -72,6 +74,7 @@ FormAttrName = XSD::QName.new(nil, 'form')
 IdAttrName = XSD::QName.new(nil, 'id')
 ItemTypeAttrName = XSD::QName.new(nil, 'itemType')
 MaxOccursAttrName = XSD::QName.new(nil, 'maxOccurs')
+MemberTypesAttrName = XSD::QName.new(nil, 'memberTypes')
 MinOccursAttrName = XSD::QName.new(nil, 'minOccurs')
 MixedAttrName = XSD::QName.new(nil, 'mixed')
 NameAttrName = XSD::QName.new(nil, 'name')

data/lib/wsdl/xmlSchema/element.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema element definition for WSDL.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -41,8 +41,8 @@ class Element < Info
   attr_writer :local_simpletype
   attr_writer :local_complextype
   attr_writer :constraint
-  attr_writer :maxoccurs
-  attr_writer :minoccurs
+  attr_accessor :maxoccurs
+  attr_accessor :minoccurs
   attr_writer :nillable
 
   attr_reader_ref :name
@@ -51,8 +51,6 @@ class Element < Info
   attr_reader_ref :local_simpletype
   attr_reader_ref :local_complextype
   attr_reader_ref :constraint
-  attr_reader_ref :maxoccurs
-  attr_reader_ref :minoccurs
   attr_reader_ref :nillable
 
   attr_accessor :ref
@@ -64,8 +62,8 @@ class Element < Info
     @type = type
     @local_simpletype = @local_complextype = nil
     @constraint = nil
-    @maxoccurs = '1'
-    @minoccurs = '1'
+    @maxoccurs = 1
+    @minoccurs = 1
     @nillable = nil
     @ref = nil
     @refelement = nil
@@ -130,7 +128,12 @@ class Element < Info
             "cannot parse #{value} for #{attr}")
 	end
       end
-      @maxoccurs = value.source
+      if value.source == 'unbounded'
+        @maxoccurs = nil
+      else
+        @maxoccurs = Integer(value.source)
+      end
+      value.source
     when MinOccursAttrName
       if parent.is_a?(All)
 	unless ['0', '1'].include?(value.source)
@@ -138,7 +141,7 @@ class Element < Info
             "cannot parse #{value} for #{attr}")
 	end
       end
-      @minoccurs = value.source
+      @minoccurs = Integer(value.source)
     when NillableAttrName
       @nillable = (value.source == 'true')
     else

data/lib/wsdl/xmlSchema/enumeration.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema enumeration definition for WSDL.
-# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/import.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema import definition.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/importer.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XSD importer library.
-# Copyright (C) 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -27,8 +27,9 @@ class Importer
     unless location.is_a?(URI)
       location = URI.parse(location)
     end
-    content = parse(fetch(location), location, originalroot)
-    content.location = location
+    source, normalizedlocation = fetch(location)
+    content = parse(source, normalizedlocation, originalroot)
+    content.location = normalizedlocation
     content
   end
 
@@ -45,9 +46,11 @@ private
   def fetch(location)
     warn("importing: #{location}") if $DEBUG
     content = nil
+    normalizedlocation = location
     if location.scheme == 'file' or
         (location.relative? and FileTest.exist?(location.path))
       content = File.open(location.path).read
+      normalizedlocation = URI.parse('file://' + File.expand_path(location.path))
     elsif location.scheme and location.scheme.size == 1 and
         FileTest.exist?(location.to_s)
       # ToDo: remove this ugly workaround for a path with drive letter
@@ -58,12 +61,12 @@ private
       client.proxy = ::SOAP::Env::HTTP_PROXY
       client.no_proxy = ::SOAP::Env::NO_PROXY
       if opt = ::SOAP::Property.loadproperty(::SOAP::PropertyName)
-        ::SOAP::HTTPConfigLoader.set_options(client,
-          opt["client.protocol.http"])
+        http_opt = opt["client.protocol.http"]
+        ::SOAP::HTTPConfigLoader.set_options(client, http_opt) if http_opt
       end
       content = client.get_content(location)
     end
-    content
+    return content, normalizedlocation
   end
 
   def web_client

data/lib/wsdl/xmlSchema/include.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema include definition.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/length.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema length definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/list.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema list definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/maxlength.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema maxLength definition for WSDL.
-# Copyright (C) 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/minlength.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema minLength definition for WSDL.
-# Copyright (C) 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/parser.rb

@@ -1,5 +1,5 @@
 # WSDL4R - WSDL XML Instance parser library.
-# Copyright (C) 2002, 2003, 2005, 2006  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -72,13 +72,14 @@ public
     lastframe = @parsestack.last
     ns = parent = nil
     if lastframe
-      ns = lastframe.ns.clone_ns
+      ns = lastframe.ns
       parent = lastframe.node
     else
       ns = XSD::NS.new
       parent = nil
     end
-    attrs = XSD::XMLParser.filter_ns(ns, attrs)
+    # ns might be the same
+    ns, attrs = XSD::XMLParser.filter_ns(ns, attrs)
     node = decode_tag(ns, name, attrs, parent)
     @parsestack << ParseFrame.new(ns, name, node)
   end

data/lib/wsdl/xmlSchema/pattern.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema pattern definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/schema.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema schema definition for WSDL.
-# Copyright (C) 2002, 2003-2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/sequence.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema complexType definition for WSDL.
-# Copyright (C) 2002, 2003, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/simpleContent.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema simpleContent definition for WSDL.
-# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/simpleExtension.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema simpleType extension definition for WSDL.
-# Copyright (C) 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/simpleRestriction.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema simpleContent restriction definition for WSDL.
-# Copyright (C) 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;

data/lib/wsdl/xmlSchema/simpleType.rb

@@ -1,5 +1,5 @@
 # WSDL4R - XMLSchema simpleType definition for WSDL.
-# Copyright (C) 2004, 2005  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# 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;
@@ -18,12 +18,15 @@ class SimpleType < Info
   attr_accessor :name
   attr_reader :restriction
   attr_reader :list
+  attr_reader :union
 
   def check_lexical_format(value)
     if @restriction
       check_restriction(value)
     elsif @list
       # TODO: check
+    elsif @union
+      # TODO: check
     else
       raise ArgumentError.new("incomplete simpleType")
     end
@@ -42,6 +45,7 @@ class SimpleType < Info
     @name = name
     @restriction = nil
     @list = nil
+    @union = nil
   end
 
   def targetnamespace
@@ -56,6 +60,9 @@ class SimpleType < Info
     when ListName
       @list = List.new
       @list
+    when UnionName
+      @union = Union.new
+      @union
     end
   end
 

data/lib/wsdl/xmlSchema/union.rb

@@ -0,0 +1,35 @@
+# WSDL4R - XMLSchema union 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'
+require 'xsd/namedelements'
+
+
+module WSDL
+module XMLSchema
+
+
+class Union < Info
+  attr_reader :member_types
+
+  def initialize
+    super
+    @member_types = nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when MemberTypesAttrName
+      @member_types = value.source
+    end
+  end
+end
+
+
+end
+end