Add fractional part to times using custom types

Author: Kripth

README.md

@@ -1,4 +1,4 @@
-D implementation of [Tom's Obvious, Minimal Language](https://github.com/toml-lang/toml/blob/master/README.md) [v0.4.0](https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md)
+D implementation of [Tom's Obvious, Minimal Language](https://github.com/toml-lang/toml/blob/master/README.md) version [0.4.0](https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md)
 
 
 [![Build Status](https://travis-ci.org/Kripth/toml.svg?branch=master)](https://travis-ci.org/Kripth/toml) 
@@ -8,6 +8,9 @@ D implementation of [Tom's Obvious, Minimal Language](https://github.com/toml-la
 
 # Usage
 
+**dub.json**: `"toml": "~>0.4.0-rc.2"`
+**dub.sdl**: `dependency "toml" version="~>0.4.0-rc.2"`
+
 ```d
 import toml;
 
@@ -32,7 +35,28 @@ import std.file : read;
 doc = parseTOML(cast(string)read("/path/to/file.toml"));
 ```
 
+# Conversion
+
+### JSON
+
+**dub.json**: `"toml:json": "~>0.4.0-rc.2"`
+**dub.sdl**: `dependency "toml:json" version="~>0.4.0-rc.2"`
+
+```d
+import std.json;
+
+import toml;
+import toml.json;
+
+auto json = JSONValue([1, 2, 3]);
+assert(toTOML(json).type == TOML_TYPE.ARRAY);
+assert(toTOML(json) == [1, 2, 3]);
+
+auto toml = parseTOML(`key = "value"`);
+assert(toJSON(toml).type == JSON_TYPE.OBJECT);
+assert(toJSON(toml) == JSONValue(["key": "value"]));
+```
+
 # Missing features
 
-- Array of tables
-- Fractional time in dates
+- Nested array of tables

conv/json/toml/json.d

@@ -7,17 +7,18 @@
  * License: $(HTTP https://github.com/Kripth/toml/blob/master/LICENSE, MIT)
  * Authors: Kripth
  * References: $(LINK https://github.com/toml-lang/toml/blob/master/README.md)
- * Source: $(HTTP https://github.com/Kripth/toml, Kripth/_toml.d)
+ * Source: $(HTTP https://github.com/Kripth/toml/blob/master/src/conv/json/toml/json.d, toml/conv/_json.d)
  * 
  */
 module toml.json;
 
 import std.json : JSONValue, JSON_TYPE;
 
-import toml.toml : TOMLDocument, TOMLValue, TOML_TYPE;
+import toml.toml : TOMLDocument, TOMLValue, TOML_TYPE, TOMLException;
 
 /**
  * Converts a TOMLValue to a JSONValue.
+ * Note: datetimes are converted to strings.
  */
 JSONValue toJSON(TOMLValue toml) {
 	final switch(toml.type) with(TOML_TYPE) {
@@ -52,7 +53,8 @@ JSONValue toJSON(TOMLDocument doc) {
 ///
 unittest {
 
-	import std.datetime;
+	import std.datetime : SysTime, Date;
+	import toml.datetime : DateTime, TimeOfDay;
 
 	assert(toJSON(TOMLValue(true)).type == JSON_TYPE.TRUE);
 	assert(toJSON(TOMLValue("string")).str == "string");
@@ -68,10 +70,14 @@ unittest {
 
 /**
  * Convert a JSONValue to a TOMLValue.
+ * Throws:
+ * 		TOMLException if the array values have different types
+ * 		TOMLExcpetion if a floating point value is not finite
+ * 		TOMLException if the json value is null
  */
 TOMLValue toTOML(JSONValue json) {
 	final switch(json.type) with(JSON_TYPE) {
-		case NULL: return TOMLValue("null");
+		case NULL: throw new TOMLException("JSONValue is null");
 		case TRUE: return TOMLValue(true);
 		case FALSE: return TOMLValue(false);
 		case STRING: return TOMLValue(json.str);
@@ -96,7 +102,11 @@ TOMLValue toTOML(JSONValue json) {
 ///
 unittest {
 
-	assert(toTOML(JSONValue.init) == "null");
+	try {
+		// null
+		toTOML(JSONValue.init); assert(0);
+	} catch(TOMLException) {}
+
 	assert(toTOML(JSONValue(true)).type == TOML_TYPE.BOOL);
 	assert(toTOML(JSONValue(false)) == false);
 	assert(toTOML(JSONValue("test")) == "test");

src/toml/datetime.d

@@ -0,0 +1,70 @@
+// Written in the D programming language.
+
+/**
+ * 
+ * Custom types for TOML's datetimes that add fractional time to D ones.
+ *
+ * License: $(HTTP https://github.com/Kripth/toml/blob/master/LICENSE, MIT)
+ * Authors: Kripth
+ * References: $(LINK https://github.com/toml-lang/toml/blob/master/README.md)
+ * Source: $(HTTP https://github.com/Kripth/toml/blob/master/src/toml/datetime.d, toml/_datetime.d)
+ * 
+ */
+module toml.datetime;
+
+import std.conv : to;
+import std.datetime : Duration, dur, DateTimeD = DateTime, Date, TimeOfDayD = TimeOfDay;
+
+struct DateTime {
+
+	public Date date;
+	public TimeOfDay timeOfDay;
+
+	public inout @property DateTimeD dateTime() {
+		return DateTimeD(this.date, this.timeOfDay.timeOfDay);
+	}
+
+	alias dateTime this;
+
+	public static pure DateTime fromISOExtString(string str) {
+		Duration frac;
+		if(str.length > 19 && str[19] == '.') {
+			frac = dur!"msecs"(to!ulong(str[20..$]));
+			str = str[0..19];
+		}
+		auto dt = DateTimeD.fromISOExtString(str);
+		return DateTime(dt.date, TimeOfDay(dt.timeOfDay, frac));
+	}
+
+	public inout string toISOExtString() {
+		return this.date.toISOExtString() ~ "T" ~ this.timeOfDay.toString();
+	}
+
+}
+
+struct TimeOfDay {
+
+	public TimeOfDayD timeOfDay;
+	public Duration fracSecs;
+
+	alias timeOfDay this;
+
+	public static pure TimeOfDay fromISOExtString(string str) {
+		Duration frac;
+		if(str.length > 8 && str[8] == '.') {
+			frac = dur!"msecs"(to!ulong(str[9..$]));
+			str = str[0..8];
+		}
+		return TimeOfDay(TimeOfDayD.fromISOExtString(str), frac);
+	}
+
+	public inout string toISOExtString() {
+		immutable msecs = this.fracSecs.total!"msecs";
+		if(msecs != 0) {
+			return this.timeOfDay.toISOExtString() ~ "." ~ to!string(msecs);
+		} else {
+			return this.timeOfDay.toISOExtString();
+		}
+	}
+
+}

src/toml/package.d

@@ -7,9 +7,12 @@
  * License: $(HTTP https://github.com/Kripth/toml/blob/master/LICENSE, MIT)
  * Authors: Kripth
  * References: $(LINK https://github.com/toml-lang/toml/blob/master/README.md)
- * Source: $(HTTP https://github.com/Kripth/toml, Kripth/_toml.d)
+ * Source: $(HTTP https://github.com/Kripth/toml/blob/master/src/toml/package.d, toml/_package.d)
  * 
  */
 module toml;
 
+public import std.datetime : SysTime, Date;
+
+public import toml.datetime : DateTime, TimeOfDay;
 public import toml.toml : TOML_TYPE, TOMLDocument, TOMLValue, parseTOML, TOMLException, TOMLParserException;