Merge remote-tracking branch 'sgarciac/master'

README.md

@@ -91,7 +91,10 @@ In the above, `TTYPE` may be one of:
 * string
 * integer
 * float
-* datetime
+* datetime (for offset date-time)
+* datetime-local
+* date
+* time
 * bool
 * array
 
@@ -101,7 +104,9 @@ and `TVALUE` is always a JSON string, except when `TTYPE` is `array` in which
 Empty hashes correspond to empty JSON objects (i.e., `{}`) and empty arrays 
 correspond to empty JSON arrays (i.e., `[]`).
 
-Datetime should be encoded following RFC 3339.
+Offset datetimes should be encoded following RFC 3339. Local datetimes should be
+encoded following RFC 3339, without the offset part. Local dates should be
+encoded as the date part of RFC 3339 and Local times as the time part.
 
 ### Example JSON encoding
 

json.go

@@ -3,6 +3,7 @@ package main
 import (
 	"strconv"
 	"time"
+	"strings"
 )
 
 // compareJson consumes the recursive structure of both `expected` and `test`
@@ -137,6 +138,8 @@ func (r result) cmpJsonValues(e, t map[string]interface{}) result {
 			return r.cmpFloats(evalue, tvalue);
 		case "datetime":
 			return r.cmpAsDatetimes(evalue, tvalue);
+		case "datetime-local":
+			return r.cmpAsLocalDateTimes(evalue, tvalue);
 		default:
 			return r.cmpAsStrings(evalue, tvalue);
 		}
@@ -151,7 +154,48 @@ func (r result) cmpAsStrings(e, t string) result {
 	return r
 }
 
+func (r result) cmpAsLocalDateTimes(e, t string) result {
+	ce := strings.Replace(strings.Replace(e, "t", "T", 1), " ", "T", 1)
+	ct := strings.Replace(strings.Replace(t, "t", "T", 1), " ", "T", 1)
+
+	if ce != ct {
+		return r.failedf("Values for key '%s' don't match. Expected a "+
+			"value of '%s' but got '%s'.", r.key, e, t)
+	}
+	return r
+}
+
+
 func (r result) cmpFloats(e, t string) result {
+	// Handle Infinity and NaN
+	tc := strings.ToLower(t)
+	ec := strings.ToLower(e)
+
+	if ec == "nan" || ec == "-nan" || ec == "+nan" {
+		if tc == "nan" || tc == "-nan" || tc == "+nan" {
+			return r
+		} else {
+			return r.failedf("Value for key '%s' don't match. Expected either nan, -nan or +nan but got '%v'.", r.key, tc)
+		}
+	}
+
+	if ec == "inf" || ec == "+inf" {
+		if tc == "inf" || tc == "+inf" {
+			return r
+		} else {
+			return r.failedf("Value for key '%s' don't match. Expected inf or +inf but got '%v'.", r.key, tc)
+		}
+	}
+
+	if ec == "-inf" {
+		if tc == "-inf" {
+			return r
+		} else {
+			return r.failedf("Value for key '%s' don't match. Expected -inf but got '%v'.", r.key, tc)
+		}
+	}
+
+	// Else, compare as regular floats
 	ef, err := strconv.ParseFloat(e, 64)
 	if err != nil {
 		return r.failedf("BUG in test case. Could not read '%s' as a "+
@@ -173,13 +217,13 @@ func (r result) cmpFloats(e, t string) result {
 func (r result) cmpAsDatetimes(e, t string) result {
 	var err error
 
-	ef, err := time.Parse(time.RFC3339Nano, e)
+	ef, err := time.Parse(time.RFC3339Nano, strings.Replace(e, " ", "T", 1))
 	if err != nil {
 		return r.failedf("BUG in test case. Could not read '%s' as a "+
 			"datetime value for key '%s'.", e, r.key)
 	}
 
-	tf, err := time.Parse(time.RFC3339Nano, t)
+	tf, err := time.Parse(time.RFC3339Nano, strings.Replace(t, " ", "T", 1))
 	if err != nil {
 		return r.failedf("Malformed parser output. Could not read '%s' "+
 			"as datetime value for key '%s'.", t, r.key)

tests/invalid/array-7.toml

@@ -0,0 +1 @@
+arr6 = [ 1, 2.0 ] # INVALID

tests/invalid/array-of-tables-1.toml

@@ -0,0 +1,4 @@
+# INVALID TOML DOC
+fruit = []
+
+[[fruit]] # Not allowed

tests/invalid/array-of-tables-2.toml

@@ -0,0 +1,10 @@
+# INVALID TOML DOC
+[[fruit]]
+  name = "apple"
+
+  [[fruit.variety]]
+    name = "red delicious"
+
+  # This table conflicts with the previous table
+  [fruit.variety]
+    name = "granny smith"

tests/invalid/bare-key-1.toml

@@ -0,0 +1 @@
+bare!key = 123

tests/invalid/bare-key-2.toml

@@ -0,0 +1,2 @@
+barekey
+   = 123

tests/invalid/bare-key-3.toml

@@ -0,0 +1 @@
+barekey =

tests/invalid/int-0-padded.toml

@@ -0,0 +1 @@
+int = 0123

tests/invalid/key-value-pair-1.toml

@@ -0,0 +1 @@
+key = # INVALID

tests/invalid/multiple-dot-key.toml

@@ -0,0 +1,3 @@
+# THIS IS INVALID
+a.b = 1
+a.b.c = 2

tests/invalid/multiple-key.toml

@@ -0,0 +1,3 @@
+# DO NOT DO THIS
+name = "Tom"
+name = "Pradyun"

tests/invalid/no-key-name.toml

@@ -0,0 +1 @@
+= "no key name"  # INVALID

tests/invalid/non-dec-integers.toml

@@ -0,0 +1,3 @@
+bin1 = -0b11010110 # non decimal integers are only for non negative
+oct1 = 0o_1
+hex3 = 0xdeadbeeg

tests/invalid/string-basic-control-2.toml

@@ -0,0 +1 @@
+a = "null"

tests/invalid/string-basic-control-3.toml

@@ -0,0 +1 @@
+a = "null"

tests/invalid/string-basic-control-4.toml

@@ -0,0 +1 @@
+a = "null"

tests/invalid/string-basic-multiline-control-2.toml

@@ -0,0 +1 @@
+a = """null"""

tests/invalid/string-basic-multiline-control-3.toml

@@ -0,0 +1 @@
+a = """null"""

tests/invalid/string-basic-multiline-control-4.toml

@@ -0,0 +1 @@
+a = """null"""

tests/invalid/string-basic-multiline-out-of-range-unicode-escape-1.toml

@@ -0,0 +1 @@
+a = """\UFFFFFFFF"""

tests/invalid/string-basic-multiline-out-of-range-unicode-escape-2.toml

@@ -0,0 +1 @@
+a = """\U00D80000"""

tests/invalid/string-basic-multiline-unknown-escape.toml

@@ -0,0 +1 @@
+a = """\@"""

tests/invalid/string-basic-out-of-range-unicode-escape-1.toml

@@ -0,0 +1 @@
+a = "\UFFFFFFFF"

tests/invalid/string-basic-out-of-range-unicode-escape-2.toml

@@ -0,0 +1 @@
+a = "\U00D80000"

tests/invalid/string-basic-unknown-escape.toml

@@ -0,0 +1 @@
+a = "\@"

tests/invalid/string-literal-control-2.toml

@@ -0,0 +1 @@
+a = 'null'

tests/invalid/string-literal-control-3.toml

@@ -0,0 +1 @@
+a = 'null'

tests/invalid/string-literal-control-4.toml

@@ -0,0 +1 @@
+a = 'null'

tests/invalid/string-literal-multiline-control-2.toml

@@ -0,0 +1 @@
+a = '''null'''

tests/invalid/string-literal-multiline-control-3.toml

@@ -0,0 +1 @@
+a = '''null'''

tests/invalid/string-literal-multiline-control-4.toml

@@ -0,0 +1 @@
+a = '''null'''

tests/invalid/table-1.toml

@@ -0,0 +1,7 @@
+# DO NOT DO THIS
+
+[a]
+b = 1
+
+[a]
+c = 2

tests/invalid/table-2.toml

@@ -0,0 +1,7 @@
+# DO NOT DO THIS EITHER
+
+[a]
+b = 1
+
+[a.b]
+c = 2

tests/valid/datetime.json

@@ -1,5 +1,6 @@
 {
     "bestdayever": {"type": "datetime", "value": "1987-07-05T17:45:00Z"},
     "numoffset": {"type": "datetime", "value": "1977-06-28T12:32:00Z"},
-    "milliseconds": {"type": "datetime", "value": "1977-12-21T03:32:00.555+00:00"}
+    "milliseconds": {"type": "datetime", "value": "1977-12-21T03:32:00.555+00:00"},
+    "bestdayever_with_space": {"type": "datetime", "value": "1987-07-05T17:45:00Z"}
 }

tests/valid/datetime.toml

@@ -1,3 +1,4 @@
 bestdayever = 1987-07-05T17:45:00Z
 numoffset = 1977-06-28T07:32:00-05:00
 milliseconds = 1977-12-21T10:32:00.555+07:00
+bestdayever_with_space = 1987-07-05 17:45:00Z

tests/valid/dotted-keys.json

@@ -0,0 +1,21 @@
+{
+    "name": {
+        "first": {"type": "string", "value": "Tom"},
+        "last": {"type": "string", "value": "Preston-Werner"}
+    },
+    "point": {
+        "x": {"type": "integer", "value": "1"},
+        "y": {"type": "integer", "value": "2"}
+    },
+    "l1": {
+        "l2": {
+            "l3": {
+                "l4": {
+                    "l5": {
+                        "l6": {"type": "integer", "value": "42"}
+                    }
+                }
+            }
+        }
+    }
+}

tests/valid/dotted-keys.toml

@@ -0,0 +1,5 @@
+name.first = "Tom"
+name.last = "Preston-Werner"
+point.x = 1
+point.y = 2 
+l1.l2.l3 = {l4.l5.l6 = 42}

tests/valid/infinity-and-nan.json

@@ -0,0 +1,8 @@
+{
+    "nan": {"type": "float", "value": "nan"},
+    "nan_neg": {"type": "float", "value": "nan"},
+    "nan_plus": {"type": "float", "value": "+nan"},
+    "infinity": {"type": "float", "value": "inf"},
+    "infinity_neg": {"type": "float", "value": "-inf"},
+    "infinity_plus": {"type": "float", "value": "+inf"}
+}

tests/valid/infinity-and-nan.toml

@@ -0,0 +1,7 @@
+nan = nan
+nan_neg = -nan
+nan_plus = +nan
+infinity = inf
+infinity_neg = -inf
+infinity_plus = +inf
+

tests/valid/local-date.json

@@ -0,0 +1,3 @@
+{
+    "bestdayever": {"type": "date", "value": "1987-07-05"}
+}

tests/valid/local-date.toml

@@ -0,0 +1 @@
+bestdayever = 1987-07-05

tests/valid/local-datetime.json

@@ -0,0 +1,5 @@
+{
+    "bestdayever": {"type": "datetime-local", "value": "1987-07-05T17:45:00"},
+    "milliseconds": {"type": "datetime-local", "value": "1977-12-21T10:32:00.555"},
+    "bestdayever_with_space": {"type": "datetime-local", "value": "1987-07-05T17:45:00"}
+}

tests/valid/local-datetime.toml

@@ -0,0 +1,3 @@
+bestdayever = 1987-07-05T17:45:00
+milliseconds = 1977-12-21T10:32:00.555
+bestdayever_with_space = 1987-07-05 17:45:00

tests/valid/local-time.json

@@ -0,0 +1,4 @@
+{
+    "besttimeever": {"type": "time", "value": "17:45:00"},
+    "milliseconds": {"type": "time", "value": "10:32:00.555"}
+}

tests/valid/local-time.toml

@@ -0,0 +1,3 @@
+besttimeever = 17:45:00
+milliseconds = 10:32:00.555
+

tests/valid/multiline-string-accidental-whitespace.json

@@ -0,0 +1,6 @@
+{
+    "three_lines": {
+        "type": "string",
+        "value": "The quick brown fox jumps over the lazy dog."
+    }
+}

tests/valid/multiline-string-accidental-whitespace.toml

@@ -0,0 +1,5 @@
+three_lines = """\
+       The quick brown \
+       fox jumps over \   
+       the lazy dog.\
+       """

tests/valid/non-dec-integers.json

@@ -0,0 +1,8 @@
+{
+    "bin1": {"type": "integer", "value": "214"},
+    "oct1": {"type": "integer", "value": "342391"},
+    "oct2": {"type": "integer", "value": "493"},
+    "hex1": {"type": "integer", "value": "3735928559"},
+    "hex2": {"type": "integer", "value": "3735928559" },
+    "hex3": {"type": "integer", "value": "3735928559"}
+}

tests/valid/non-dec-integers.toml

@@ -0,0 +1,6 @@
+bin1 = 0b11010110
+oct1 = 0o01234567
+oct2 = 0o755
+hex1 = 0xDEADBEEF
+hex2 = 0xdeadbeef
+hex3 = 0xdead_beef