Skip to content

Commit b3a608e

Browse files
stephenplusplusstephenplusplus
committed
re-tweaks.
1 parent 64123c6 commit b3a608e

17 files changed

Lines changed: 175 additions & 194 deletions

‎lib/common/connection.js‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
'use strict';
2020

21-
var GAPIToken = require('gapitoken'),
22-
req = require('request'),
23-
pkg = require('../../package.json'),
24-
util = require('./util');
21+
var GAPIToken = require('gapitoken');
22+
var req = require('request');
23+
var pkg = require('../../package.json');
24+
var util = require('./util');
2525

26-
var USER_AGENT = 'gcloud-node/' + pkg.version,
27-
METADATA_TOKEN_URL = 'http://metadata/computeMetadata/v1/instance/' +
28-
'service-accounts/default/token';
26+
var METADATA_TOKEN_URL =
27+
'http://metadata/computeMetadata/v1/instance/service-accounts/default/' +
28+
'token';
29+
var USER_AGENT = 'gcloud-node/' + pkg.version;
2930

3031
/**
3132
* Token represents an access token
@@ -151,8 +152,12 @@ Connection.prototype.createAuthorizedReq = function(reqOpts, callback) {
151152
var that = this;
152153
// Add user agent.
153154
reqOpts.headers = reqOpts.headers || {};
154-
reqOpts.headers['User-Agent'] = reqOpts.headers['User-Agent'] ?
155-
reqOpts.headers['User-Agent'] + '; ' + USER_AGENT : USER_AGENT;
155+
156+
if (reqOpts.headers['User-Agent']) {
157+
reqOpts.headers['User-Agent'] += '; ' + USER_AGENT;
158+
} else {
159+
reqOpts.headers['User-Agent'] = USER_AGENT;
160+
}
156161

157162
if (this.isConnected()) {
158163
return callback(null, this.authorizeReq(reqOpts));

‎lib/datastore/entity.js‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
'use strict';
1818

1919
var entityMeta = {};
20-
21-
var namespaceRegex = /^[A-Za-z]*$/,
22-
kindRegex = /^[A-Za-z]*$/,
23-
fieldNameRegex = /^[A-Za-z]*$/;
20+
var fieldNameRegex = /^[A-Za-z]*$/;
21+
var kindRegex = /^[A-Za-z]*$/;
22+
var namespaceRegex = /^[A-Za-z]*$/;
2423

2524
/**
2625
* Conversion dict for query operation to operation proto value.
@@ -96,19 +95,24 @@ var keyToKeyProto = function(datasetId, key) {
9695
if (key.length < 2) {
9796
throw new Error('A key should contain at least a kind and an identifier.');
9897
}
99-
var namespace = null, start = 0;
98+
var namespace = null;
99+
var start = 0;
100100
if (key.length % 2 === 1) {
101101
// the first item is the namespace
102102
namespace = key[0];
103103
start = 1;
104104
}
105105
var path = [];
106106
for (var i = start; i < (key.length - start); i += 2) {
107-
var p = { kind: key[i] }, val = key[i+1];
107+
var p = { kind: key[i] };
108+
var val = key[i+1];
108109
if (val) {
109110
// if not numeric, set key name.
110-
if (isNaN(val)) { p.name = val; }
111-
else { p.id = val; }
111+
if (isNaN(val)) {
112+
p.name = val;
113+
} else {
114+
p.id = val;
115+
}
112116
}
113117
path.push(p);
114118
}
@@ -129,7 +133,7 @@ var keyToKeyProto = function(datasetId, key) {
129133
module.exports.keyToKeyProto = keyToKeyProto;
130134

131135
module.exports.formatArray = function(results) {
132-
return results.map(function (result) {
136+
return results.map(function(result) {
133137
return {
134138
key: keyFromKeyProto(result.entity.key),
135139
data: entityFromEntityProto(result.entity)

‎lib/datastore/index.js‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@
1616

1717
'use strict';
1818

19-
var conn = require('../common/connection.js'),
20-
entity = require('./entity.js'),
21-
Query = require('./query.js').Query,
22-
util = require('../common/util.js');
19+
var conn = require('../common/connection.js');
20+
var entity = require('./entity.js');
21+
var Query = require('./query.js').Query;
22+
var util = require('../common/util.js');
2323

24-
var DATASTORE_BASE_URL = 'https://www.googleapis.com/datastore/v1beta2/' +
25-
'datasets',
26-
SCOPES = [
27-
'https://www.googleapis.com/auth/datastore',
28-
'https://www.googleapis.com/auth/userinfo.email'],
29-
MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL',
30-
MODE_TRANSACTIONAL = 'TRANSACTIONAL';
24+
var DATASTORE_BASE_URL =
25+
'https://www.googleapis.com/datastore/v1beta2/datasets';
26+
var MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL';
27+
var MODE_TRANSACTIONAL = 'TRANSACTIONAL';
28+
var SCOPES = [
29+
'https://www.googleapis.com/auth/datastore',
30+
'https://www.googleapis.com/auth/userinfo.email'
31+
];
3132

3233
/**
3334
* Transaction represents a Datastore transaction.
@@ -224,7 +225,7 @@ Transaction.prototype.runQuery = function(q, callback) {
224225
return callback(err);
225226
}
226227
var nextQuery = null;
227-
if (resp.batch.endCursor && resp.batch.endCursor != q.startVal) {
228+
if (resp.batch.endCursor && resp.batch.endCursor !== q.startVal) {
228229
nextQuery = q.start(resp.batch.endCursor).offset(0);
229230
}
230231
callback(null, entity.formatArray(resp.batch.entityResults), nextQuery);

‎lib/datastore/query.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ Query.prototype.filter = function(filter, value) {
3838
// TODO(jbd): Add filter validation.
3939
var q = util.extend(this, new Query());
4040
filter = filter.trim();
41-
var fieldName = filter.replace(/[>|<|=|>=|<=]*$/, '').trim(),
42-
op = filter.substr(fieldName.length, filter.length).trim();
41+
var fieldName = filter.replace(/[>|<|=|>=|<=]*$/, '').trim();
42+
var op = filter.substr(fieldName.length, filter.length).trim();
4343
q.filters = q.filters || [];
4444
q.filters.push({ name: fieldName, op: op, val: value });
4545
return q;
@@ -53,11 +53,11 @@ Query.prototype.hasAncestor = function(key) {
5353

5454
Query.prototype.order = function(order) {
5555
var q = util.extend(this, new Query());
56-
var sign = order[0],
57-
fieldName = order.substr(1);
56+
var sign = order[0];
57+
var fieldName = order.substr(1);
5858
if (sign !== '-' && sign !== '+' ) {
59-
throw new Error('Invalid order pattern. Expected "+fieldName" or ' +
60-
'"-fieldName".');
59+
throw new Error(
60+
'Invalid order pattern. Expected "+fieldName" or "-fieldName".');
6161
}
6262
q.orders = q.orders || [];
6363
q.orders.push({ name: fieldName, sign: sign });

‎lib/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
'use strict';
1818

19-
var datastore = require('./datastore'),
20-
entity = require('./datastore/entity.js');
19+
var datastore = require('./datastore');
20+
var entity = require('./datastore/entity.js');
2121

2222
datastore.Int = function(val) {
2323
return new entity.Int(val);
@@ -29,6 +29,6 @@ datastore.Double = function(val) {
2929

3030
module.exports = {
3131
datastore: datastore,
32-
storage: require('./storage'),
33-
pubsub: require('./pubsub')
32+
storage: require('./storage'),
33+
pubsub: require('./pubsub')
3434
};

‎lib/pubsub/index.js‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616

1717
'use strict';
1818

19-
var events = require('events'),
20-
nodeutil = require('util');
19+
var events = require('events');
20+
var nodeutil = require('util');
2121

22-
var conn = require('../common/connection.js'),
23-
util = require('../common/util.js');
22+
var conn = require('../common/connection.js');
23+
var util = require('../common/util.js');
2424

2525
/**
2626
* Base URL for Pub/Sub API.
2727
* @type {String}
2828
*/
2929
var PUBSUB_BASE_URL = 'https://www.googleapis.com/pubsub/v1beta1';
30+
3031
/**
3132
* Required scopes for Pub/Sub API.
3233
* @type {Array}
@@ -77,8 +78,8 @@ Subscription.prototype.pull = function(opts, callback) {
7778
subscription: this.name,
7879
returnImmediately: !!opts.returnImmediately
7980
};
80-
this.conn.makeReq('POST', 'subscriptions/pull', null, body,
81-
function(err, message) {
81+
this.conn.makeReq(
82+
'POST', 'subscriptions/pull', null, body, function(err, message) {
8283
// TODO(jbd): Fix API to return a list of messages.
8384
if (err) {
8485
callback(err);
@@ -247,11 +248,12 @@ Connection.prototype.listSubscriptions = function(query, callback) {
247248
}
248249
var q = util.extend({}, query);
249250
if (q.filterByTopic) {
250-
q.query = 'pubsub.googleapis.com/topic in (' +
251-
this.fullTopicName_(q.filterByTopic) + ')';
251+
q.query =
252+
'pubsub.googleapis.com/topic in (' +
253+
this.fullTopicName_(q.filterByTopic) + ')';
252254
} else {
253-
q.query = 'cloud.googleapis.com/project in (' + this.fullProjectName_() +
254-
')';
255+
q.query =
256+
'cloud.googleapis.com/project in (' + this.fullProjectName_() + ')';
255257
}
256258
delete q.filterByTopic;
257259

@@ -365,8 +367,8 @@ Connection.prototype.listTopics = function(query, callback) {
365367
*/
366368
Connection.prototype.getTopic = function(name, callback) {
367369
var that = this;
368-
var cb = callback || util.noop,
369-
fullName = this.fullTopicName_(name);
370+
var cb = callback || util.noop;
371+
var fullName = this.fullTopicName_(name);
370372
this.makeReq('GET', 'topics/' + fullName, null, true, function(err) {
371373
if (err) {
372374
return cb(err);
@@ -382,8 +384,8 @@ Connection.prototype.getTopic = function(name, callback) {
382384
*/
383385
Connection.prototype.createTopic = function(name, callback) {
384386
var that = this;
385-
var cb = callback || util.noop,
386-
fullName = this.fullTopicName_(name);
387+
var cb = callback || util.noop;
388+
var fullName = this.fullTopicName_(name);
387389
this.makeReq('POST', 'topics', null, { name: fullName }, function(err) {
388390
cb(err, new Topic(that, fullName));
389391
});

‎lib/storage/index.js‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616

1717
'use strict';
1818

19-
var conn = require('../common/connection.js'),
20-
nodeutil = require('util'),
21-
events = require('events'),
22-
stream = require('stream'),
23-
fs = require('fs'),
24-
util = require('../common/util.js'),
25-
uuid = require('node-uuid');
19+
var events = require('events');
20+
var fs = require('fs');
21+
var nodeutil = require('util');
22+
var stream = require('stream');
23+
var uuid = require('node-uuid');
24+
25+
var conn = require('../common/connection.js');
26+
var util = require('../common/util.js');
2627

2728
/**
2829
* Required scopes for Google Cloud Storage API.
2930
* @type {Array}
3031
*/
31-
var SCOPES = [
32-
'https://www.googleapis.com/auth/devstorage.full_control'];
32+
var SCOPES = ['https://www.googleapis.com/auth/devstorage.full_control'];
3333

34-
var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b',
35-
STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com/upload/storage/v1/b';
34+
var STORAGE_BASE_URL = 'https://www.googleapis.com/storage/v1/b';
35+
var STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com/upload/storage/v1/b';
3636

3737
var reqStreamToCallback = function(st, callback) {
3838
st.callback = util.noop;
@@ -283,7 +283,9 @@ Bucket.prototype.write = function(name, opts, callback) {
283283
base: STORAGE_UPLOAD_BASE_URL,
284284
bucket: this.bucketName
285285
}),
286-
qs: { name: name, uploadType: 'multipart' },
286+
qs: {
287+
name: name, uploadType: 'multipart'
288+
},
287289
headers: {
288290
'Content-Type': 'multipart/related; boundary="' + boundary + '"'
289291
}
@@ -292,8 +294,8 @@ Bucket.prototype.write = function(name, opts, callback) {
292294
callback(err);
293295
return;
294296
}
295-
var remoteStream = that.conn.requester(req),
296-
oldEndFn = remoteStream.end;
297+
var remoteStream = that.conn.requester(req);
298+
var oldEndFn = remoteStream.end;
297299
remoteStream.end = function(data, encoding, callback) {
298300
data = data || '';
299301
data += '\n--' + boundary + '--\n';
@@ -337,4 +339,3 @@ Bucket.prototype.makeReq = function(method, path, q, body, callback) {
337339
};
338340

339341
module.exports.Bucket = Bucket;
340-

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"mocha": "^1.21.3"
3434
},
3535
"scripts": {
36-
"test": "jshint lib/**/*.js test/*.js && mocha --reporter spec",
36+
"test": "jshint lib/**/*.js regression/*.js test/*.js && mocha --reporter spec",
3737
"regression-test": "mocha --reporter spec --timeout 10000 regression/*",
3838
"cover": "istanbul cover mocha -- --timeout 10000 test/* regression/*"
3939
},

0 commit comments

Comments
 (0)