Updated README and little code changes

README.md

@@ -11,14 +11,14 @@ To provide an simple interface to the masthead API within node.
 1) Install the node module using the setup instructions below.
 2) Import / Require the masthead
 3) Call masthead.get() and receive a promise
-```
-import masthead from 'masthead';
+```javascript
+import masthead from 'node-masthead-injector';
 
 masthead.get()
-  .then(function(assets) {
+  .then((assets) => {
     console.log(assets);
   })
-  .catch(function(error) {
+  .catch((error) => {
     // An asset could not be retrieved
   });
 ```
@@ -39,7 +39,7 @@ masthead.get()
 ##### Overriding the configuration
 
 You can override these attributes by calling `masthead.setConfig()` before calling `masthead.get()`. Pass in an object to override individual attributes or the entire object.
-```
+```javascript
 {
     host: 'https://assets.sky.com/new',
     siteArea: 'help-and-support',

app/masthead.js

@@ -42,20 +42,17 @@ const injector = {
   },
 
   _log: function(message) {
-    if (this._config.debug) {
-      console.log(message);
-    }
+    if (this._config.debug) console.log(message);
   },
 
   _requestAsset: function(asset) {
     this._log('MASTHEAD - Requesting asset - ' + asset.path);
 
-    return Request(this._config.host + asset.path)
-      .then(response => {
-        asset.data = response;
+    return Request(this._config.host + asset.path).then(response => {
+      asset.data = response;
 
-        return asset;
-      });
+      return asset;
+    });
   },
 
   /**
@@ -73,11 +70,6 @@ const injector = {
    * }
    */
   setConfig: function(config) {
-    if (!config) {
-      this._config = this._defaultConfig;
-      return this._config;
-    }
-
     this._config = Object.assign({},
       this._defaultConfig,
       config
@@ -102,20 +94,18 @@ const injector = {
    * @return {Promise}
    */
   get: function() {
-    var requests = [];
+    const requests = [];
 
     this._init();
 
     this._config.assets.forEach(item => {
-      requests.push(
-        this._requestAsset(item)
-      )
+      requests.push(this._requestAsset(item))
     });
 
     return Promise.all(requests)
       .then(results => {
-        let assets = {};
-        let time = +(new Date());
+        const assets = {};
+        const time = +(new Date());
         results.forEach(response => {
           if (!assets[response.section]) {
             assets[response.section] = '';
@@ -130,7 +120,7 @@ const injector = {
       .catch(error => {
         this._log('MASTHEAD - ====== Error ======');
         this._log(`MASTHEAD - statusCode: ${error.statusCode}`);
-        this._log(`MASTHEAD - asset: ${error.options.uri}`);
+        this._log(`MASTHEAD - asset: ${(error.options || {}).uri}`);
         this._log('MASTHEAD - ====== Error ======');
       });
 

build/masthead.js

@@ -46,15 +46,21 @@ var injector = {
       }
     });
 
-    console.log('MASTHEAD - Starting');
+    this._log('MASTHEAD - Starting');
   },
 
   _getConfig: function _getConfig() {
     return this._config || this.setConfig();
   },
 
+  _log: function _log(message) {
+    if (this._config.debug) {
+      console.log(message);
+    }
+  },
+
   _requestAsset: function _requestAsset(asset) {
-    console.log('MASTHEAD - Requesting asset - ' + asset.path);
+    this._log('MASTHEAD - Requesting asset - ' + asset.path);
 
     return (0, _requestPromise2['default'])(this._config.host + asset.path).then(function (response) {
       asset.data = response;
@@ -78,11 +84,6 @@ var injector = {
    * }
    */
   setConfig: function setConfig(config) {
-    if (!config) {
-      this._config = this._defaultConfig;
-      return this._config;
-    }
-
     this._config = Object.assign({}, this._defaultConfig, config);
 
     return this._config;
@@ -125,13 +126,13 @@ var injector = {
         assets[response.section] += response.data;
       });
 
-      console.log('MASTHEAD - Assets received (' + (time - _this2._startTime) / 1000 + 's)');
+      _this2._log('MASTHEAD - Assets received (' + (time - _this2._startTime) / 1000 + 's)');
       return assets;
     })['catch'](function (error) {
-      console.log('MASTHEAD - ====== Error ======');
-      console.log('MASTHEAD - statusCode: ' + error.statusCode);
-      console.log('MASTHEAD - asset: ' + error.options.uri);
-      console.log('MASTHEAD - ====== Error ======');
+      _this2._log('MASTHEAD - ====== Error ======');
+      _this2._log('MASTHEAD - statusCode: ' + error.statusCode);
+      _this2._log('MASTHEAD - asset: ' + error.options.uri);
+      _this2._log('MASTHEAD - ====== Error ======');
     });
   }
 };

index.js

@@ -1,6 +1,6 @@
 import masthead from './app/masthead.js';
 
 masthead.get()
-  .then(function(assets) {
+  .then((assets) => {
     console.log(assets);
   });