fix code style and readme

.editorconfig

@@ -1,4 +1,3 @@
-# editorconfig.org
 root = true
 
 [*]
@@ -8,5 +7,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[package.json]
+indent_style = space
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false

README.md

@@ -6,15 +6,18 @@ Run mobile and desktop performance tests for your deployed site using [Google Pa
 
 Uses [gpagespeed](https://github.com/zrrrzzt/gpagespeed/) and the reporter in [grunt-pagespeed](https://github.com/jrcryer/grunt-pagespeed).
 
+
 ## Install
 
-```bash
+```sh
 $ npm install --save psi
 ```
 
+
 ## Preview
 
-<img src="http://i.imgur.com/pbLR4pV.png"/>
+![preview](http://i.imgur.com/pbLR4pV.png)
+
 
 ## Usage
 
@@ -35,45 +38,52 @@ psi({
 
 Optionally, a callback is also available with access to the response:
 
-```
-psi(options, function(err, data){
+```js
+psi(options, function (err, data) {
 	console.log(data.score);
 	console.log(data.pageStats);
 });
 ```
 
-###Options
+### Options
+
+#### url
 
-####url
-Type: `String`
+*Required*  
+Type: `string`
 
 URL of the page for which the PageSpeed Insights API should generate results.
 
-####locale
-Type: `String`
+#### locale
+
+Type: `string`  
 Default: `en_US`
 
 The locale that results should be generated in (e.g 'en_GB').
 
-####strategy
-Type: `String`
+#### strategy
+
+Type: `string`  
 Default: `desktop`
 
 The strategy to use when analyzing the page. Valid values are desktop and mobile.
 
-####threshold
-Type: `Number`
+#### threshold
+
+Type: `number`  
 Default: `70`
 
 Threshold score that is needed to pass the pagespeed test
 
-####paths
-Type: `Array`
+#### paths
+
+Type: `array`
 
 An array of URL paths that are appended to the URL
 
-####key
-Type: `String`
+#### key
+
+Type: `string`  
 Default: `nokey`
 
 [Google API Key](https://code.google.com/apis/console/)
@@ -85,23 +95,23 @@ Unless Specified defaults to use the free tier on PageSpeed Insights. Good for g
 
 You will probably want to globally install psi if using as a CLI. This can be done as follows:
 
-```
-npm install -g psi
+```sh
+$ npm install --global psi
 ```
 
 You can then casually use it with your key:
 
-```
+```sh
 $ psi http://www.google.com --key 'YOUR_KEY_GOES_HERE'
 ```
 
 Similar to gpagespeed, the following optional flags are also supported:
 
-```
+```sh
 $ psi <url> --key=<key> --prettyprint=<true> --userIp=<userIp> --locale=<locale> --strategy=<desktop|mobile>
 ```
 
-```
+```sh
 $ psi http://www.html5rocks.com --strategy=mobile
 ```
 
@@ -113,6 +123,7 @@ If you use Grunt, [grunt-pagespeed](https://github.com/jrcryer/grunt-pagespeed)
 
 For testing local project, we recommend using [ngrok](http://www.jamescryer.com/2014/06/12/grunt-pagespeed-and-ngrok-locally-testing/).
 
+
 ## License
 
 Apache 2.0  

index.js

@@ -11,19 +11,19 @@ var pagespeed = require('gpagespeed');
 var output = require('./output').init();
 
 module.exports = function (opts, cb) {
-	opts = opts || {};
-	opts.strategy = opts.strategy || 'desktop';
-	opts.nokey = opts.key === void 0;
+  opts = opts || {};
+  cb = cb || function () {};
+  opts.strategy = opts.strategy || 'desktop';
+  opts.nokey = opts.key === undefined;
 
-	cb = cb || function () {};
-	console.log('Running Pagespeed Insights');
-	pagespeed(opts, function(err, data){
-	  if (err) {
-	  	cb(err); return;
-	  } else {
-		  var response = JSON.parse(data);
-		  output.process(opts, response);
-		  cb(err, response);
-		}
-	});
+  pagespeed(opts, function (err, data) {
+    if (err) {
+      cb(err);
+      return;
+    }
+
+    var response = JSON.parse(data);
+    output.process(opts, response);
+    cb(err, response);
+  });
 };

output.js

@@ -8,38 +8,44 @@ var chalk = require('chalk');
 var utils = require('./lib/utils');
 
 exports.init = function () {
-
-  var threshold = 70,
-      exports = {};
+  var threshold = 70;
+  var exports = {};
 
   var generateScore = function (url, strategy, score) {
     var color = utils.scoreColor(score);
-    score     = 'Score:     ' + color(score);
-    url       = 'URL:       ' + chalk.cyan(url);
-    strategy  = 'Strategy:  ' + chalk.cyan(strategy);
+
+    score = 'Score:     ' + color(score);
+    url = 'URL:       ' + chalk.cyan(url);
+    strategy = 'Strategy:  ' + chalk.cyan(strategy);
+
     return [url, score, strategy].join('\n') + '\n';
   };
 
   var generateRuleSetResults = function (rulesets) {
-    var result, ruleImpact, title, _results;
-    _results = [];
+    var result, ruleImpact, title;
+    var _results = [];
+
     for (title in rulesets) {
       result = rulesets[title];
       ruleImpact = Math.ceil(result.ruleImpact * 100) / 100;
       _results.push(utils.labelize(title) + chalk.cyan(ruleImpact));
     }
+
     return _results.join('\n');
   };
 
   var generateStatistics = function (statistics) {
-    var result, title, _results;
-    _results = [];
+    var result, title;
+    var _results = [];
+
     for (title in statistics) {
       result = title.indexOf('Bytes') !== -1 ?
         prettyBytes(+statistics[title]) :
         statistics[title];
+
       _results.push(utils.labelize(title) + chalk.cyan(result));
     }
+
     return _results.join('\n');
   };
 
@@ -49,24 +55,23 @@ exports.init = function () {
   };
 
   exports.process = function (parameters, response, done) {
-    var logger  = console.log;
-    done        = done || function () {};
-    threshold   = parameters.threshold || threshold;
-
-    logger(
-      [
-        utils.divider,
-        generateScore(response.id, parameters.strategy, response.score),
-        generateStatistics(response.pageStats),
-        utils.labelize(''),
-        generateRuleSetResults(response.formattedResults.ruleResults),
-        utils.divider
-      ].join('\n')
-    );
+    var logger = console.log;
+    done = done || function () {};
+    threshold = parameters.threshold || threshold;
+
+    logger([
+      utils.divider,
+      generateScore(response.id, parameters.strategy, response.score),
+      generateStatistics(response.pageStats),
+      utils.labelize(''),
+      generateRuleSetResults(response.formattedResults.ruleResults),
+      utils.divider
+    ].join('\n'));
 
     if (response.score < threshold) {
       throw new Error('Threshold of ' + threshold + ' not met with score of ' + response.score);
     }
+
     return done();
   };