re-tweaks.

Author: stephenplusplus

lib/common/connection.js

@@ -18,14 +18,15 @@
 
 'use strict';
 
-var GAPIToken = require('gapitoken'),
-    req = require('request'),
-    pkg = require('../../package.json'),
-    util = require('./util');
+var GAPIToken = require('gapitoken');
+var req = require('request');
+var pkg = require('../../package.json');
+var util = require('./util');
 
-var USER_AGENT = 'gcloud-node/' + pkg.version,
-    METADATA_TOKEN_URL = 'http://metadata/computeMetadata/v1/instance/' +
-                         'service-accounts/default/token';
+var METADATA_TOKEN_URL =
+    'http://metadata/computeMetadata/v1/instance/service-accounts/default/' +
+    'token';
+var USER_AGENT = 'gcloud-node/' + pkg.version;
 
 /**
  * Token represents an access token
@@ -151,8 +152,12 @@ Connection.prototype.createAuthorizedReq = function(reqOpts, callback) {
   var that = this;
   // Add user agent.
   reqOpts.headers = reqOpts.headers || {};
-  reqOpts.headers['User-Agent'] = reqOpts.headers['User-Agent'] ?
-      reqOpts.headers['User-Agent'] + '; ' + USER_AGENT : USER_AGENT;
+
+  if (reqOpts.headers['User-Agent']) {
+    reqOpts.headers['User-Agent'] += '; ' + USER_AGENT;
+  } else {
+    reqOpts.headers['User-Agent'] = USER_AGENT;
+  }
 
   if (this.isConnected()) {
     return callback(null, this.authorizeReq(reqOpts));

lib/datastore/entity.js

@@ -17,10 +17,9 @@
 'use strict';
 
 var entityMeta = {};
-
-var namespaceRegex = /^[A-Za-z]*$/,
-    kindRegex = /^[A-Za-z]*$/,
-    fieldNameRegex = /^[A-Za-z]*$/;
+var fieldNameRegex = /^[A-Za-z]*$/;
+var kindRegex = /^[A-Za-z]*$/;
+var namespaceRegex = /^[A-Za-z]*$/;
 
 /**
  * Conversion dict for query operation to operation proto value.
@@ -96,19 +95,24 @@ var keyToKeyProto = function(datasetId, key) {
   if (key.length < 2) {
     throw new Error('A key should contain at least a kind and an identifier.');
   }
-  var namespace = null, start = 0;
+  var namespace = null;
+  var start = 0;
   if (key.length % 2 === 1) {
     // the first item is the namespace
     namespace = key[0];
     start = 1;
   }
   var path = [];
   for (var i = start; i < (key.length - start); i += 2) {
-    var p = { kind: key[i] }, val = key[i+1];
+    var p = { kind: key[i] };
+    var val = key[i+1];
     if (val) {
       // if not numeric, set key name.
-      if (isNaN(val)) { p.name = val; }
-      else { p.id = val; }
+      if (isNaN(val)) {
+        p.name = val;
+      } else {
+        p.id = val;
+      }
     }
     path.push(p);
   }
@@ -129,7 +133,7 @@ var keyToKeyProto = function(datasetId, key) {
 module.exports.keyToKeyProto = keyToKeyProto;
 
 module.exports.formatArray = function(results) {
-  return results.map(function (result) {
+  return results.map(function(result) {
     return {
       key: keyFromKeyProto(result.entity.key),
       data: entityFromEntityProto(result.entity)

lib/datastore/index.js

@@ -16,18 +16,19 @@
 
 'use strict';
 
-var conn = require('../common/connection.js'),
-    entity = require('./entity.js'),
-    Query = require('./query.js').Query,
-    util = require('../common/util.js');
+var conn = require('../common/connection.js');
+var entity = require('./entity.js');
+var Query = require('./query.js').Query;
+var util = require('../common/util.js');
 
-var DATASTORE_BASE_URL = 'https://www.googleapis.com/datastore/v1beta2/' +
-                         'datasets',
-    SCOPES = [
-      'https://www.googleapis.com/auth/datastore',
-      'https://www.googleapis.com/auth/userinfo.email'],
-    MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL',
-    MODE_TRANSACTIONAL = 'TRANSACTIONAL';
+var DATASTORE_BASE_URL =
+    'https://www.googleapis.com/datastore/v1beta2/datasets';
+var MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL';
+var MODE_TRANSACTIONAL = 'TRANSACTIONAL';
+var SCOPES = [
+  'https://www.googleapis.com/auth/datastore',
+  'https://www.googleapis.com/auth/userinfo.email'
+];
 
 /**
  * Transaction represents a Datastore transaction.
@@ -224,7 +225,7 @@ Transaction.prototype.runQuery = function(q, callback) {
       return callback(err);
     }
     var nextQuery = null;
-    if (resp.batch.endCursor && resp.batch.endCursor != q.startVal) {
+    if (resp.batch.endCursor && resp.batch.endCursor !== q.startVal) {
       nextQuery = q.start(resp.batch.endCursor).offset(0);
     }
     callback(null, entity.formatArray(resp.batch.entityResults), nextQuery);

lib/datastore/query.js

@@ -38,8 +38,8 @@ Query.prototype.filter = function(filter, value) {
   // TODO(jbd): Add filter validation.
   var q = util.extend(this, new Query());
   filter = filter.trim();
-  var fieldName = filter.replace(/[>|<|=|>=|<=]*$/, '').trim(),
-      op = filter.substr(fieldName.length, filter.length).trim();
+  var fieldName = filter.replace(/[>|<|=|>=|<=]*$/, '').trim();
+  var op = filter.substr(fieldName.length, filter.length).trim();
   q.filters = q.filters || [];
   q.filters.push({ name: fieldName, op: op, val: value });
   return q;
@@ -53,11 +53,11 @@ Query.prototype.hasAncestor = function(key) {
 
 Query.prototype.order = function(order) {
   var q = util.extend(this, new Query());
-  var sign = order[0],
-      fieldName = order.substr(1);
+  var sign = order[0];
+  var fieldName = order.substr(1);
   if (sign !== '-' && sign !== '+' ) {
-    throw new Error('Invalid order pattern. Expected "+fieldName" or ' +
-                    '"-fieldName".');
+    throw new Error(
+        'Invalid order pattern. Expected "+fieldName" or "-fieldName".');
   }
   q.orders = q.orders || [];
   q.orders.push({ name: fieldName, sign: sign });

lib/index.js

@@ -16,8 +16,8 @@
 
 'use strict';
 
-var datastore = require('./datastore'),
-    entity = require('./datastore/entity.js');
+var datastore = require('./datastore');
+var entity = require('./datastore/entity.js');
 
 datastore.Int = function(val) {
   return new entity.Int(val);
@@ -29,6 +29,6 @@ datastore.Double = function(val) {
 
 module.exports = {
   datastore: datastore,
-  storage:   require('./storage'),
-  pubsub:    require('./pubsub')
+  storage: require('./storage'),
+  pubsub: require('./pubsub')
 };

lib/pubsub/index.js

@@ -16,17 +16,18 @@
 
 'use strict';
 
-var events = require('events'),
-    nodeutil = require('util');
+var events = require('events');
+var nodeutil = require('util');
 
-var conn = require('../common/connection.js'),
-    util = require('../common/util.js');
+var conn = require('../common/connection.js');
+var util = require('../common/util.js');
 
 /**
  * Base URL for Pub/Sub API.
  * @type {String}
  */
 var PUBSUB_BASE_URL = 'https://www.googleapis.com/pubsub/v1beta1';
+
 /**
  * Required scopes for Pub/Sub API.
  * @type {Array}
@@ -77,8 +78,8 @@ Subscription.prototype.pull = function(opts, callback) {
     subscription: this.name,
     returnImmediately: !!opts.returnImmediately
   };
-  this.conn.makeReq('POST', 'subscriptions/pull', null, body,
-      function(err, message) {
+  this.conn.makeReq(
+      'POST', 'subscriptions/pull', null, body, function(err, message) {
     // TODO(jbd): Fix API to return a list of messages.
     if (err) {
       callback(err);
@@ -247,11 +248,12 @@ Connection.prototype.listSubscriptions = function(query, callback) {
   }
   var q = util.extend({}, query);
   if (q.filterByTopic) {
-    q.query = 'pubsub.googleapis.com/topic in (' +
-              this.fullTopicName_(q.filterByTopic) + ')';
+    q.query =
+        'pubsub.googleapis.com/topic in (' +
+        this.fullTopicName_(q.filterByTopic) + ')';
   } else {
-    q.query = 'cloud.googleapis.com/project in (' + this.fullProjectName_() +
-              ')';
+    q.query =
+        'cloud.googleapis.com/project in (' + this.fullProjectName_() + ')';
   }
   delete q.filterByTopic;
 
@@ -365,8 +367,8 @@ Connection.prototype.listTopics = function(query, callback) {
  */
 Connection.prototype.getTopic = function(name, callback) {
   var that = this;
-  var cb = callback || util.noop,
-      fullName = this.fullTopicName_(name);
+  var cb = callback || util.noop;
+  var fullName = this.fullTopicName_(name);
   this.makeReq('GET', 'topics/' + fullName, null, true, function(err) {
     if (err) {
       return cb(err);
@@ -382,8 +384,8 @@ Connection.prototype.getTopic = function(name, callback) {
  */
 Connection.prototype.createTopic = function(name, callback) {
   var that = this;
-  var cb = callback || util.noop,
-      fullName = this.fullTopicName_(name);
+  var cb = callback || util.noop;
+  var fullName = this.fullTopicName_(name);
   this.makeReq('POST', 'topics', null, { name: fullName }, function(err) {
     cb(err, new Topic(that, fullName));
   });

lib/storage/index.js

@@ -16,23 +16,23 @@
 
 'use strict';
 
-var conn = require('../common/connection.js'),
-    nodeutil = require('util'),
-    events = require('events'),
-    stream = require('stream'),
-    fs = require('fs'),
-    util = require('../common/util.js'),
-    uuid = require('node-uuid');
+var events = require('events');
+var fs = require('fs');
+var nodeutil = require('util');
+var stream = require('stream');
+var uuid = require('node-uuid');
+
+var conn = require('../common/connection.js');
+var util = require('../common/util.js');
 
 /**
  * Required scopes for Google Cloud Storage API.
  * @type {Array}
  */
-var SCOPES = [
-    'https://www.googleapis.com/auth/devstorage.full_control'];
+var SCOPES = ['https://www.googleapis.com/auth/devstorage.full_control'];
 
-var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b',
-    STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com/upload/storage/v1/b';
+var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b';
+var STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com/upload/storage/v1/b';
 
 var reqStreamToCallback = function(st, callback) {
   st.callback = util.noop;
@@ -283,7 +283,9 @@ Bucket.prototype.write = function(name, opts, callback) {
       base: STORAGE_UPLOAD_BASE_URL,
       bucket: this.bucketName
     }),
-    qs: { name: name, uploadType: 'multipart' },
+    qs: {
+      name: name, uploadType: 'multipart'
+    },
     headers: {
       'Content-Type': 'multipart/related; boundary="' + boundary + '"'
     }
@@ -292,8 +294,8 @@ Bucket.prototype.write = function(name, opts, callback) {
       callback(err);
       return;
     }
-    var remoteStream = that.conn.requester(req),
-        oldEndFn = remoteStream.end;
+    var remoteStream = that.conn.requester(req);
+    var oldEndFn = remoteStream.end;
     remoteStream.end = function(data, encoding, callback) {
       data = data || '';
       data += '\n--' + boundary + '--\n';
@@ -337,4 +339,3 @@ Bucket.prototype.makeReq = function(method, path, q, body, callback) {
 };
 
 module.exports.Bucket = Bucket;
-

package.json

@@ -33,7 +33,7 @@
     "mocha": "^1.21.3"
   },
   "scripts": {
-    "test": "jshint lib/**/*.js test/*.js && mocha --reporter spec",
+    "test": "jshint lib/**/*.js regression/*.js test/*.js && mocha --reporter spec",
     "regression-test": "mocha --reporter spec --timeout 10000 regression/*",
     "cover": "istanbul cover mocha -- --timeout 10000 test/* regression/*"
   },