soap4r 1.5.7 → 1.5.8

data/lib/wsdl/xmlSchema/importHandler.rb

@@ -0,0 +1,45 @@
+# WSDL4R - XMLSchema import handler.
+# 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 'wsdl/xmlSchema/importer'
+
+
+module WSDL
+module XMLSchema
+
+
+class ImportHandler
+  attr_reader :schemalocation
+  attr_reader :content
+
+  def initialize
+    @schemalocation = nil
+    @content = nil
+  end
+
+  def parse_schemalocation(location, root, parent)
+    @schemalocation = URI.parse(location)
+    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 = Importer.import(@schemalocation, root)
+      root.importedschema[@schemalocation] = @content
+    end
+    @schemalocation
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/include.rb

@@ -8,6 +8,7 @@
 
 require 'wsdl/info'
 require 'wsdl/xmlSchema/importer'
+require 'wsdl/xmlSchema/importHandler'
 
 
 module WSDL
@@ -15,13 +16,17 @@ module XMLSchema
 
 
 class Include < Info
-  attr_reader :schemalocation
-  attr_reader :content
-
   def initialize
     super
-    @schemalocation = nil
-    @content = nil
+    @handler = ImportHandler.new
+  end
+
+  def schemalocation
+    @handler.schemalocation
+  end
+
+  def content
+    @handler.content
   end
 
   def parse_element(element)
@@ -31,22 +36,11 @@ class Include < Info
   def parse_attr(attr, value)
     case attr
     when SchemaLocationAttrName
-      @schemalocation = URI.parse(value.source)
-      if @schemalocation.relative?
-        @schemalocation = parent.location + @schemalocation
-      end
-      @content = import(@schemalocation)
-      @schemalocation
+      @handler.parse_schemalocation(value.source, root, parent)
     else
       nil
     end
   end
-
-private
-
-  def import(location)
-    Importer.import(location)
-  end
 end
 
 

data/lib/wsdl/xmlSchema/length.rb

@@ -24,8 +24,10 @@ class Length < Info
 
   def parse_attr(attr, value)
     case attr
+    when FixedAttrName
+      parent.fixed[:length] = to_boolean(value)
     when ValueAttrName
-      parent.length = Integer(value.source)
+      parent.length = to_int(value)
     end
   end
 end

data/lib/wsdl/xmlSchema/maxexclusive.rb

@@ -0,0 +1,37 @@
+# WSDL4R - XMLSchema maxExclusive 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 MaxExclusive < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FixedAttrName
+      parent.fixed[:maxexclusive] = to_boolean(value)
+    when ValueAttrName
+      parent.maxexclusive = value.source
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/maxinclusive.rb

@@ -0,0 +1,37 @@
+# WSDL4R - XMLSchema maxInclusive 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 MaxInclusive < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FixedAttrName
+      parent.fixed[:maxinclusive] = to_boolean(value)
+    when ValueAttrName
+      parent.maxinclusive = value.source
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/maxlength.rb

@@ -24,8 +24,10 @@ class MaxLength < Info
 
   def parse_attr(attr, value)
     case attr
+    when FixedAttrName
+      parent.fixed[:maxlength] = to_boolean(value)
     when ValueAttrName
-      parent.maxlength = Integer(value.source)
+      parent.maxlength = to_int(value)
     end
   end
 end

data/lib/wsdl/xmlSchema/minexclusive.rb

@@ -0,0 +1,37 @@
+# WSDL4R - XMLSchema minExclusive 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 MinExclusive < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FixedAttrName
+      parent.fixed[:minexclusive] = to_boolean(value)
+    when ValueAttrName
+      parent.minexclusive = value.source
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/mininclusive.rb

@@ -0,0 +1,37 @@
+# WSDL4R - XMLSchema minInclusive 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 MinInclusive < Info
+  def initialize
+    super
+  end
+
+  def parse_element(element)
+    nil
+  end
+
+  def parse_attr(attr, value)
+    case attr
+    when FixedAttrName
+      parent.fixed[:mininclusive] = to_boolean(value)
+    when ValueAttrName
+      parent.mininclusive = value.source
+    end
+  end
+end
+
+
+end
+end

data/lib/wsdl/xmlSchema/minlength.rb

@@ -24,8 +24,10 @@ class MinLength < Info
 
   def parse_attr(attr, value)
     case attr
+    when FixedAttrName
+      parent.fixed[:minlength] = to_boolean(value)
     when ValueAttrName
-      parent.minlength = Integer(value.source)
+      parent.minlength = to_int(value)
     end
   end
 end

data/lib/wsdl/xmlSchema/schema.rb

@@ -20,9 +20,12 @@ class Schema < Info
   attr_reader :simpletypes
   attr_reader :elements
   attr_reader :attributes
+  attr_reader :modelgroups
+  attr_reader :attributegroups
   attr_reader :imports
   attr_accessor :attributeformdefault
   attr_accessor :elementformdefault
+  attr_accessor :version
 
   attr_reader :importedschema
 
@@ -33,12 +36,15 @@ class Schema < Info
     @simpletypes = XSD::NamedElements.new
     @elements = XSD::NamedElements.new
     @attributes = XSD::NamedElements.new
+    @modelgroups = XSD::NamedElements.new
+    @attributegroups = XSD::NamedElements.new
     @imports = []
     @attributeformdefault = "unqualified"
     @elementformdefault = "unqualified"
     @importedschema = {}
     @location = nil
     @root = self
+    @version = nil
   end
 
   def location
@@ -76,6 +82,14 @@ class Schema < Info
       o = Attribute.new
       @attributes << o
       o
+    when GroupName
+      o = Group.new
+      @modelgroups << o
+      o
+    when AttributeGroupName
+      o = AttributeGroup.new
+      @attributegroups << o
+      o
     else
       nil
     end
@@ -89,6 +103,8 @@ class Schema < Info
       @attributeformdefault = value.source
     when ElementFormDefaultAttrName
       @elementformdefault = value.source
+    when VersionAttrName
+      @version = value.source
     else
       nil
     end
@@ -103,6 +119,24 @@ class Schema < Info
     result
   end
 
+  def collect_modelgroups
+    result = XSD::NamedElements.new
+    result.concat(@modelgroups)
+    @imports.each do |import|
+      result.concat(import.content.collect_modelgroups) if import.content
+    end
+    result
+  end
+
+  def collect_attributegroups
+    result = XSD::NamedElements.new
+    result.concat(@attributegroups)
+    @imports.each do |import|
+      result.concat(import.content.collect_attributegroups) if import.content
+    end
+    result
+  end
+
   def collect_elements
     result = XSD::NamedElements.new
     result.concat(@elements)

data/lib/wsdl/xmlSchema/sequence.rb

@@ -35,8 +35,11 @@ class Sequence < Content
       o = Choice.new
       @elements << o
       o
+    when GroupName
+      o = Group.new
+      @elements << o
+      o
     when AnyName
-      raise ElementConstraintError.new("duplicated element: any") if @any
       @any = Any.new
       @elements << @any
       @any

data/lib/wsdl/xmlSchema/simpleExtension.rb

@@ -38,6 +38,14 @@ class SimpleExtension < 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/simpleRestriction.rb

@@ -16,11 +16,20 @@ module XMLSchema
 
 class SimpleRestriction < Info
   attr_reader :base
-  attr_reader :enumeration
   attr_accessor :length
-  attr_accessor :maxlength
   attr_accessor :minlength
+  attr_accessor :maxlength
   attr_accessor :pattern
+  attr_reader :enumeration
+  attr_accessor :whitespace
+  attr_accessor :maxinclusive
+  attr_accessor :maxexlusive
+  attr_accessor :minexlusive
+  attr_accessor :mininclusive
+  attr_accessor :totaldigits
+  attr_accessor :fractiondigits
+  attr_reader :fixed
+  attr_reader :attributes
 
   def initialize
     super
@@ -30,6 +39,8 @@ class SimpleRestriction < Info
     @maxlength = nil
     @minlength = nil
     @pattern = nil
+    @fixed = {}
+    @attributes = XSD::NamedElements.new
   end
   
   def valid?(value)
@@ -41,18 +52,48 @@ class SimpleRestriction < Info
     true
   end
 
+  def enumeration?
+    !@enumeration.empty?
+  end
+
   def parse_element(element)
     case element
-    when EnumerationName
-      Enumeration.new
     when LengthName
       Length.new
-    when PatternName
-      Pattern.new
-    when MaxLengthName
-      MaxLength.new
     when MinLengthName
       MinLength.new
+    when MaxLengthName
+      MaxLength.new
+    when PatternName
+      Pattern.new
+    when EnumerationName
+      Enumeration.new
+    when WhiteSpaceName
+      WhiteSpace.new
+    when MaxInclusiveName
+      MaxInclusive.new
+    when MaxExclusiveName
+      MaxExlusive.new
+    when MinExclusiveName
+      MinExlusive.new
+    when MinInclusiveName
+      MinInclusive.new
+    when TotalDigitsName
+      TotalDigits.new
+    when FractionDigitsName
+      FractionDigits.new
+    when AttributeName
+      o = Attribute.new
+      @attributes << o
+      o
+    when AttributeGroupName
+      o = AttributeGroup.new
+      @attributes << o
+      o
+    when AnyAttributeName
+      o = AnyAttribute.new
+      @attributes << o
+      o
     end
   end