Move to inilike 0.3.0

dub.json

@@ -3,9 +3,9 @@
     "description": "Desktop Entry Specification implementation",
     "license" : "BSL-1.0",
     "copyright": "Copyright © 2015, Roman Chistokhodov",
-    "authors": ["Roman Chistokhodov", "h2so5"],
+    "authors": ["Roman Chistokhodov"],
     "dependencies": {
-        "inilike": "~>0.2.1",
+        "inilike": "~>0.3.0",
         "standardpaths": "~>0.2.0"
     },
     "targetName" : "desktopfile",

dub.selections.json

@@ -2,6 +2,6 @@
 	"fileVersion": 1,
 	"versions": {
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.2"
+		"inilike": "0.3.0"
 	}
 }

examples/desktoptest/dub.selections.json

@@ -1,7 +1,8 @@
 {
 	"fileVersion": 1,
 	"versions": {
+		"desktopfile": "0.5.0",
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.2"
+		"inilike": "0.3.0"
 	}
 }

examples/desktoputil/dub.selections.json

@@ -2,6 +2,6 @@
 	"fileVersion": 1,
 	"versions": {
 		"standardpaths": "0.2.0",
-		"inilike": "0.2.2"
+		"inilike": "0.3.0"
 	}
 }

examples/desktoputil/source/app.d

@@ -1,6 +1,17 @@
 import std.stdio;
 import desktopfile;
 import std.getopt;
+import std.process;
+
+@safe string currentLocale() nothrow
+{
+    try {
+        return environment.get("LC_CTYPE", environment.get("LC_ALL", environment.get("LANG")));
+    }
+    catch(Exception e) {
+        return null;
+    }
+}
 
 void main(string[] args)
 {

source/desktopfile.d

@@ -21,7 +21,6 @@ private {
     import std.array;
     import std.conv;
     import std.exception;
-    import std.file;
     import std.path;
     import std.process;
     import std.range;
@@ -477,40 +476,6 @@ public:
         assert(df.desktopEntry() !is null);
     }
 
-    /**
-    * Tells whether the string is valid dekstop entry key.
-    * Note: This does not include characters presented in locale names. Use $(B separateFromLocale) to get non-localized key to pass it to this function
-    */
-    @nogc @safe override bool isValidKey(string key) pure nothrow const 
-    {
-        /**
-        * Tells whether the character is valid for entry key.
-        * Note: This does not include characters presented in locale names.
-        */
-        @nogc @safe static bool isValidKeyChar(char c) pure nothrow {
-            return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-';
-        }
-
-        if (key.empty) {
-            return false;
-        }
-        for (size_t i = 0; i<key.length; ++i) {
-            if (!isValidKeyChar(key[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    ///
-    unittest
-    {
-        auto desktopFile = new DesktopFile;
-        assert(desktopFile.isValidKey("Generic-Name"));
-        assert(!desktopFile.isValidKey("Name$"));
-        assert(!desktopFile.isValidKey(""));
-    }
-
     /**
      * Type of desktop entry.
      * Returns: Type of desktop entry.
@@ -1125,6 +1090,7 @@ private:
 ///
 unittest 
 {
+    import std.file;
     //Test DesktopFile
     string desktopFileContents = 
 `[Desktop Entry]