web-repl 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16603912aa2b99c9c68ced749d4a3f6ef3a2ead1
-  data.tar.gz: 4b3974407e3c741068f24fc2ea152acf5da8ee1c
+  metadata.gz: 0e6f59ae36066ce6cff2f0826db2749ff3929a57
+  data.tar.gz: 4eb7847fd7444a0846d5ae2dbfe40bd339e4a4e6
 SHA512:
-  metadata.gz: 3a3e4c9ab844ffd58a8a174b6fad56f1e625b1d236b217268cda519dcd367c213a3cf0e69af0890f3d32570aec1db1506c22b4880e52983cd3b536558cdf280c
-  data.tar.gz: 9c6781d65d49a485ef741ed1bd1d4e13587108c22eed7906152b043a58110188aab06b1a927a5596ae3c057929846dd698eef9d5b43ed75a57134b73d165ab66
+  metadata.gz: 657a2e5bba0fb94fe7c2162dfd30d2a436b918c6fe926948cb9fdb245f3cb834901df10c7a04069481954e28628221f815ef574a694e6d16c0e8dfcb024c6e42
+  data.tar.gz: bedcf0013f25f8e86d6d354fc0e6a84f37c45d97d764f06f5dcd27f51bd9dca1d60d3c5a1a3e90adef151b8b341f49802e5199eab2608f3b37639ca114eaee3d

data/js/replConnection-0.5.min.js

@@ -0,0 +1 @@
+function ReplConnection(e,t,n){n=typeof n==="undefined"?{}:n;this.debug=!!n.debug;this.reconnect=!!n.reconnect;this.retryTime=n.retryTime||1e3;this.evalFunction=n.evalFunction;this.host=e;this.port=t;this.active=false;this.socket;this.supported="WebSocket"in window;if(this.supported){console.log("REPL: socket ok")}else{console.log("REPL: socket not supported")}}ReplConnection.prototype.eval=function(statement){options=typeof options==="undefined"?{}:options;var response={};try{if(typeof this.evalFunction==="function"){response.value=this.evalFunction(statement)}else{response.value=eval(statement)}}catch(err){response.error=err.message}return response};ReplConnection.prototype.initSocket=function(e){if(this.socket!==undefined&&this.socket!==null){this.socket.close()}var t="ws://"+this.host+":"+this.port+"/echo";this.socket=new WebSocket(t);e()};ReplConnection.prototype.handleSocketOpen=function(){this.active=true;console.log("REPL: socket ready")};ReplConnection.prototype.tryConnection=function(){console.log("REPL: waiting for connection");if(this.reconnect){var e=this;window.setTimeout(function(){e.start()},this.retryTime)}};ReplConnection.prototype.handleSocketClose=function(e){if(!this.active){this.tryConnection()}else{console.log("REPL: socket closed");this.active=false;if(this.reconnect){this.tryConnection()}}};ReplConnection.prototype.convertTimestamp=function(e){var t=e.timestamp;e.timestamp=new Date(t);return e.timestamp};ReplConnection.prototype.handleMessageReceived=function(e){if(this.debug){console.log("REPL: message received");console.log(e)}var t=JSON.parse(e.data);this.convertTimestamp(t);var n=this.eval(t.statement);return this.send(n)};ReplConnection.prototype.send=function(e){var t=this.prepareJSON(e);if(this.debug){console.log("REPL: sending");console.log(t)}return this.socket.send(t)};ReplConnection.prototype.prepareJSON=function(e){var t;try{e.timestamp=(new Date).getTime();t=JSON.stringify(e)}catch(n){t=this.handleJsonError(e,n)}return t};ReplConnection.prototype.handleJsonError=function(e,t){e.value=null;e.error=err.message;return this.prepareJSONResponse(e)};ReplConnection.prototype.initEventHandling=function(){var e=this;this.socket.onopen=function(){e.handleSocketOpen()};this.socket.onclose=function(t){e.handleSocketClose(t)};this.socket.onmessage=function(t){e.handleMessageReceived(t)}};ReplConnection.prototype.start=function(e){if(this.supported){var t=this;this.initSocket(function(){t.initEventHandling();if(e!==undefined){e(t)}})}}

data/js/replConnection.js

@@ -21,7 +21,7 @@ function ReplConnection(host, port, options) {
 // statement: the statement to evaluate
 ReplConnection.prototype.eval = function(statement) {
   options = (typeof options === "undefined") ? {} : options;
-  response = {};
+  var response = {};
   try {
     if (typeof this.evalFunction === "function") {
       response.value = this.evalFunction(statement);
@@ -74,6 +74,13 @@ ReplConnection.prototype.handleSocketClose = function(event) {
   }
 }
 
+// turn the timestamp from the rec'd message into a real date
+ReplConnection.prototype.convertTimestamp = function(message) {
+  var timestamp = message.timestamp;
+  message.timestamp = new Date(timestamp); 
+  return message.timestamp;
+}
+
 // To be run when the Websocket registers an event over the connection.
 ReplConnection.prototype.handleMessageReceived = function(event) {
   if (this.debug) {
@@ -81,33 +88,41 @@ ReplConnection.prototype.handleMessageReceived = function(event) {
     console.log(event);
   }
   var message = JSON.parse(event.data);
-  // turn the timestamp from the rec'd message into a real date
-  var timestamp = message.timestamp;
-  message.timestamp = new Date(timestamp); 
-  //
+  this.convertTimestamp(message);
   var response = this.eval(message.statement); // evaluate the statement
-  var json = this.prepareJSONResponse(response)
+  return this.send(response);
+}
+
+// Send a message
+ReplConnection.prototype.send = function(message) {
+  var json = this.prepareJSON(message);
   if (this.debug) {
-    console.log("REPL: replying ");
+    console.log("REPL: sending");
     console.log(json);
   }
-  this.socket.send(json);
+  return this.socket.send(json);
 }
 
-ReplConnection.prototype.prepareJSONResponse = function(response) {
+// Convert a message to JSON for sending
+ReplConnection.prototype.prepareJSON = function(message) {
   // prepare the response
   var json;
   try {
-    response.timestamp = new Date().getTime(); // timestamp for the returned message
-    json = JSON.stringify(response);
-  } catch(err) {
-    response.value = null;
-    response.error = err.message;
-    json = this.prepareJSONResponse(response)
+    message.timestamp = new Date().getTime(); // timestamp for the returned message
+    json = JSON.stringify(message);
+  } catch(error) {
+    json = this.handleJsonError(message, error);  
   }
   return json;
 }
 
+// Handle an error when converting the message to JSON
+ReplConnection.prototype.handleJsonError = function(message, error) {
+  message.value = null;
+  message.error = err.message;
+  return this.prepareJSONResponse(message);
+}
+
 // Initialize the Websocket event handling actions
 ReplConnection.prototype.initEventHandling = function() {
   var connection = this;

data/lib/web-repl.rb

@@ -13,7 +13,7 @@ require "web-repl/repl"
 # A Javascript REPL that runs in Ruby. Evaluation is done by a web browser instance.
 module WebRepl
 
-  VERSION = "0.4"
+  VERSION = "0.5"
 
   # Shortcut to REPL.start
   def self.start(*a)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web-repl
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -94,6 +94,7 @@ files:
 - js/replConnection-0.1.min.js
 - js/replConnection-0.3.min.js
 - js/replConnection-0.4.min.js
+- js/replConnection-0.5.min.js
 - js/replConnection.js
 - lib/web-repl.rb
 - lib/web-repl/messager.rb