rtiss_soap4r 2.1.0 → 3.0.0.beta

data/lib/wsdl/xmlSchema/complexContent.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema complexContent definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/complexExtension.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema complexType extension definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/complexRestriction.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema complexType restriction definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/complexType.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema complexType definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/content.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema content base definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/data.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema data definitions.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/element.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema element definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -98,7 +97,7 @@ class Element < Info
       end
     when FormAttrName
       @form = value.source
-      if @form != 'qualified' and @name.namespace
+      if @form != 'qualified' and @name && @name.namespace
         @name = XSD::QName.new(nil, @name.name)
       end
       @form

data/lib/wsdl/xmlSchema/enumeration.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema enumeration definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/fractiondigits.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema fractionDigits definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/group.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema group definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/import.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema import definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -8,6 +7,7 @@
 
 
 require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
 require 'wsdl/xmlSchema/importHandler'
 
 

data/lib/wsdl/xmlSchema/importHandler.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema import handler.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -8,6 +7,7 @@
 
 
 require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
 
 
 module WSDL

data/lib/wsdl/xmlSchema/importer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XSD importer library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/include.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema include definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -8,6 +7,7 @@
 
 
 require 'wsdl/info'
+require 'wsdl/xmlSchema/importer'
 require 'wsdl/xmlSchema/importHandler'
 
 

data/lib/wsdl/xmlSchema/length.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema length definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/list.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema list definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/maxexclusive.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema maxExclusive definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/maxinclusive.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema maxInclusive definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/maxlength.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema maxLength definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/minexclusive.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema minExclusive definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/mininclusive.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema minInclusive definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/minlength.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema minLength definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/parser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - WSDL XML Instance parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -112,10 +111,10 @@ private
     elename = ns.parse(name)
     if !parent
       if elename == SchemaName
-	o = Schema.parse_element(elename)
+	      o = Schema.parse_element(elename)
         o.location = @location
       else
-	raise UnknownElementError.new("unknown element: #{elename}")
+	      raise UnknownElementError.new("unknown element: #{elename}")
       end
       o.root = @originalroot if @originalroot   # o.root = o otherwise
     else
@@ -130,7 +129,7 @@ private
           warn("ignored element: #{elename} of #{parent.class}")
           @ignored[elename] = elename
         end
-	o = Documentation.new	# which accepts any element.
+	      o = Documentation.new	# which accepts any element.
       end
       # node could be a pseudo element.  pseudo element has its own parent.
       o.root = parent.root
@@ -141,7 +140,7 @@ private
       value_ele = ns.parse(value, false)
       value_ele.source = value  # for recovery; value may not be a QName
       if attr_ele == IdAttrName
-	o.id = value_ele
+	      o.id = value_ele
       else
         if o.parse_attr(attr_ele, value_ele).nil?
           unless @ignored.key?(attr_ele)

data/lib/wsdl/xmlSchema/pattern.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema pattern definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/ref.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema ref support.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema schema definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/sequence.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema complexType definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/simpleContent.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema simpleContent definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/simpleExtension.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema simpleType extension definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/simpleRestriction.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema simpleContent restriction definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/simpleType.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema simpleType definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/totaldigits.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema totalDigits definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/union.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema union definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/unique.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema unique element.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/whitespace.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # WSDL4R - XMLSchema whiteSpace definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/xsd2ruby.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XSD to ruby mapping library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -14,7 +13,6 @@ require 'wsdl/soap/classDefCreatorSupport'
 require 'wsdl/soap/literalMappingRegistryCreator'
 require 'wsdl/soap/classNameCreator'
 require 'logger'
-require 'logger-application' unless defined?(Logger::Application)
 
 
 module WSDL
@@ -123,7 +121,6 @@ private
       filename = File.join(basedir, filename)
     end
     File.open(filename, "w") do |f|
-      f.puts "# encoding: UTF-8"
       yield f
     end
   end

data/lib/xsd/charset.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - Charset handling library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -10,181 +9,192 @@
 module XSD
 
 
-module Charset
-  @internal_encoding = (RUBY_VERSION.to_f <= 1.8) ? $KCODE : 'UTF8' 
-
-  class XSDError < StandardError; end
-  class CharsetError < XSDError; end
-  class UnknownCharsetError < CharsetError; end
-  class CharsetConversionError < CharsetError; end
-
-public
-
-  ###
-  ## Maps
-  #
-  EncodingConvertMap = {}
-  def Charset.init
-    EncodingConvertMap[['UTF8', 'X_ISO_8859_1']] =
-      Proc.new { |str| str.unpack('U*').pack('C*') }
-    EncodingConvertMap[['X_ISO_8859_1', 'UTF8']] =
-      Proc.new { |str| str.unpack('C*').pack('U*') }
-    begin
-      require 'xsd/iconvcharset'
-      @internal_encoding = 'UTF8'
-      sjtag = (/(mswin|bccwin|mingw|cygwin|emx)/ =~ RUBY_PLATFORM) ? 'cp932' :
-        'shift_jis'
-      EncodingConvertMap[['UTF8', 'EUC' ]] =
-        Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "utf-8", str) }
-      EncodingConvertMap[['EUC' , 'UTF8']] =
-        Proc.new { |str| IconvCharset.safe_iconv("utf-8", "euc-jp", str) }
-      EncodingConvertMap[['EUC' , 'SJIS']] =
-        Proc.new { |str| IconvCharset.safe_iconv(sjtag, "euc-jp", str) }
-      EncodingConvertMap[['UTF8', 'SJIS']] =
-        Proc.new { |str| IconvCharset.safe_iconv(sjtag, "utf-8", str) }
-      EncodingConvertMap[['SJIS', 'UTF8']] =
-        Proc.new { |str| IconvCharset.safe_iconv("utf-8", sjtag, str) }
-      EncodingConvertMap[['SJIS', 'EUC' ]] =
-        Proc.new { |str| IconvCharset.safe_iconv("euc-jp", sjtag, str) }
-    rescue LoadError
-      begin
-       	require 'nkf'
-	EncodingConvertMap[['EUC' , 'SJIS']] =
-          Proc.new { |str| NKF.nkf('-sXm0', str) }
-	EncodingConvertMap[['SJIS', 'EUC' ]] =
-          Proc.new { |str| NKF.nkf('-eXm0', str) }
-      rescue LoadError
-      end
-  
+  module Charset
+    @internal_encoding = "UTF8" #$KCODE
+
+    class XSDError < StandardError; end
+    class CharsetError < XSDError; end
+    class UnknownCharsetError < CharsetError; end
+    class CharsetConversionError < CharsetError; end
+
+    public
+
+    ###
+    ## Maps
+    #
+    EncodingConvertMap = {}
+    def Charset.init
+      EncodingConvertMap[['UTF8', 'X_ISO_8859_1']] =
+        Proc.new { |str| str.unpack('U*').pack('C*') }
+      EncodingConvertMap[['X_ISO_8859_1', 'UTF8']] =
+        Proc.new { |str| str.unpack('C*').pack('U*') }
       begin
-	require 'uconv'
-	@internal_encoding = 'UTF8'
-	EncodingConvertMap[['UTF8', 'EUC' ]] = Uconv.method(:u8toeuc)
-	EncodingConvertMap[['UTF8', 'SJIS']] = Uconv.method(:u8tosjis)
-	EncodingConvertMap[['EUC' , 'UTF8']] = Uconv.method(:euctou8)
-	EncodingConvertMap[['SJIS', 'UTF8']] = Uconv.method(:sjistou8)
+        require 'xsd/iconvcharset'
+        @internal_encoding = 'UTF8'
+        sjtag = (/(mswin|bccwin|mingw|cygwin|emx)/ =~ RUBY_PLATFORM) ? 'cp932' :
+                  'shift_jis'
+        EncodingConvertMap[['UTF8', 'EUC' ]] =
+          Proc.new { |str| IconvCharset.safe_iconv("euc-jp", "utf-8", str) }
+        EncodingConvertMap[['EUC' , 'UTF8']] =
+          Proc.new { |str| IconvCharset.safe_iconv("utf-8", "euc-jp", str) }
+        EncodingConvertMap[['EUC' , 'SJIS']] =
+          Proc.new { |str| IconvCharset.safe_iconv(sjtag, "euc-jp", str) }
+        EncodingConvertMap[['UTF8', 'SJIS']] =
+          Proc.new { |str| IconvCharset.safe_iconv(sjtag, "utf-8", str) }
+        EncodingConvertMap[['SJIS', 'UTF8']] =
+          Proc.new { |str| IconvCharset.safe_iconv("utf-8", sjtag, str) }
+        EncodingConvertMap[['SJIS', 'EUC' ]] =
+          Proc.new { |str| IconvCharset.safe_iconv("euc-jp", sjtag, str) }
       rescue LoadError
+        begin
+          require 'nkf'
+          EncodingConvertMap[['EUC' , 'SJIS']] =
+            Proc.new { |str| NKF.nkf('-sXm0', str) }
+          EncodingConvertMap[['SJIS', 'EUC' ]] =
+            Proc.new { |str| NKF.nkf('-eXm0', str) }
+        rescue LoadError
+        end
+
+        begin
+          require 'uconv'
+          @internal_encoding = 'UTF8'
+          EncodingConvertMap[['UTF8', 'EUC' ]] = Uconv.method(:u8toeuc)
+          EncodingConvertMap[['UTF8', 'SJIS']] = Uconv.method(:u8tosjis)
+          EncodingConvertMap[['EUC' , 'UTF8']] = Uconv.method(:euctou8)
+          EncodingConvertMap[['SJIS', 'UTF8']] = Uconv.method(:sjistou8)
+        rescue LoadError
+        end
       end
     end
-  end
-  self.init
+    self.init
 
-  CharsetMap = {
-    'NONE' => 'us-ascii',
-    'EUC' => 'euc-jp',
-    'SJIS' => 'shift_jis',
-    'UTF8' => 'utf-8',
-    'X_ISO_8859_1' => 'iso-8859-1',
-    'X_UNKNOWN' => nil,
-  }
+    CharsetMap = {
+      'NONE' => 'us-ascii',
+      'EUC' => 'euc-jp',
+      'SJIS' => 'shift_jis',
+      'UTF8' => 'utf-8',
+      'X_ISO_8859_1' => 'iso-8859-1',
+      'X_UNKNOWN' => nil,
+    }
 
-  CharsetStrCache = {}
+    CharsetStrCache = {}
 
 
-  ###
-  ## handlers
-  #
-  def Charset.encoding
-    @internal_encoding
-  end
+    ###
+    ## handlers
+    #
+    def Charset.encoding
+      @internal_encoding
+    end
 
-  def Charset.encoding=(encoding)
-    warn("xsd charset is set to #{encoding}") if $DEBUG
-    @internal_encoding = encoding
-  end
+    def Charset.encoding=(encoding)
+      warn("xsd charset is set to #{encoding}") if $DEBUG
+      @internal_encoding = encoding
+    end
 
-  def Charset.xml_encoding_label
-    charset_label(@internal_encoding)
-  end
+    def Charset.xml_encoding_label
+      charset_label(@internal_encoding)
+    end
 
-  def Charset.encoding_to_xml(str, charset)
-    encoding_conv(str, @internal_encoding, charset_str(charset))
-  end
+    def Charset.encoding_to_xml(str, charset)
+      encoding_conv(str, @internal_encoding, charset_str(charset))
+    end
 
-  def Charset.encoding_from_xml(str, charset)
-    encoding_conv(str, charset_str(charset), @internal_encoding)
-  end
+    def Charset.encoding_from_xml(str, charset)
+      encoding_conv(str, charset_str(charset), @internal_encoding)
+    end
 
-  def Charset.encoding_conv(str, enc_from, enc_to)
-    if enc_from == enc_to or enc_from == 'NONE' or enc_to == 'NONE'
-      str
-    elsif converter = EncodingConvertMap[[enc_from, enc_to]]
-      converter.call(str)
-    else
-      raise CharsetConversionError.new(
-	"Converter not found: #{enc_from} -> #{enc_to}")
+    def Charset.encoding_conv(str, enc_from, enc_to)
+      if enc_from == enc_to or enc_from == 'NONE' or enc_to == 'NONE'
+        str
+      elsif converter = EncodingConvertMap[[enc_from, enc_to]]
+        converter.call(str)
+      else
+        raise CharsetConversionError.new(
+          "Converter not found: #{enc_from} -> #{enc_to}")
+      end
     end
-  end
 
-  def Charset.charset_label(encoding)
-    CharsetMap[encoding.upcase]
-  end
+    def Charset.charset_label(encoding)
+      CharsetMap[encoding.upcase]
+    end
 
-  def Charset.charset_str(label)
-    if CharsetMap.respond_to?(:key)
-      CharsetStrCache[label] ||= CharsetMap.key(label.downcase) || 'X_UNKNOWN'
-    else
-      CharsetStrCache[label] ||= CharsetMap.index(label.downcase) || 'X_UNKNOWN'
+    def Charset.charset_str(label)
+      if CharsetMap.respond_to?(:key)
+        CharsetStrCache[label] ||= CharsetMap.key(label.downcase) || 'X_UNKNOWN'
+      else
+        CharsetStrCache[label] ||= CharsetMap.index(label.downcase) || 'X_UNKNOWN'
+      end
     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, 'n')
-
-  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, 'n')
-
-  # 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, 'n')
-
-  # 0xxxxxxx
-  # 110yyyyy 10xxxxxx
-  twobytes_utf8 = '(?:[\xC0-\xDF][\x80-\xBF])'
-  # 1110zzzz 10yyyyyy 10xxxxxx
-  threebytes_utf8 = '(?:[\xE0-\xEF][\x80-\xBF][\x80-\xBF])'
-  # 11110uuu 10uuuzzz 10yyyyyy 10xxxxxx
-  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, 'n')
-
-  def Charset.is_us_ascii(str)
-    USASCIIRegexp =~ str
-  end
+    # us_ascii = '[\x00-\x7F]'
+    us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
+    USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z")
+
+    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", Regexp::NOENCODING)
+
+    # 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", Regexp::NOENCODING)
+
+    # 0xxxxxxx
+    # 110yyyyy 10xxxxxx
+    twobytes_utf8 = '(?:[\xC0-\xDF][\x80-\xBF])'
+    # 1110zzzz 10yyyyyy 10xxxxxx
+    threebytes_utf8 = '(?:[\xE0-\xEF][\x80-\xBF][\x80-\xBF])'
+    # 11110uuu 10uuuzzz 10yyyyyy 10xxxxxx
+    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", Regexp::NOENCODING)
+
+    def Charset.is_us_ascii(str)
+      check_encoding(str)
+      USASCIIRegexp =~ str
+    end
 
-  def Charset.is_utf8(str)
-    UTF8Regexp =~ str
-  end
+    def Charset.is_utf8(str)
+      check_encoding(str)
+      UTF8Regexp =~ str
+    end
 
-  def Charset.is_euc(str)
-    EUCRegexp =~ str
-  end
+    def Charset.is_euc(str)
+      check_encoding(str)
+      EUCRegexp =~ str
+    end
 
-  def Charset.is_sjis(str)
-    SJISRegexp =~ str
-  end
+    def Charset.is_sjis(str)
+      check_encoding(str)
+      SJISRegexp =~ str
+    end
 
-  def Charset.is_ces(str, code = @internal_encoding)
-    case code
-    when 'NONE'
-      is_us_ascii(str)
-    when 'UTF8'
-      is_utf8(str)
-    when 'EUC'
-      is_euc(str)
-    when 'SJIS'
-      is_sjis(str)
-    else
-      raise UnknownCharsetError.new("Unknown charset: #{code}")
+    def Charset.is_ces(str, code = @internal_encoding)
+      check_encoding(str)
+      case code
+      when 'NONE'
+        is_us_ascii(str)
+      when 'UTF8'
+        is_utf8(str)
+      when 'EUC'
+        is_euc(str)
+      when 'SJIS'
+        is_sjis(str)
+      else
+        raise UnknownCharsetError.new("Unknown charset: #{code}")
+      end
     end
+
+    private
+
+    def Charset.check_encoding(str)
+      raise XSD::ValueSpaceError.new("invalid byte sequence: #{str.dump}") unless str.valid_encoding?
+    end
+
   end
-end
 
 
 end

data/lib/xsd/codegen/classdef.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - Generating class definition code
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.