Changeset 1776

Timestamp:

05/15/07 22:34:45 (1 year ago)

Author:

nahi

Message:

• added support for token and language. applied a patch with a little modification.
  

Files:

• trunk/lib/soap/baseData.rb (modified) (1 diff)
• trunk/lib/soap/mapping/encodedregistry.rb (modified) (2 diffs)
• trunk/lib/soap/mapping/typeMap.rb (modified) (2 diffs)
• trunk/lib/xsd/datatypes.rb (modified) (3 diffs)
• trunk/test/xsd/test_xsd.rb (modified) (2 diffs)

trunk/lib/soap/baseData.rb

@@ -238 +238 @@
-  extend SOAPModuleUtils
-  SOAPENCType = QName.new(EncodingNamespace, StringLiteral)
+end
+
+class SOAPNormalizedString < XSD::XSDNormalizedString
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NormalizedStringLiteral)
+end
+
+class SOAPToken < XSD::XSDToken
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, TokenLiteral)
+end
+
+class SOAPLanguage < XSD::XSDLanguage
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, LanguageLiteral)
-end
-

trunk/lib/soap/mapping/encodedregistry.rb

@@ -188 +188 @@
-    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
-    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPNormalizedString, BasetypeFactory],
+    [::String,       ::SOAP::SOAPToken,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPLanguage,   BasetypeFactory],
-
-    [::Hash,         ::SOAP::SOAPArray,      HashFactory],
@@ -251 +254 @@
-    [::String,       ::SOAP::SOAPGMonth,     BasetypeFactory],
-    [::String,       ::SOAP::SOAPQName,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPNormalizedString, BasetypeFactory],
+    [::String,       ::SOAP::SOAPToken,      BasetypeFactory],
+    [::String,       ::SOAP::SOAPLanguage,   BasetypeFactory],
-
-    [::Hash,         ::SOAP::SOAPArray,      HashFactory],

trunk/lib/soap/mapping/typeMap.rb

@@ -14 +14 @@
-
-  XSD::XSDString::Type => SOAPString,
+  XSD::XSDNormalizedString::Type => SOAPNormalizedString,
+  XSD::XSDToken::Type => SOAPToken,
+  XSD::XSDLanguage::Type => SOAPLanguage,
-  XSD::XSDBoolean::Type => SOAPBoolean,
-  XSD::XSDDecimal::Type => SOAPDecimal,
@@ -47 +50 @@
-  # soap4r does not use soapenc types actively but it should be accepted.
-  SOAP::SOAPString::SOAPENCType => SOAPString,
+  SOAP::SOAPNormalizedString::SOAPENCType => SOAPNormalizedString,
+  SOAP::SOAPToken::SOAPENCType => SOAPToken,
+  SOAP::SOAPLanguage::SOAPENCType => SOAPLanguage,
-  SOAP::SOAPBoolean::SOAPENCType => SOAPBoolean,
-  SOAP::SOAPDecimal::SOAPENCType => SOAPDecimal,

trunk/lib/xsd/datatypes.rb

@@ -47 +47 @@
-
-NormalizedStringLiteral = 'normalizedString'
-
-
+
+
-#3.3.4 NMTOKEN
-#3.3.5 NMTOKENS
@@ -256 +256 @@
-    if d.is_a?(String)
-      # Integer("00012") => 10 in Ruby.
-.sub!
+ = d.sub
-    end
-    screen_data_str(d)
@@ -1014 +1014 @@
-end
-
+class XSDToken < XSDNormalizedString
+  Type = QName.new(Namespace, TokenLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    if /[\t\n]|\A | \z|  / =~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    super
+  end
+end  
+
+class XSDLanguage < XSDToken
+  Type = QName.new(Namespace, LanguageLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    if /\A(aa|ab|ae|af|ak|am|an|ar|as|av|ay|az|ba|be|bg|bh|bi|bm|bn|bo|br|bs|ca|ce|ch|co|cr|cs|cu|cv|cy|da|de|dv|dz|ee|el|en|eo|es|et|eu|fa|ff|fi|fj|fo|fr|fy|ga|gd|gl|gn|gu|gv|ha|he|hi|ho|hr|ht|hu|hy|hz|ia|id|ie|ig|ii|ik|io|is|it|iu|ja|jv|ka|kg|ki|kj|kk|kl|km|kn|ko|kr|ks|ku|kv|kw|ky|la|lb|lg|li|ln|lo|lt|lu|lv|mg|mh|mi|mk|ml|mn|mo|mr|ms|mt|my|na|nb|nd|ne|ng|nl|nn|no|nr|nv|ny|oc|oj|om|or|os|pa|pi|pl|ps|pt|qu|rm|rn|ro|ru|rw|sa|sc|sd|se|sg|sh|si|sk|sl|sm|sn|so|sq|sr|ss|st|su|sv|sw|ta|te|tg|th|ti|tk|tl|tn|to|tr|ts|tt|tw|ty|ug|uk|ur|uz|ve|vi|vo|wa|wo|xh|yi|yo|za|zh|zu)\z/ =~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }', see ISO 639 for more information.")
+    end
+    super
+  end
+end  
+
-class XSDInteger < XSDDecimal
-  Type = QName.new(Namespace, IntegerLiteral)

trunk/test/xsd/test_xsd.rb

@@ -92 +92 @@
-        end
-        assert_raises(XSD::ValueSpaceError) do
-p 
+
-        end
-      ensure
@@ -99 +99 @@
-    ensure
-      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_XSDNormalizedString
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = XSD::XSDNormalizedString.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::NormalizedStringLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "abc"
+      assert_equal(str, XSD::XSDNormalizedString.new(str).data)
+      assert_equal(str, XSD::XSDNormalizedString.new(str).to_s)
+      back = XSD::XSDString.strict_ces_validation
+      XSD::XSDString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDNormalizedString.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDNormalizedString.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDNormalizedString.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDNormalizedString.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDNormalizedString.new("\nb").to_s
+        end
+      ensure
+        XSD::XSDString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_XSDToken
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = XSD::XSDToken.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::TokenLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "abc"
+      assert_equal(str, XSD::XSDToken.new(str).data)
+      assert_equal(str, XSD::XSDToken.new(str).to_s)
+      back = XSD::XSDString.strict_ces_validation
+      XSD::XSDString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("\nb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new(" a").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("b ").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          XSD::XSDToken.new("a  b").to_s
+        end
+        assert_equal("a b", XSD::XSDToken.new("a b").data)
+      ensure
+        XSD::XSDString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+
+    def test_XSDLanguage
+      o = XSD::XSDLanguage.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::LanguageLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "ja"
+      assert_equal(str, XSD::XSDLanguage.new(str).data)
+      assert_equal(str, XSD::XSDLanguage.new(str).to_s)
+      assert_raises(XSD::ValueSpaceError) do
+        XSD::XSDLanguage.new("jb")
+      end
-    end
-  end