Merge branch 'master' of github.com:financeCoding/redis-dart

adam-singer · Apr 28, 2012 · 7754103 · 7754103
2 parents 20626f5 + b6c6d37
commit 7754103
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 30 deletions.
diff --git a/server/public/Terminal.dart b/server/public/Terminal.dart
@@ -19,7 +19,8 @@ class Terminal {
 			'help': helpCommand,
 			'auth': authCommand,
 			'info': infoCommand,
-			'clear': clearCommand
+			'clear': clearCommand,
+			'uri': uriCommand
     };
 
     var history = [];
@@ -113,32 +114,29 @@ class Terminal {
     }, false);
   }
 	// Redis Commands
+  createJSONAndSendRequest(String cmd, args) {
+    Map a = new Map();
+    a['cmd'] = 'get';
+    a['args'] = args;
+    var o = JSON.stringify(a);
+    var request = sendRequest("POST", "http://localhost:8082/exec", o, processResponse, processResponse);
+    return request;
+  }
+
 	getCommand(var cmd, var args) {
 	  if (args.length != 1) {
       var text = "<div><span>ERR wrong number of arguments for 'get' command</span></div>";
       outputText(text);
     } else {
-
+      var o = createJSONAndSendRequest('get',args);
     }
 	}
 	setCommand(var cmd, var args) {
 	  if (args.length != 2) {
 	    var text = "<div><span>ERR wrong number of arguments for 'set' command</span></div>";
 	    outputText(text);
 	  } else {
-	   Map a = new Map();
-	   a['cmd'] ='set';
-	   a['args'] = args;
-	   JsonObject o = new JsonObject.fromMap(a);
-
-	   // send stuff
-
-	   StringBuffer sb = new StringBuffer();
-	   sb.add('<span>');
-	   sb.add('OK');
-	   sb.add('</span>');
-
-	   outputText(sb.toString());
+	   var o = createJSONAndSendRequest('set',args); 
 	  }
 	}
 
@@ -151,37 +149,32 @@ class Terminal {
       var text = "<div><span>ERR wrong number of arguments for 'getset' command</span></div>";
       outputText(text);
     } else {
-     Map a = new Map();
-     a['cmd'] ='set';
-     a['args'] = args;
-     JsonObject o = new JsonObject.fromMap(a);
-
-     // send stuff
-
-     // Return value
-     StringBuffer sb = new StringBuffer();
-
+      var req = createJSONAndSendRequest('getset',args); 
 
-     outputText(sb.toString());
     }
 	}
 	authCommand(var cmd, var args) {
 	  if (args.length != 1) {
       var text = "<div><span>ERR wrong number of arguments for 'auth' command</span></div>";
       outputText(text);
     } else {
-
+      var req = createJSONAndSendRequest('auth',args); 
     }
 	}
 	infoCommand(var cmd, var args) {
 	  if (args.length != 0) {
       var text = "<div><span>ERR wrong number of arguments for 'info' command</span></div>";
       outputText(text);
     } else {
-
+      var req = createJSONAndSendRequest('info',args); 
     }
 	}
 
+	uriCommand(var cmd, var args) {
+	  var request = sendRequest("POST", "http://localhost:8082/exec", "", processResponse, processResponse);
+
+	}
+
 	clearCommand(var cmd, var args) {
 	  output.innerHTML = '';
 	}
@@ -195,4 +188,26 @@ class Terminal {
 		sb.add('</div>');
 		outputText(sb.toString());
 	}
+
+	XMLHttpRequest sendRequest(String method, String url, var data, var onSuccess, var onError) {
+    XMLHttpRequest request = new XMLHttpRequest();
+    request.on.readyStateChange.add((Event event) {
+      if (request.readyState != 4) return;
+      if (request.status == 200) {
+        print(request.responseText);
+        onSuccess(JSON.parse(request.responseText));
+      } else {
+        onError();
+      }
+    });
+
+    request.open(method, url, true);
+    request.setRequestHeader('Content-Type', 'application/json;charset=UTF=8');
+    request.send();
+    return request;
+  }
+
+	processResponse(data) {
+	  outputText("<span>"+data['result']+"</span>");
+	}
 }
diff --git a/server/public/TerminalRedis.dart b/server/public/TerminalRedis.dart
@@ -4,7 +4,7 @@
 
 //#import('dart:dom', prefix:"dom");
 //#import('dart:htmlimpl', prefix:"htmlimpl");
-#source('../../third_party/dartwatch-JsonObject/JsonObject.dart');
+//#source('../../third_party/dartwatch-JsonObject/JsonObject.dart');
 #source('Terminal.dart');
 
 // #source('Commands.dart');

diff --git a/server/redis_web_server.dart b/server/redis_web_server.dart
@@ -87,4 +87,4 @@ Future sayHello(HttpRequest req,HttpResponse res,var data) {
     res.outputStream.writeString("\nMost recent Visit: " + session["last-accessed"]);
   }
   return null;  
-}
+}