soap4r 1.5.7 → 1.5.8

data/lib/wsdl/xmlSchema/totaldigits.rb

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

data/lib/wsdl/xmlSchema/whitespace.rb

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

data/lib/wsdl/xmlSchema/xsd2ruby.rb

@@ -9,7 +9,9 @@
 require 'xsd/codegen/gensupport'
 require 'wsdl/xmlSchema/importer'
 require 'wsdl/soap/classDefCreator'
+require 'wsdl/soap/classDefCreatorSupport'
 require 'wsdl/soap/literalMappingRegistryCreator'
+require 'wsdl/soap/classNameCreator'
 require 'logger'
 
 
@@ -18,6 +20,8 @@ module XMLSchema
 
 
 class XSD2Ruby
+  include WSDL::SOAP::ClassDefCreatorSupport
+
   attr_accessor :location
   attr_reader :opt
   attr_accessor :logger
@@ -41,6 +45,7 @@ private
     @basedir = nil
     @xsd = nil
     @name = nil
+    @name_creator = WSDL::SOAP::ClassNameCreator.new
   end
 
   def create_file
@@ -55,7 +60,7 @@ private
     @classdef_filename = @name + '.rb'
     check_file(@classdef_filename) or return
     write_file(@classdef_filename) do |f|
-      f << WSDL::SOAP::ClassDefCreator.new(@xsd, @modulepath).dump
+      f << WSDL::SOAP::ClassDefCreator.new(@xsd, @name_creator, @modulepath).dump
     end
   end
 
@@ -78,9 +83,9 @@ private
   end
 
   def dump_mapping_registry
-    creator = WSDL::SOAP::LiteralMappingRegistryCreator.new(@xsd, @modulepath)
-    module_name = XSD::CodeGen::GenSupport.safeconstname(
-      @name + 'MappingRegistry')
+    defined_const = {}
+    creator = WSDL::SOAP::LiteralMappingRegistryCreator.new(@xsd, @name_creator, @modulepath, defined_const)
+    module_name = XSD::CodeGen::GenSupport.safeconstname(@name + 'MappingRegistry')
     if @modulepath
       module_name = [@modulepath, module_name].join('::')
     end
@@ -90,6 +95,10 @@ private
     varname = 'Registry'
     m.def_const(varname, '::SOAP::Mapping::LiteralRegistry.new')
     m.def_code(creator.dump(varname))
+    #
+    defined_const.each do |ns, tag|
+      m.def_const(tag, dq(ns))
+    end
     m.dump
   end
 

data/lib/xsd/charset.rb

@@ -77,6 +77,8 @@ public
     'X_UNKNOWN' => nil,
   }
 
+  CharsetStrCache = {}
+
 
   ###
   ## handlers
@@ -119,26 +121,26 @@ public
 
   def Charset.charset_str(label)
     if CharsetMap.respond_to?(:key)
-      CharsetMap.key(label.downcase) || 'X_UNKNOWN'
+      CharsetStrCache[label] ||= CharsetMap.key(label.downcase) || 'X_UNKNOWN'
     else
-      CharsetMap.index(label.downcase) || 'X_UNKNOWN'
+      CharsetStrCache[label] ||= CharsetMap.index(label.downcase) || 'X_UNKNOWN'
     end
   end
 
   # us_ascii = '[\x00-\x7F]'
   us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
-  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", nil, "NONE")
+  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", nil, 'NONE')
 
   twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
   threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
   character_euc = "(?:#{us_ascii}|#{twobytes_euc}|#{threebytes_euc})"
-  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", nil, "NONE")
+  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", nil, 'NONE')
 
   # onebyte_sjis = '[\x00-\x7F\xA1-\xDF]'
   onebyte_sjis = '[\x9\xa\xd\x20-\x7F\xA1-\xDF]'	# XML 1.0 restricted.
   twobytes_sjis = '(?:[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC])'
   character_sjis = "(?:#{onebyte_sjis}|#{twobytes_sjis})"
-  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", nil, "NONE")
+  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", nil, 'NONE')
 
   # 0xxxxxxx
   # 110yyyyy 10xxxxxx
@@ -149,7 +151,7 @@ public
   fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
   character_utf8 =
     "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
-  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, "NONE")
+  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, 'NONE')
 
   def Charset.is_us_ascii(str)
     USASCIIRegexp =~ str

data/lib/xsd/codegen/classdef.rb

@@ -60,6 +60,11 @@ class ClassDef < ModuleDef
       spacer = true
       buf << dump_const
     end
+    unless @innermodule.empty?
+      buf << dump_emptyline # always add 1 empty line
+      spacer = true
+      buf << dump_innermodule
+    end
     unless @code.empty?
       buf << dump_emptyline if spacer
       spacer = true

data/lib/xsd/codegen/moduledef.rb

@@ -19,6 +19,9 @@ class ModuleDef
   include GenSupport
   include CommentDef
 
+  attr_reader :name
+  attr_reader :innermodule
+
   def initialize(name)
     @name = name
     @comment = nil
@@ -26,6 +29,7 @@ class ModuleDef
     @code = []
     @requirepath = []
     @methoddef = []
+    @innermodule = []
   end
 
   def def_require(path)
@@ -77,6 +81,11 @@ class ModuleDef
       spacer = true
       buf << dump_const
     end
+    unless @innermodule.empty?
+      buf << dump_emptyline # always add 1 empty line
+      spacer = true
+      buf << dump_innermodule
+    end
     unless @code.empty?
       buf << dump_emptyline if spacer
       spacer = true
@@ -110,6 +119,14 @@ private
     )
   end
 
+  def dump_innermodule
+    dump_static(
+      @innermodule.collect { |moduledef|
+        moduledef.dump
+      }.join("\n")
+    )
+  end
+
   def dump_code
     dump_static(@code.join("\n"))
   end

data/lib/xsd/datatypes.rb

@@ -8,6 +8,7 @@
 
 require 'xsd/qname'
 require 'xsd/charset'
+require 'soap/nestedexception'
 require 'uri'
 
 
@@ -48,15 +49,15 @@ QNameLiteral = 'QName'
 NormalizedStringLiteral = 'normalizedString'
 TokenLiteral = 'token'
 LanguageLiteral = 'language'
-#3.3.4 NMTOKEN
-#3.3.5 NMTOKENS
-#3.3.6 Name
-#3.3.7 NCName
-#3.3.8 ID
-#3.3.9 IDREF
-#3.3.10 IDREFS
-#3.3.11 ENTITY
-#3.3.12 ENTITIES
+NMTOKENLiteral = 'NMTOKEN'
+NMTOKENSLiteral = 'NMTOKENS'
+NameLiteral = 'Name'
+NCNameLiteral = 'NCName'
+IDLiteral = 'ID'
+IDREFLiteral = 'IDREF'
+IDREFSLiteral = 'IDREFS'
+ENTITYLiteral = 'ENTITY'
+ENTITIESLiteral = 'ENTITIES'
 IntegerLiteral = 'integer'
 NonPositiveIntegerLiteral = 'nonPositiveInteger'
 NegativeIntegerLiteral = 'negativeInteger'
@@ -77,7 +78,7 @@ AttrNilName = QName.new(InstanceNamespace, NilLiteral)
 AnyTypeName = QName.new(Namespace, AnyTypeLiteral)
 AnySimpleTypeName = QName.new(Namespace, AnySimpleTypeLiteral)
 
-class Error < StandardError; end
+class Error < StandardError; include ::SOAP::NestedException; end
 class ValueSpaceError < Error; end
 
 
@@ -343,7 +344,7 @@ private
       begin
   	return narrow32bit(Float(str))
       rescue ArgumentError
-  	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+  	raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.", $!)
       end
     end
   end
@@ -409,10 +410,10 @@ private
 	  begin
 	    return Float(str + '0')
 	  rescue ArgumentError
-	    raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+	    raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.", $!)
 	  end
 	else
-	  raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+	  raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.", $!)
 	end
       end
     end
@@ -454,8 +455,8 @@ private
     unless Regexp.last_match
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
     end
-    if ($5 and ((!$2 and !$3 and !$4) or (!$6 and !$7 and !$8)))
-      # Should we allow 'PT5S' here?
+    if $5 and !$6 and !$7 and !$8
+      # allows durations lower than a day such as 'PT5S'.
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
     end
     sign = $1
@@ -491,12 +492,12 @@ private
     r << "#{ @min }M" if @min.nonzero?
     r << "#{ @sec }S" if @sec.nonzero?
     str << l
-    if l.empty?
-      str << "0D"
-    end
     unless r.empty?
       str << "T" << r
     end
+    if l.empty? and r.empty?
+      str << "0D"
+    end
     str
   end
 end
@@ -950,7 +951,7 @@ private
     begin
       URI.parse(value.to_s.strip)
     rescue URI::InvalidURIError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.", $!)
     end
   end
 end
@@ -1052,6 +1053,150 @@ private
   end
 end
 
+class XSDNMTOKEN < XSDToken
+  Type = QName.new(Namespace, NMTOKENLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDNMTOKENS < XSDNMTOKEN
+  Type = QName.new(Namespace, NMTOKENSLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    # derived by list
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDName < XSDToken
+  Type = QName.new(Namespace, NameLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDNCName < XSDName
+  Type = QName.new(Namespace, NCNameLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDID < XSDNCName
+  Type = QName.new(Namespace, IDLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDIDREF < XSDNCName
+  Type = QName.new(Namespace, IDREFLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDIDREFS < XSDIDREF
+  Type = QName.new(Namespace, IDREFSLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    # derived by list
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDENTITY < XSDNCName
+  Type = QName.new(Namespace, ENTITYLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
+class XSDENTITIES < XSDENTITY
+  Type = QName.new(Namespace, ENTITIESLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    # derived by list
+    # TODO: check lexical space and convert to a value
+    value
+  end
+end
+
 class XSDInteger < XSDDecimal
   Type = QName.new(Namespace, IntegerLiteral)
 
@@ -1065,7 +1210,7 @@ private
     begin
       data = Integer(str)
     rescue ArgumentError
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.", $!)
     end
     unless validate(data)
       raise ValueSpaceError.new("#{ type }: cannot accept '#{ str }'.")