soap4r 1.5.7 → 1.5.8

data/lib/wsdl/xmlSchema/complexExtension.rb

@@ -63,7 +63,7 @@ class ComplexExtension < Info
   def check_type
     if @base == ::SOAP::ValueArrayName
       :TYPE_ARRAY
-    elsif content
+    elsif content or !@attributes.empty?
       :TYPE_STRUCT
     else
       basetype.check_type
@@ -85,6 +85,14 @@ class ComplexExtension < Info
       o = Attribute.new
       @attributes << o
       o
+    when AttributeGroupName
+      o = AttributeGroup.new
+      @attributes << o
+      o
+    when AnyAttributeName
+      o = AnyAttribute.new
+      @attributes << o
+      o
     end
   end
 

data/lib/wsdl/xmlSchema/complexRestriction.rb

@@ -74,6 +74,14 @@ class ComplexRestriction < Info
       o = Attribute.new
       @attributes << o
       o
+    when AttributeGroupName
+      o = AttributeGroup.new
+      @attributes << o
+      o
+    when AnyAttributeName
+      o = AnyAttribute.new
+      @attributes << o
+      o
     end
   end
 

data/lib/wsdl/xmlSchema/complexType.rb

@@ -62,6 +62,12 @@ class ComplexType < Info
     end
   end
 
+  def base
+    if c = @complexcontent || @simplecontent
+      c.base
+    end
+  end
+
   def elements
     if c = @complexcontent || @content
       c.elements
@@ -71,13 +77,30 @@ class ComplexType < Info
   end
 
   def attributes
+    attrs = nil
     if @complexcontent
-      @complexcontent.attributes + @attributes
+      attrs = @complexcontent.attributes + @attributes
     elsif @simplecontent
-      @simplecontent.attributes + @attributes
+      attrs = @simplecontent.attributes + @attributes
     else
-      @attributes
+      attrs = @attributes
+    end
+    found = XSD::NamedElements.new
+    attrs.each do |attr|
+      case attr
+      when Attribute
+        found << attr
+      when AttributeGroup
+        if attr.attributes
+          found.concat(attr.attributes)
+        end
+      when AnyAttribute
+        # ignored
+      else
+        warn("unknown attribute: #{attr}")
+      end
     end
+    found
   end
 
   def nested_elements
@@ -126,6 +149,8 @@ class ComplexType < Info
       @content = Sequence.new
     when ChoiceName
       @content = Choice.new
+    when GroupName
+      @content = Group.new
     when ComplexContentName
       @complexcontent = ComplexContent.new
     when SimpleContentName
@@ -134,6 +159,14 @@ class ComplexType < Info
       o = Attribute.new
       @attributes << o
       o
+    when AttributeGroupName
+      o = AttributeGroup.new
+      @attributes << o
+      o
+    when AnyAttributeName
+      o = AnyAttribute.new
+      @attributes << o
+      o
     else
       nil
     end
@@ -142,11 +175,11 @@ class ComplexType < Info
   def parse_attr(attr, value)
     case attr
     when AbstractAttrName
-      @abstract = (value.source == 'true')
+      @abstract = to_boolean(value)
     when FinalAttrName
       @final = value.source
     when MixedAttrName
-      @mixed = (value.source == 'true')
+      @mixed = to_boolean(value)
     when NameAttrName
       @name = XSD::QName.new(targetnamespace, value.source)
     else

data/lib/wsdl/xmlSchema/data.rb

@@ -20,6 +20,7 @@ require 'wsdl/xmlSchema/complexRestriction'
 require 'wsdl/xmlSchema/complexExtension'
 require 'wsdl/xmlSchema/simpleContent'
 require 'wsdl/xmlSchema/any'
+require 'wsdl/xmlSchema/anyAttribute'
 require 'wsdl/xmlSchema/element'
 require 'wsdl/xmlSchema/all'
 require 'wsdl/xmlSchema/choice'
@@ -28,11 +29,21 @@ require 'wsdl/xmlSchema/list'
 require 'wsdl/xmlSchema/attribute'
 require 'wsdl/xmlSchema/union'
 require 'wsdl/xmlSchema/unique'
-require 'wsdl/xmlSchema/enumeration'
+require 'wsdl/xmlSchema/group'
+require 'wsdl/xmlSchema/attributeGroup'
+
 require 'wsdl/xmlSchema/length'
-require 'wsdl/xmlSchema/maxlength'
 require 'wsdl/xmlSchema/minlength'
+require 'wsdl/xmlSchema/maxlength'
 require 'wsdl/xmlSchema/pattern'
+require 'wsdl/xmlSchema/enumeration'
+require 'wsdl/xmlSchema/whitespace'
+require 'wsdl/xmlSchema/maxinclusive'
+require 'wsdl/xmlSchema/maxexclusive'
+require 'wsdl/xmlSchema/minexclusive'
+require 'wsdl/xmlSchema/mininclusive'
+require 'wsdl/xmlSchema/totaldigits'
+require 'wsdl/xmlSchema/fractiondigits'
 
 module WSDL
 module XMLSchema
@@ -41,20 +52,18 @@ module XMLSchema
 AllName = XSD::QName.new(XSD::Namespace, 'all')
 AnnotationName = XSD::QName.new(XSD::Namespace, 'annotation')
 AnyName = XSD::QName.new(XSD::Namespace, 'any')
+AnyAttributeName = XSD::QName.new(XSD::Namespace, 'anyAttribute')
 AttributeName = XSD::QName.new(XSD::Namespace, 'attribute')
+AttributeGroupName = XSD::QName.new(XSD::Namespace, 'attributeGroup')
 ChoiceName = XSD::QName.new(XSD::Namespace, 'choice')
 ComplexContentName = XSD::QName.new(XSD::Namespace, 'complexContent')
 ComplexTypeName = XSD::QName.new(XSD::Namespace, 'complexType')
 ElementName = XSD::QName.new(XSD::Namespace, 'element')
-EnumerationName = XSD::QName.new(XSD::Namespace, 'enumeration')
 ExtensionName = XSD::QName.new(XSD::Namespace, 'extension')
+GroupName = XSD::QName.new(XSD::Namespace, 'group')
 ImportName = XSD::QName.new(XSD::Namespace, 'import')
 IncludeName = XSD::QName.new(XSD::Namespace, 'include')
-LengthName = XSD::QName.new(XSD::Namespace, 'length')
 ListName = XSD::QName.new(XSD::Namespace, 'list')
-MaxLengthName = XSD::QName.new(XSD::Namespace, 'maxLength')
-MinLengthName = XSD::QName.new(XSD::Namespace, 'minLength')
-PatternName = XSD::QName.new(XSD::Namespace, 'pattern')
 RestrictionName = XSD::QName.new(XSD::Namespace, 'restriction')
 SequenceName = XSD::QName.new(XSD::Namespace, 'sequence')
 SchemaName = XSD::QName.new(XSD::Namespace, 'schema')
@@ -63,6 +72,19 @@ SimpleTypeName = XSD::QName.new(XSD::Namespace, 'simpleType')
 UnionName = XSD::QName.new(XSD::Namespace, 'union')
 UniqueName = XSD::QName.new(XSD::Namespace, 'unique')
 
+LengthName = XSD::QName.new(XSD::Namespace, 'length')
+MinLengthName = XSD::QName.new(XSD::Namespace, 'minLength')
+MaxLengthName = XSD::QName.new(XSD::Namespace, 'maxLength')
+PatternName = XSD::QName.new(XSD::Namespace, 'pattern')
+EnumerationName = XSD::QName.new(XSD::Namespace, 'enumeration')
+WhiteSpaceName = XSD::QName.new(XSD::Namespace, 'whiteSpace')
+MaxInclusiveName = XSD::QName.new(XSD::Namespace, 'maxInclusive')
+MaxExclusiveName = XSD::QName.new(XSD::Namespace, 'maxExclusive')
+MinExclusiveName = XSD::QName.new(XSD::Namespace, 'minExclusive')
+MinInclusiveName = XSD::QName.new(XSD::Namespace, 'minInclusive')
+TotalDigitsName = XSD::QName.new(XSD::Namespace, 'totalDigits')
+FractionDigitsName = XSD::QName.new(XSD::Namespace, 'fractionDigits')
+
 AbstractAttrName = XSD::QName.new(nil, 'abstract')
 AttributeFormDefaultAttrName = XSD::QName.new(nil, 'attributeFormDefault')
 BaseAttrName = XSD::QName.new(nil, 'base')
@@ -87,6 +109,7 @@ TargetNamespaceAttrName = XSD::QName.new(nil, 'targetNamespace')
 TypeAttrName = XSD::QName.new(nil, 'type')
 UseAttrName = XSD::QName.new(nil, 'use')
 ValueAttrName = XSD::QName.new(nil, 'value')
+VersionAttrName = XSD::QName.new(nil, 'version')
 
 
 end

data/lib/wsdl/xmlSchema/element.rb

@@ -1,4 +1,4 @@
-# WSDL4R - XMLSchema element definition for WSDL.
+# WSDL4R - XMLSchema element definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
 # This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
@@ -52,6 +52,8 @@ class Element < Info
   attr_reader_ref :local_complextype
   attr_reader_ref :constraint
   attr_reader_ref :nillable
+  attr_reader_ref :default
+  attr_reader_ref :abstract
 
   attr_accessor :ref
 
@@ -65,6 +67,8 @@ class Element < Info
     @maxoccurs = 1
     @minoccurs = 1
     @nillable = nil
+    @default = nil
+    @abstract = false
     @ref = nil
     @refelement = nil
   end
@@ -147,7 +151,11 @@ class Element < Info
       end
       @minoccurs = Integer(value.source)
     when NillableAttrName
-      @nillable = (value.source == 'true')
+      @nillable = to_boolean(value)
+    when DefaultAttrName
+      @default = value.source
+    when AbstractAttrName
+      @abstract = to_boolean(value)
     else
       nil
     end

data/lib/wsdl/xmlSchema/fractiondigits.rb

@@ -0,0 +1,37 @@
+# WSDL4R - XMLSchema fractionDigits 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'
+
+
+module WSDL
+module XMLSchema
+
+
+class FractionDigits < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FixedAttrName
+      parent.fixed[:fractiondigits] = to_boolean(value)
+    when ValueAttrName
+      parent.fractiondigits = to_int(value)
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/group.rb

@@ -0,0 +1,118 @@
+# WSDL4R - XMLSchema group definition.
+# 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'
+
+
+module WSDL
+module XMLSchema
+
+
+class Group < Info
+  class << self
+    if RUBY_VERSION > "1.7.0"
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        define_method(name) {
+          instance_variable_get("@#{name}") ||
+            (refelement ? refelement.__send__(name) : nil)
+        }
+      end
+    else
+      def attr_reader_ref(symbol)
+        name = symbol.to_s
+        module_eval <<-EOS
+          def #{name}
+            @#{name} || (refelement ? refelement.#{name} : nil)
+          end
+        EOS
+      end
+    end
+  end
+
+  attr_writer :name	# required
+  attr_accessor :maxoccurs
+  attr_accessor :minoccurs
+  attr_writer :content
+
+  attr_reader_ref :name
+  attr_reader_ref :content
+
+  attr_accessor :ref
+
+  def initialize(name = nil)
+    super()
+    @name = name
+    @maxoccurs = 1
+    @minoccurs = 1
+    @content = nil
+    @ref = nil
+    @refelement = nil
+  end
+
+  def refelement
+    @refelement ||= (@ref ? root.collect_modelgroups[@ref] : nil)
+  end
+
+  def targetnamespace
+    parent.targetnamespace
+  end
+
+  def elementformdefault
+    parent.elementformdefault
+  end
+
+  def parse_element(element)
+    case element
+    when AllName
+      @content = All.new
+    when SequenceName
+      @content = Sequence.new
+    when ChoiceName
+      @content = Choice.new
+    else
+      nil
+    end
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when NameAttrName
+      @name = XSD::QName.new(targetnamespace, value.source)
+    when RefAttrName
+      @ref = value
+    when MaxOccursAttrName
+      if parent.is_a?(All)
+	if value.source != '1'
+	  raise Parser::AttributeConstraintError.new(
+            "cannot parse #{value} for #{attr}")
+	end
+      end
+      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)
+	  raise Parser::AttributeConstraintError.new(
+            "cannot parse #{value} for #{attr}")
+	end
+      end
+      @minoccurs = Integer(value.source)
+    else
+      nil
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/import.rb

@@ -8,6 +8,7 @@
 
 require 'wsdl/info'
 require 'wsdl/xmlSchema/importer'
+require 'wsdl/xmlSchema/importHandler'
 
 
 module WSDL
@@ -16,14 +17,19 @@ module XMLSchema
 
 class Import < Info
   attr_reader :namespace
-  attr_reader :schemalocation
-  attr_reader :content
 
   def initialize
     super
     @namespace = nil
-    @schemalocation = nil
-    @content = nil
+    @handler = ImportHandler.new
+  end
+
+  def schemalocation
+    @handler.schemalocation
+  end
+
+  def content
+    @handler.content
   end
 
   def parse_element(element)
@@ -35,29 +41,11 @@ class Import < Info
     when NamespaceAttrName
       @namespace = value.source
     when SchemaLocationAttrName
-      @schemalocation = URI.parse(value.source)
-      if @schemalocation.relative? and !parent.location.nil? and
-          !parent.location.relative?
-        @schemalocation = parent.location + @schemalocation
-      end
-      if root.importedschema.key?(@schemalocation)
-        @content = root.importedschema[@schemalocation]
-      else
-        root.importedschema[@schemalocation] = nil      # placeholder
-        @content = import(@schemalocation)
-        root.importedschema[@schemalocation] = @content
-      end
-      @schemalocation
+      @handler.parse_schemalocation(value.source, root, parent)
     else
       nil
     end
   end
-
-private
-
-  def import(location)
-    Importer.import(location, root)
-  end
 end