Merge branch 'factor-out-annoying-stuff'

Author: benjaminws

examples/stomp-producer-txn.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // Same as stomp-producer.js, but transactional
 
-var stomp = require('./lib/stomp');
+var stomp = require('stomp');
 
 var num = process.argv[2];
 

lib/frame.js

@@ -36,34 +36,32 @@ function Frame() {
  * @return {Object} Frame object
  */
 Frame.prototype.build_frame = function(args, want_receipt) {
-    var self = this,
-        receipt_stamp = null;
+    var receipt_stamp = null;
 
-    self.command = args['command'];
-    self.headers = args['headers'];
-    self.body = args['body'];
+    this.command = args['command'];
+    this.headers = args['headers'];
+    this.body = args['body'];
 
     if (want_receipt) {
         var _receipt = '';
         receipt_stamp = Math.floor(Math.random()*99999999999).toString();
-        if (self.headers['session'] != undefined) {
-            _receipt = receipt_stamp + "-" + self.headers['session'];
+        if (this.headers['session'] != undefined) {
+            _receipt = receipt_stamp + "-" + this.headers['session'];
         }
         else {
             _receipt = receipt_stamp;
         }
-        self.headers['receipt'] = _receipt;
+        this.headers['receipt'] = _receipt;
     }
-    return self;
+    return this;
 };
 
 /**
  * String representation of Frame object
  * @return {String} - Frame as string
  */
 Frame.prototype.as_string = function() {
-    var self = this,
-        header_strs = [],
+    var header_strs = [],
         frame = "",
         command = this.command,
         headers = this.headers,

lib/stomp-utils.js

@@ -6,8 +6,9 @@ StompLogging = exports.StompLogging = function(should_debug) {
 };
 
 StompLogging.prototype.debug = function(message) {
-    if (this.should_debug)
+    if (this.should_debug) {
         console.log("debug: " + message);
+    }
 };
 
 StompLogging.prototype.warn = function(message) {
@@ -16,12 +17,13 @@ StompLogging.prototype.warn = function(message) {
 
 StompLogging.prototype.error = function(message, die) {
     console.log("error: " + message);
-    if (die)
+    if (die) {
         process.exit(1);
+    }
 };
 
 StompLogging.prototype.die = function(message) {
-    self.error(message, true);
+    this.error(message, true);
 };
 
 StompUtils = exports.StompUtils = function() {
@@ -34,8 +36,9 @@ StompUtils.prototype.really_defined = function(var_to_test) {
 
 // Extend associative array
 StompUtils.prototype.extend = function(destination, source) {
-    for (var property in source)
+    for (var property in source) {
         destination[property] = source[property];
+    }
     return destination;
 };
 
@@ -69,7 +72,6 @@ StompQueue.prototype.get = function() {
 
         if (++this.queue_space * 2 >= this.queue.length) {
             this.queue = this.queue.slice(this.queue_space);
-            console.log("Queue: " + sys.inspect(this.queue));
             this.queue_space = 0;
         }
     }
@@ -83,10 +85,12 @@ StompQueue.prototype.get = function() {
 StompQueue.prototype.get_oldest_item = function() {
     var item = undefined;
 
-    if (this.queue.length)
+    if (this.queue.length) {
         item = this.queue[this.queue_space];
-    else
+    }
+    else {
         throw new QueueEmpty();
+    }
 
     return item;
 };

lib/stomp.js

@@ -256,41 +256,38 @@ Stomp.prototype = new process.EventEmitter();
  * Begin connection
  */
 Stomp.prototype.connect = function() {
-    var self = this;
-    _connect(self);
+    _connect(this);
 };
 
 /**
  * Handle frame based on type
  * @param {Object} Frame Object
  */
 Stomp.prototype.handle_new_frame = function(this_frame) {
-    var self = this;
-
     switch (this_frame.command) {
         case "MESSAGE":
             if (utils.really_defined(this_frame.headers['message-id'])) {
                 // if a subscription to the destination queue exists, fire callback
-                if (this_frame.headers !== null && this_frame.headers.destination !== null && self._subscribed_to[this_frame.headers.destination] !== null) {
-                    var subscription = self._subscribed_to[this_frame.headers.destination];
+                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);
                     }
                 }
-                self.emit('message', this_frame);
+                this.emit('message', this_frame);
             }
 
             break;
         case "CONNECTED":
             log.debug('Connected to STOMP');
-            self.session = this_frame.headers['session'];
-            self.emit('connected');
+            this.session = this_frame.headers['session'];
+            this.emit('connected');
             break;
         case "RECEIPT":
-            self.emit('receipt', this_frame.headers['receipt-id']);
+            this.emit('receipt', this_frame.headers['receipt-id']);
             break;
         case "ERROR":
-            self.emit('error', this_frame);
+            this.emit('error', this_frame);
             break;
         default:
             console.log("Could not parse command: " + this_frame.command);
@@ -309,46 +306,42 @@ Stomp.prototype.disconnect = function() {
  * @param {Object} headers
  */
 Stomp.prototype.subscribe = function(headers, callback) {
-    var self = this,
-    destination = headers['destination'];
-    headers['session'] = self.session;
+    var destination = headers['destination'];
+    headers['session'] = this.session;
     send_command(this, 'SUBSCRIBE', headers);
-    self._subscribed_to[destination] = { enabled: true, callback: callback };
-    self.log.debug('subscribed to: ' + destination + ' with headers ' + sys.inspect(headers));
+    this._subscribed_to[destination] = { enabled: true, callback: callback };
+    this.log.debug('subscribed to: ' + destination + ' with headers ' + sys.inspect(headers));
 };
 
 /**
  * Unsubscribe from destination (queue or topic)
  * @param {Object} headers
  */
 Stomp.prototype.unsubscribe = function(headers) {
-    var self = this,
-    destination = headers['destination'];
-    headers['session'] = self.session;
+    var destination = headers['destination'];
+    headers['session'] = this.session;
     send_command(this, 'UNSUBSCRIBE', headers);
-    self._subscribed_to[destination].enabled = false;
-    self.log.debug('no longer subscribed to: ' + destination);
+    this._subscribed_to[destination].enabled = false;
+    this.log.debug('no longer subscribed to: ' + destination);
 };
 
 /**
  * Acknowledge received message
  * @param {String} message id to acknowledge
  */
 Stomp.prototype.ack = function(message_id) {
-    var self = this;
     send_command(this, 'ACK', {'message-id': message_id});
-    self.log.debug('acknowledged message: ' + message_id);
+    this.log.debug('acknowledged message: ' + message_id);
 };
 
 /**
  * Begin transaction
  * @return {String} generated transaction id
  */
 Stomp.prototype.begin = function() {
-    var self = this;
-    transaction_id = Math.floor(Math.random()*99999999999).toString();
+    var transaction_id = Math.floor(Math.random()*99999999999).toString();
     send_command(this, 'BEGIN', {'transaction': transaction_id});
-    self.log.debug('begin transaction: ' + transaction_id);
+    this.log.debug('begin transaction: ' + transaction_id);
     return transaction_id;
 };
 
@@ -357,19 +350,17 @@ Stomp.prototype.begin = function() {
  * @param {String} transaction id generated by stomp.Stomp.begin()
  */
 Stomp.prototype.commit = function(transaction_id) {
-    var self = this;
     send_command(this, 'COMMIT', {'transaction': transaction_id});
-    self.log.debug('commit transaction: ' + transaction_id);
+    this.log.debug('commit transaction: ' + transaction_id);
 };
 
 /**
  * Abort transaction
  * @param {String} transaction id generated by stomp.Stomp.begin()
  */
 Stomp.prototype.abort = function(transaction_id) {
-    var self = this;
     send_command(this, 'ABORT', {'transaction': transaction_id});
-    self.log.debug('abort transaction: ' + transaction_id);
+    this.log.debug('abort transaction: ' + transaction_id);
 };
 
 /**
@@ -379,11 +370,10 @@ Stomp.prototype.abort = function(transaction_id) {
  * @return {Object} Frame object of message sent
  */
 Stomp.prototype.send = function(headers, want_receipt) {
-    var self = this,
-    destination = headers['destination'],
+    var destination = headers['destination'],
     body = headers['body'] || null;
     delete headers['body'];
-    headers['session'] = self.session;
+    headers['session'] = this.session;
     return send_command(this, 'SEND', headers, body, want_receipt)
 };