Little bit of refactoring

Author: benjaminws

lib/index.js

@@ -66,8 +66,9 @@ function parse_frame(chunk) {
         body = null,
         headers_str = null;
 
-    if (!utils.really_defined(chunk))
+    if (!utils.really_defined(chunk)) {
         return null;
+    }
 
     command = parse_command(chunk);
     data = chunk.slice(command.length + 1, chunk.length);
@@ -77,8 +78,9 @@ function parse_frame(chunk) {
     headers = parse_headers(the_rest[0]);
     body = the_rest.slice(1, the_rest.length);
 
-    if ('content-length' in headers)
+    if ('content-length' in headers) {
        headers['bytes_message'] = true;
+    }
 
     args = {
         command: command,
@@ -108,7 +110,8 @@ function _connect(stomp) {
             }
             _setupListeners(stomp);
         });
-    } else {
+    }
+    else {
         log.debug('Connecting to ' + stomp.host + ':' + stomp.port);
         stomp.socket = new net.Socket();
         stomp.socket.connect(stomp.port, stomp.host);
@@ -198,15 +201,20 @@ function stomp_connect(stomp, headers) {
 function _disconnect(stomp) {
     var socket = stomp.socket;
     socket.end();
-    if (socket.readyState == 'readOnly')
+
+    if (socket.readyState == 'readOnly') {
         socket.destroy();
+    }
+
     log.debug('disconnect called');
 };
 
 function send_command(stomp, command, headers, body, want_receipt) {
     var want_receipt = want_receipt || false;
-    if (!utils.really_defined(headers))
+
+    if (!utils.really_defined(headers)) {
         headers = {};
+    }
 
     var args = {
         'command': command,
@@ -239,7 +247,7 @@ function send_frame(stomp, _frame) {
 //
 function Stomp(args) {
     this.port = args['port'] || 61613;
-    this.host = args['host'] || "127.0.0.1";
+    this.host = args['host'] || '127.0.0.1';
     this.debug = args['debug'];
     this.login = args['login'] || null;
     this.passcode = args['passcode'] || null;
@@ -263,6 +271,31 @@ Stomp.prototype.connect = function() {
     _connect(this);
 };
 
+// ## Stomp.is_a_message(frame)
+//
+// **Test that `Frame` is a message**
+//
+// Takes a `Frame` object
+//
+Stomp.prototype.is_a_message = function(this_frame) {
+    return (this_frame.headers !== null && utils.really_defined(this_frame.headers['message-id']))
+}
+
+// ## Stomp.should_run_message_callback
+//
+// **Handle any registered message callbacks**
+//
+// Takes a `Frame` object
+//
+Stomp.prototype.should_run_message_callback = function(this_frame) {
+    var subscription = this._subscribed_to[this_frame.headers.destination];
+    if (this_frame.headers.destination !== null && subscription !== null) {
+        if (subscription.enabled && subscription.callback !== null && typeof(subscription.callback) == 'function') {
+            subscription.callback(this_frame.body, this_frame.headers);
+        }
+    }
+}
+
 // ## Stomp.handle\_new_frame(frame)
 //
 // **Handle frame based on type. Emit events when needed.**
@@ -272,16 +305,10 @@ Stomp.prototype.connect = function() {
 Stomp.prototype.handle_new_frame = function(this_frame) {
     switch (this_frame.command) {
         case "MESSAGE":
-            if (utils.really_defined(this_frame.headers['message-id'])) {
-                if (this_frame.headers !== null && this_frame.headers.destination !== null && this._subscribed_to[this_frame.headers.destination] !== null) {
-                    var subscription = this._subscribed_to[this_frame.headers.destination];
-                    if (subscription.enabled && subscription.callback !== null && typeof(subscription.callback) == 'function') {
-                        subscription.callback(this_frame.body, this_frame.headers);
-                    }
-                }
+            if (this.is_a_message(this_frame)) {
+                this.should_run_message_callback(this_frame);
                 this.emit('message', this_frame);
             }
-
             break;
         case "CONNECTED":
             log.debug('Connected to STOMP');