Changeset 1840

Timestamp:

06/08/07 15:15:58 (1 year ago)

Author:

nahi

Message:

• re-implemented token and language type support. closes #252.
  

Files:

• trunk/lib/soap/baseData.rb (modified) (1 diff)
• trunk/lib/soap/mapping/typeMap.rb (modified) (2 diffs)
• trunk/lib/xsd/datatypes.rb (modified) (2 diffs)
• trunk/test/soap/test_basetype.rb (modified) (1 diff)
• 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/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::Type => SOAPNormalizedString,
+  SOAP::SOAPToken::Type => SOAPToken,
+  SOAP::SOAPLanguage::Type => 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
@@ -1008 +1008 @@
-
-  def screen_data(value)
+    super
-    if /[\t\r\n]/ =~ value
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
+    value
+  end
+end
+
+class XSDToken < XSDNormalizedString
+  Type = QName.new(Namespace, TokenLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
-    super
+    if /\A / =~ value or / \Z/ =~ value or value.index('  ')
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    value
+  end
+end
+
+class XSDLanguage < XSDToken
+  Type = QName.new(Namespace, LanguageLiteral)
+
+  def initialize(value = nil)
+    init(Type, value)
+  end
+
+private
+
+  def screen_data(value)
+    super
+    # RFC 3066 syntax check
+    if /\A[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})?\z/ !~ value
+      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
+    end
+    value
-  end
-end

trunk/test/soap/test_basetype.rb

@@ -61 +61 @@
-      XSD::XSDString.strict_ces_validation = back
-    end
+  end
+
+  def test_SOAPNormalizedString
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = SOAP::SOAPNormalizedString.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, SOAP::SOAPNormalizedString.new(str).data)
+      assert_equal(str, SOAP::SOAPNormalizedString.new(str).to_s)
+      back = SOAP::SOAPString.strict_ces_validation
+      SOAP::SOAPString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\nb").to_s
+        end
+      ensure
+        SOAP::SOAPString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_SOAPToken
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = SOAP::SOAPToken.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, SOAP::SOAPToken.new(str).data)
+      assert_equal(str, SOAP::SOAPToken.new(str).to_s)
+      back = XSD::XSDString.strict_ces_validation
+      XSD::XSDString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\nb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new(" a").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("b ").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a  b").to_s
+        end
+        assert_equal("a b", SOAP::SOAPToken.new("a b").data)
+      ensure
+        XSD::XSDString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_SOAPLanguage
+    o = SOAP::SOAPLanguage.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, SOAP::SOAPLanguage.new(str).data)
+    assert_equal(str, SOAP::SOAPLanguage.new(str).to_s)
+    str = "ja-jp"
+    assert_equal(str, SOAP::SOAPLanguage.new(str).data)
+    assert_equal(str, SOAP::SOAPLanguage.new(str).to_s)
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("ja-jp-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("-ja-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("ja-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("a1-01")
+    end
+    assert_equal("aA-01", SOAP::SOAPLanguage.new("aA-01").to_s)
-  end
-

trunk/test/xsd/test_xsd.rb

@@ -102 +102 @@
-  end
-
-=begin not implemented for now
-  def test_XSDNormalizedString
-    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
@@ -187 +186 @@
-      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
-    end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  def test_XSDBoolean