Merge pull request #728 from callmehiphop/style-checker

JavaScript Code Style Linter
googleapis · Jul 19, 2015 · d4d3d06 · d4d3d06
2 parents c01e9fd + 44883f2
commit d4d3d06
Show file tree

Hide file tree

Showing 22 changed files with 253 additions and 224 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -0,0 +1,18 @@
+{
+  "preset": "node-style-guide",
+  "requireTrailingComma": null,
+  "requireCapitalizedComments": null,
+  "requireSpaceAfterKeywords": [
+    "if",
+    "else",
+    "for",
+    "while",
+    "do",
+    "switch",
+    "case",
+    "return",
+    "try",
+    "typeof"
+  ],
+  "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties"
+}
diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
@@ -28,7 +28,7 @@ var OP_TO_OPERATOR = {
   '>=': 'GREATER_THAN_OR_EQUAL',
   '<':  'LESS_THAN',
   '<=': 'LESS_THAN_OR_EQUAL',
-  'HAS_ANCESTOR': 'HAS_ANCESTOR'
+  HAS_ANCESTOR: 'HAS_ANCESTOR'
 };
 
 /** @const {object} Conversion map for query sign -> order protocol value. */
@@ -221,7 +221,7 @@ function keyToKeyProto(key) {
   var path = [];
   for (var i = 0; i < keyPath.length; i += 2) {
     var p = { kind: keyPath[i] };
-    var val = keyPath[i+1];
+    var val = keyPath[i + 1];
     if (val) {
       // if not numeric, set key name.
       if (isNaN(val)) {
@@ -343,7 +343,7 @@ function propertyToValue(property) {
   if (exists(property.timestamp_microseconds_value)) {
     var microSecs = parseInt(
         property.timestamp_microseconds_value.toString(), 10);
-    return new Date(microSecs/1000);
+    return new Date(microSecs / 1000);
   }
   if (exists(property.key_value)) {
     return keyFromKeyProto(property.key_value);

diff --git a/lib/datastore/request.js b/lib/datastore/request.js
@@ -365,19 +365,23 @@ DatastoreRequest.prototype.save = function(entities, callback) {
 
       if (method) {
         switch (method) {
-          case 'insert':
+          case 'insert': {
             acc.insert.push(ent);
             break;
-          case 'update':
+          }
+          case 'update': {
             acc.update.push(ent);
             break;
-          case 'upsert':
+          }
+          case 'upsert': {
             acc.upsert.push(ent);
             break;
-          case 'insert_auto_id':
+          }
+          case 'insert_auto_id': {
             insertIndexes.push(index);
             acc.insert_auto_id.push(ent);
             break;
+          }
         }
       } else {
         if (entity.isKeyComplete(entityObject.key)) {

diff --git a/lib/index.js b/lib/index.js
@@ -225,7 +225,7 @@ gcloud.pubsub = function(config) {
  *   keyFilename: '/path/to/keyfile.json'
  * });
  */
-gcloud.search = function (config) {
+gcloud.search = function(config) {
   return new Search(config);
 };
 

diff --git a/lib/storage/file.js b/lib/storage/file.js
@@ -1201,8 +1201,8 @@ File.prototype.setMetadata = function(metadata, callback) {
 File.prototype.makePrivate = function(options, callback) {
   var that = this;
   if (util.is(options, 'function')) {
-      callback = options;
-      options = {};
+    callback = options;
+    options = {};
   }
   var path = '/o/' + encodeURIComponent(this.name);
   var query = { predefinedAcl: options.strict ? 'private' : 'projectPrivate' };

diff --git a/package.json b/package.json
@@ -72,6 +72,7 @@
     "dox": "^0.7.0",
     "glob": "^5.0.9",
     "istanbul": "^0.3.5",
+    "jscs": "^1.13.1",
     "jshint": "^2.6.0",
     "mitm": "^1.1.0",
     "mocha": "^2.1.0",
@@ -80,7 +81,7 @@
   },
   "scripts": {
     "docs": "./scripts/docs.sh",
-    "lint": "jshint lib/ system-test/ test/",
+    "lint": "jshint lib/ system-test/ test/ && jscs lib/ system-test/ test/",
     "test": "npm run docs && mocha test/*/*.js test/docs.js",
     "system-test": "mocha system-test/* --timeout 30000",
     "cover": "istanbul cover -x 'system-test/*' _mocha -- --timeout 30000 test/*/*.js test/docs.js system-test/*",

diff --git a/system-test/datastore.js b/system-test/datastore.js
@@ -84,7 +84,7 @@ describe('datastore', function() {
         buf: new Buffer('010100000000000000000059400000000000006940', 'hex')
       };
 
-      ds.save({ key: postKey, data: data }, function (err) {
+      ds.save({ key: postKey, data: data }, function(err) {
         assert.ifError(err);
 
         var assignedId = postKey.path[1];

diff --git a/system-test/storage.js b/system-test/storage.js
@@ -491,14 +491,14 @@ describe('storage', function() {
 
         var fileSize = file.metadata.size;
         var byteRange = {
-          start: Math.floor(fileSize * 1/3),
-          end: Math.floor(fileSize * 2/3)
+          start: Math.floor(fileSize * 1 / 3),
+          end: Math.floor(fileSize * 2 / 3)
         };
         var expectedContentSize = byteRange.start + 1;
 
         var sizeStreamed = 0;
         file.createReadStream(byteRange)
-          .on('data', function (chunk) {
+          .on('data', function(chunk) {
             sizeStreamed += chunk.length;
           })
           .on('error', done)

diff --git a/test/bigquery/index.js b/test/bigquery/index.js
@@ -25,10 +25,10 @@ function FakeTable(a, b) {
   Table.call(this, a, b);
 }
 
-var mergeSchemaWithRows_Override;
+var mergeSchemaWithRowsOverride;
 FakeTable.mergeSchemaWithRows_ = function() {
   var args = [].slice.apply(arguments);
-  return (mergeSchemaWithRows_Override || Table.mergeSchemaWithRows_)
+  return (mergeSchemaWithRowsOverride || Table.mergeSchemaWithRows_)
     .apply(null, args);
 };
 
@@ -481,8 +481,8 @@ describe('BigQuery', function() {
       var rows = [{ row: 'a' }, { row: 'b' }, { row: 'c' }];
       var schema = [{ fields: [] }];
 
-      mergeSchemaWithRows_Override = function(s, r) {
-        mergeSchemaWithRows_Override = null;
+      mergeSchemaWithRowsOverride = function(s, r) {
+        mergeSchemaWithRowsOverride = null;
         assert.deepEqual(s, schema);
         assert.deepEqual(r, rows);
         done();
@@ -523,8 +523,8 @@ describe('BigQuery', function() {
         });
       };
 
-      mergeSchemaWithRows_Override = function() {
-        mergeSchemaWithRows_Override = null;
+      mergeSchemaWithRowsOverride = function() {
+        mergeSchemaWithRowsOverride = null;
         return ROWS;
       };
 

diff --git a/test/bigquery/table.js b/test/bigquery/table.js
@@ -30,11 +30,11 @@ function FakeFile(a, b) {
   File.call(this, a, b);
 }
 
-var makeWritableStream_Override;
+var makeWritableStreamOverride;
 var fakeUtil = extend({}, util, {
   makeWritableStream: function() {
     var args = [].slice.call(arguments);
-    (makeWritableStream_Override || util.makeWritableStream).apply(null, args);
+    (makeWritableStreamOverride || util.makeWritableStream).apply(null, args);
   }
 });
 
@@ -95,7 +95,7 @@ describe('BigQuery/Table', function() {
   });
 
   beforeEach(function() {
-    makeWritableStream_Override = null;
+    makeWritableStreamOverride = null;
     table = new Table(DATASET, TABLE_ID);
   });
 
@@ -271,7 +271,7 @@ describe('BigQuery/Table', function() {
     it('should use a string as the file type', function(done) {
       var fileType = 'csv';
 
-      makeWritableStream_Override = function(stream, options) {
+      makeWritableStreamOverride = function(stream, options) {
         var load = options.metadata.configuration.load;
         assert.equal(load.sourceFormat, 'CSV');
         done();
@@ -305,7 +305,7 @@ describe('BigQuery/Table', function() {
       it('should make a writable stream when written to', function(done) {
         var stream;
 
-        makeWritableStream_Override = function(s) {
+        makeWritableStreamOverride = function(s) {
           assert.equal(s, stream);
           done();
         };
@@ -315,7 +315,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass the connection', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           assert.deepEqual(options.connection, table.connection);
           done();
         };
@@ -324,7 +324,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass extended metadata', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           assert.deepEqual(options.metadata, {
             configuration: {
               load: {
@@ -345,7 +345,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass the correct request uri', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           var uri = 'https://www.googleapis.com/upload/bigquery/v2/projects/' +
             table.bigQuery.projectId + '/jobs';
           assert.equal(options.request.uri, uri);
@@ -363,7 +363,7 @@ describe('BigQuery/Table', function() {
           return { id: id };
         };
 
-        makeWritableStream_Override = function(stream, options, callback) {
+        makeWritableStreamOverride = function(stream, options, callback) {
           callback(metadata);
         };
 

diff --git a/test/common/stream-router.js b/test/common/stream-router.js
@@ -37,7 +37,7 @@ describe('streamRouter', function() {
       warnOnUnregistered: false
     });
     streamRouter = require('../../lib/common/stream-router.js');
-    var streamRouter_Cached = extend(true, {}, streamRouter);
+    var streamRouterCached = extend(true, {}, streamRouter);
 
     Object.keys(streamRouter).forEach(function(streamRouterMethod) {
       if (typeof streamRouter[streamRouterMethod] !== 'function') {
@@ -50,7 +50,7 @@ describe('streamRouter', function() {
         if (streamRouterOverrides[streamRouterMethod]) {
           return streamRouterOverrides[streamRouterMethod].apply(this, args);
         } else {
-          return streamRouter_Cached[streamRouterMethod].apply(this, args);
+          return streamRouterCached[streamRouterMethod].apply(this, args);
         }
       };
     });