Changeset 1919

Timestamp:

08/23/07 21:01:27 (11 months ago)

Author:

nahi

Message:

• should allow durations lower than a day. Thanks to an anonymous user for taking the time to file the ticket #401. closes #401.
  

Files:

• trunk/lib/xsd/datatypes.rb (modified) (2 diffs)
• trunk/test/soap/test_basetype.rb (modified) (2 diffs)
• trunk/test/xsd/test_xsd.rb (modified) (2 diffs)

trunk/lib/xsd/datatypes.rb

@@ -455 +455 @@
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
-($5 and ((!$2 and !$3 and !$4) or (!$6 and !$7 and !$8)))
-Should we allow 'PT5S' here?
+$5 and !$6 and !$7 and !$8
+allows durations lower than a day such as 'PT5S'.
-      raise ValueSpaceError.new("#{ type }: cannot accept '#{ value }'.")
-    end
@@ -492 +492 @@
-    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

trunk/test/soap/test_basetype.rb

@@ -407 +407 @@
-      "P1Y2M3DT4H5M6S",
-      "P1234Y5678M9012DT3456H7890M1234.5678S",
-0D
+
-      "P1234Y5678M9012D",
-      "-P1234Y5678M9012DT3456H7890M1234.5678S",
@@ -419 +419 @@
-      "-P567800000000000M",
-      "+P901200000000000D",
-0D
-0D
-0D
+
+
+
-      "P1234YT1234.5678S",
-      "-P5678MT7890M",

trunk/test/xsd/test_xsd.rb

@@ -446 +446 @@
-      "P1Y2M3DT4H5M6S",
-      "P1234Y5678M9012DT3456H7890M1234.5678S",
-0D
+
-      "P1234Y5678M9012D",
-      "-P1234Y5678M9012DT3456H7890M1234.5678S",
@@ -458 +458 @@
-      "-P567800000000000M",
-      "+P901200000000000D",
-0D
-0D
-0D
+
+
+
-      "P1234YT1234.5678S",
-      "-P5678MT7890M",
-      "+P9012DT3456H",
+      "PT5S",
-    ]
-    targets.each do |str|