Merge pull request brianc#292 from brianc/cleanup

Cleanup

Author: brianc

lib/client.js

@@ -20,25 +20,23 @@ var Client = function(config) {
   this.host = this.connectionParameters.host;
   this.password = this.connectionParameters.password;
 
-  config = config || {};
+  var c = config || {};
 
-  this.connection = config.connection || new Connection({
-    stream: config.stream,
-    ssl: config.ssl
+  this.connection = c.connection || new Connection({
+    stream: c.stream,
+    ssl: c.ssl
   });
   this.queryQueue = [];
-  this.binary = config.binary || defaults.binary;
+  this.binary = c.binary || defaults.binary;
   this.encoding = 'utf8';
   this.processID = null;
   this.secretKey = null;
-  this.ssl = config.ssl || false;
+  this.ssl = c.ssl || false;
 };
 
 util.inherits(Client, EventEmitter);
 
-var p = Client.prototype;
-
-p.connect = function(callback) {
+Client.prototype.connect = function(callback) {
   var self = this;
   var con = this.connection;
   if(this.host && this.host.indexOf('/') === 0) {
@@ -50,7 +48,7 @@ p.connect = function(callback) {
 
   //once connection is established send startup message
   con.on('connect', function() {
-    if (self.ssl) {
+    if(self.ssl) {
       con.requestSsl();
     } else {
       con.startup({
@@ -59,6 +57,7 @@ p.connect = function(callback) {
       });
     }
   });
+
   con.on('sslconnect', function() {
     con.startup({
       user: self.user,
@@ -91,10 +90,12 @@ p.connect = function(callback) {
     con.on('rowDescription', function(msg) {
       self.activeQuery.handleRowDescription(msg);
     });
+
     //delegate datarow to active query
     con.on('dataRow', function(msg) {
       self.activeQuery.handleDataRow(msg);
     });
+
     //TODO should query gain access to connection?
     con.on('portalSuspended', function(msg) {
       self.activeQuery.getRows(con);
@@ -108,11 +109,13 @@ p.connect = function(callback) {
         con.sync();
       }
     });
+
     con.on('copyInResponse', function(msg) {
       self.activeQuery.streamData(self.connection);
     });
+
     con.on('copyOutResponse', function(msg) {
-      if (self.activeQuery.stream  === undefined) {
+      if(self.activeQuery.stream  === undefined) {
         self.activeQuery._canceledDueToError =
           new Error('No destination stream defined');
         //canceling query requires creation of new connection
@@ -121,9 +124,11 @@ p.connect = function(callback) {
           .cancel(self, self.activeQuery);
       }
     });
+
     con.on('copyData', function (msg) {
       self.activeQuery.handleCopyFromChunk(msg.chunk);
     });
+
     if (!callback) {
       self.emit('connect');
     } else {
@@ -170,8 +175,8 @@ p.connect = function(callback) {
 
 };
 
-p.cancel = function(client, query) {
-  if (client.activeQuery == query) {
+Client.prototype.cancel = function(client, query) {
+  if(client.activeQuery == query) {
     var con = this.connection;
 
     if(this.host && this.host.indexOf('/') === 0) {
@@ -184,13 +189,12 @@ p.cancel = function(client, query) {
     con.on('connect', function() {
       con.cancel(client.processID, client.secretKey);
     });
-  }
-  else if (client.queryQueue.indexOf(query) != -1) {
+  } else if(client.queryQueue.indexOf(query) != -1) {
     client.queryQueue.splice(client.queryQueue.indexOf(query), 1);
   }
 };
 
-p._pulseQueryQueue = function() {
+Client.prototype._pulseQueryQueue = function() {
   if(this.readyForQuery===true) {
     this.activeQuery = this.queryQueue.shift();
     if(this.activeQuery) {
@@ -199,40 +203,48 @@ p._pulseQueryQueue = function() {
       this.activeQuery.submit(this.connection);
     } else if(this.hasExecuted) {
       this.activeQuery = null;
-      if(this._drainPaused > 0) { this._drainPaused++; }
-      else { this.emit('drain'); }
+      //TODO remove pauseDrain for v1.0
+      if(this._drainPaused > 0) {
+        this._drainPaused++;
+      }
+      else {
+        this.emit('drain');
+      }
     }
   }
 };
-p._copy = function (text, stream) {
-  var config = {},
-    query;
+
+Client.prototype._copy = function (text, stream) {
+  var config = {};
   config.text = text;
   config.stream = stream;
   config.callback = function (error) {
-    if (error) {
+    if(error) {
       config.stream.error(error);
     } else {
       config.stream.close();
     }
   };
-  query = new Query(config);
+  var query = new Query(config);
   this.queryQueue.push(query);
   this._pulseQueryQueue();
   return config.stream;
 
 };
-p.copyFrom = function (text) {
+
+Client.prototype.copyFrom = function (text) {
   return this._copy(text, new CopyFromStream());
 };
-p.copyTo = function (text) {
+
+Client.prototype.copyTo = function (text) {
   return this._copy(text, new CopyToStream());
 };
-p.query = function(config, values, callback) {
+
+Client.prototype.query = function(config, values, callback) {
   //can take in strings, config object or query object
   var query = (config instanceof Query) ? config :
      new Query(config, values, callback);
-  if (this.binary && !query.binary) {
+  if(this.binary && !query.binary) {
     query.binary = true;
   }
 
@@ -243,19 +255,19 @@ p.query = function(config, values, callback) {
 
 //prevents client from otherwise emitting 'drain' event until 'resumeDrain' is
 //called
-p.pauseDrain = function() {
+Client.prototype.pauseDrain = function() {
   this._drainPaused = 1;
 };
 
 //resume raising 'drain' event
-p.resumeDrain = function() {
+Client.prototype.resumeDrain = function() {
   if(this._drainPaused > 1) {
     this.emit('drain');
   }
   this._drainPaused = 0;
 };
 
-p.end = function() {
+Client.prototype.end = function() {
   this.connection.end();
 };