Operators and Async

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 This file contains highlights of what changes on each version of the force package.
 
+#### Pub version 0.2.0 ####
+
+- Add async for getting a value
+- Add operator functions [] and []=
+- Fix some issues on the length parameter
+
 #### Pub version 0.1.0 ####
 
 - Add start method to the storage implementation

lib/server/abstract_storage.dart

@@ -16,11 +16,20 @@ abstract class Storage {
    }
   }
 
-  String getItem(String key);
+  dynamic getItemSync(String key);
+  Future getItem(String key);
   void setItem(String key, data);
   void removeItem(String key);
   void clear();
   int length();
 
+  void operator []=(String key, value) {
+      setItem(key, value);
+  }
+  dynamic operator [](String key){
+    return getItemSync(key);
+  }
+
+
   Future start() => _completer.future;
 }

lib/server/json_storage.dart

@@ -6,6 +6,8 @@ class JsonStorage extends Storage {
 
   List<String> keys = new List<String>();
 
+  Map map;
+
   JsonStorage (String dir) : super._() {
     pathToStore = Platform.script.resolve(dir).toFilePath();
     _completer = new Completer();
@@ -25,7 +27,7 @@ class JsonStorage extends Storage {
       }
     }
 
-  dynamic getItem(String key) {
+  dynamic getItemSync(String key) {
     if (keys.contains(key)) {
       var uriKey = new Uri.file(pathToStore).resolve("$key.json");
       var file = new File(uriKey.toFilePath());
@@ -38,6 +40,24 @@ class JsonStorage extends Storage {
     return null;
   }
 
+  Future getItem(String key) {
+    Completer complete = new Completer();  
+    if (keys.contains(key)) {
+        var uriKey = new Uri.file(pathToStore).resolve("$key.json");
+        var file = new File(uriKey.toFilePath());
+
+        file.exists().then((bool exist) {
+          // need to convert it to json!
+          file.readAsString().then((String fileValues) {
+              complete.complete(JSON.decode(fileValues));
+          });
+        });
+      } else {
+        complete.complete(); 
+      }
+      return complete.future;
+    }
+
   void setItem(String key, data) {
     var uriKey = new Uri.file(pathToStore).resolve("$key.json");
     var file = new File(uriKey.toFilePath());
@@ -46,8 +66,10 @@ class JsonStorage extends Storage {
     } else {
        file.createSync();
        _writeFile(file, key, data);
-    }    
-    keys.add(key);
+    }
+    if (!keys.contains(key)) {
+      keys.add(key);
+    }
   }
 
   void _writeFile (File file, key, data) {
@@ -71,9 +93,14 @@ class JsonStorage extends Storage {
           if (path.indexOf(".json") > 1) {
             log.info("deleting $path");
             var file = new File(path);
-            file.deleteSync();
+            try {
+              file.deleteSync();
+            } on Exception catch(e) {         
+              print('Unknown exception: $e');
+            }
           }
         });
+    keys.clear();
   }
 
   int length() {
@@ -85,8 +112,11 @@ class JsonStorage extends Storage {
         dir.list(recursive: true, followLinks: false)    
         .listen((FileSystemEntity entity) {
               var path = entity.path;
-              if (path.indexOf(".json") > 1) {
-                keys.add(path);
+              RegExp exp = new RegExp(r"^\\(.+\\)*(.+)\.(.+)$");
+
+              if (exp.hasMatch(path) && path.indexOf(".json") > 1) {
+                Match fileName = exp.firstMatch(path);
+                keys.add(fileName.toString());
               }
             }).onDone(() {
                 _completer.complete();         

lib/server/memory_storage.dart

@@ -9,10 +9,16 @@ class MemoryStorage extends Storage {
     _completer.complete();
   }
 
-  dynamic getItem(String key) {
+  dynamic getItemSync(String key) {
     return values[key];
   }
 
+  Future getItem(String key) {
+    Completer complete = new Completer();  
+    complete.complete(values[key]);
+    return complete.future;
+  }
+
   void setItem(String key, data) {
     values[key] = data;
   }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: cargo
-version: 0.1.0
+version: 0.2.0
 author: Joris Hermans <hermansj@gmail.com>
 description: A key value, storage library for dart
 homepage: https://github.com/jorishermans/cargo

readme.md

@@ -21,11 +21,20 @@ Then you will have an asynchronous method to say that the storage is started
 Add data to the storage.
 
 	storage.setItem("data", {"data": "data"});
+	storage["data"] = {"data": "data"};
 
-Retrieve data from the storage.
+Retrieve data from the storage on an asynchronous way.
 
 	var data = storage.getItem("data");
 
+Or on a synchronous way.
+
+	var data = storage["data"];
+
+Or like this	
+
+	var data = storage.getItemSync("data");
+
 ### Todo's ###
 
 - add a client implementation of storage

test/json_access_test.dart

@@ -0,0 +1,19 @@
+import 'package:unittest/unittest.dart';
+import 'package:cargo/cargo.dart';
+
+main() {  
+  // First tests!  
+  Storage storage = new Storage(path: "store/");
+
+  storage.start().then((_) {
+    test('test basic json storage access', () {
+           storage.clear();  
+           storage["someValue"] = {"value": "go"};
+
+           expect(storage["someValue"], {"value": "go"});
+           expect(storage.length(), 1);
+       }); 
+  });
+
+
+}

test/json_test.dart

@@ -6,14 +6,23 @@ main() {
   Storage storage = new Storage(path: "store/");
 
   storage.start().then((_) {
-    test('test basic memory storage', () {
-        storage.clear();
-
+
+    test('test basic json storage', () {
+        storage.clear();  
         storage.setItem("data", {"data": "data"});
 
-        var data = storage.getItem("data");
+        var data = storage.getItemSync("data");
         expect(data["data"], "data");
         expect(storage.length(), 1);
     });
+
+    storage["async"] = {"as": "go"};
+    storage.getItem("async").then((value) {
+      test('test async storage', () {
+        expect(value, storage["async"]);
+      });
+    });
   });
+
+
 }

test/memory_test.dart

@@ -9,7 +9,7 @@ main() {
     test('test basic memory storage', () {
         storage.setItem("data", {"data": "data"});
 
-        var data = storage.getItem("data");
+        var data = storage.getItemSync("data");
         expect(data["data"], "data");
         expect(storage.length(), 1);
     });

test/store/someValue.json

@@ -0,0 +1 @@
+{"value":"go"}