Changeset 1892

Timestamp:

07/21/07 12:51:36 (1 year ago)

Author:

nahi

Message:

• added classes for rest built-in datatypes of XML Schema Datatypes (NMTOKEN, NMTOKENS, Name, NCName, ID, IDREF, IDREFS, ENTITY, and ENTITIES). lexical scope is not checked for these datatypes yet. closes #340.
  

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/lib/soap/baseData.rb

@@ -256 +256 @@
-  extend SOAPModuleUtils
-  SOAPENCType = QName.new(EncodingNamespace, LanguageLiteral)
+end
+
+class SOAPNMTOKEN < XSD::XSDNMTOKEN
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NMTOKENLiteral)
+end
+
+class SOAPNMTOKENS < XSD::XSDNMTOKENS
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NMTOKENSLiteral)
+end
+
+class SOAPName < XSD::XSDName
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NameLiteral)
+end
+
+class SOAPNCName < XSD::XSDNCName
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NCNameLiteral)
+end
+
+class SOAPID < XSD::XSDID
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDLiteral)
+end
+
+class SOAPIDREF < XSD::XSDIDREF
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDREFLiteral)
+end
+
+class SOAPIDREFS < XSD::XSDIDREFS
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDREFSLiteral)
+end
+
+class SOAPENTITY < XSD::XSDENTITY
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, ENTITYLiteral)
+end
+
+class SOAPENTITIES < XSD::XSDENTITIES
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, ENTITIESLiteral)
-end
-

trunk/lib/soap/mapping/typeMap.rb

@@ -17 +17 @@
-  XSD::XSDToken::Type => SOAPToken,
-  XSD::XSDLanguage::Type => SOAPLanguage,
+  XSD::XSDNMTOKEN::Type => SOAPNMTOKEN,
+  XSD::XSDNMTOKENS::Type => SOAPNMTOKENS,
+  XSD::XSDName::Type => SOAPName,
+  XSD::XSDNCName::Type => SOAPNCName,
+  XSD::XSDID::Type => SOAPID,
+  XSD::XSDIDREF::Type => SOAPIDREF,
+  XSD::XSDIDREFS::Type => SOAPIDREFS,
+  XSD::XSDENTITY::Type => SOAPENTITY,
+  XSD::XSDENTITIES::Type => SOAPENTITIES,
-  XSD::XSDBoolean::Type => SOAPBoolean,
-  XSD::XSDDecimal::Type => SOAPDecimal,
@@ -53 +62 @@
-  SOAP::SOAPToken::Type => SOAPToken,
-  SOAP::SOAPLanguage::Type => SOAPLanguage,
+  SOAP::SOAPNMTOKEN::Type => SOAPNMTOKEN,
+  SOAP::SOAPNMTOKENS::Type => SOAPNMTOKENS,
+  SOAP::SOAPName::Type => SOAPName,
+  SOAP::SOAPNCName::Type => SOAPNCName,
+  SOAP::SOAPID::Type => SOAPID,
+  SOAP::SOAPIDREF::Type => SOAPIDREF,
+  SOAP::SOAPIDREFS::Type => SOAPIDREFS,
+  SOAP::SOAPENTITY::Type => SOAPENTITY,
+  SOAP::SOAPENTITIES::Type => SOAPENTITIES,
-  SOAP::SOAPBoolean::SOAPENCType => SOAPBoolean,
-  SOAP::SOAPDecimal::SOAPENCType => SOAPDecimal,

trunk/lib/xsd/datatypes.rb

@@ -49 +49 @@
-TokenLiteral = 'token'
-LanguageLiteral = 'language'
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-IntegerLiteral = 'integer'
-NonPositiveIntegerLiteral = 'nonPositiveInteger'
@@ -1053 +1053 @@
-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)