Merge pull request #6 from s0ph1e/fix-extend

Fix _.extend usage issue, which override defaults data

Author: s0ph1e

lib/load.js

@@ -15,7 +15,7 @@ var Loader = function (data) {
     logger,
     makeRequest;
 
-  options = _.extend(defaults, data);
+  options = _.extend({}, defaults, data);
 
   // Set absolute path for directory
   options.directory = path.resolve(process.cwd(), options.directory || '');

lib/utils/request.js

@@ -14,7 +14,7 @@ function getDefaultOptions() {
 }
 
 function getCustomOptions(options) {
-  return _.extend(defaultOptions, options);
+  return _.extend({}, defaultOptions, options);
 }
 
 function makeRequest(options, url) {

test/load-test.js

@@ -77,7 +77,7 @@ describe('Load', function(){
 
   describe('#getDirectoryByExtension', function(){
     it('should return directory for extension specified in options', function(){
-      var loader = new Loader(_.extend(defaultOptions, {
+      var loader = new Loader(_.extend({}, defaultOptions, {
         subdirectories: [
           {
             directory: 'images',
@@ -102,7 +102,7 @@ describe('Load', function(){
     });
 
     it('should return nothing if no directory for extension was set', function(){
-      var loader = new Loader(_.extend(defaultOptions, {
+      var loader = new Loader(_.extend({}, defaultOptions, {
         subdirectories: null
       }));
 
@@ -117,7 +117,7 @@ describe('Load', function(){
       var directory = getTmpDirectoryName();
 
       fs.mkdir(directory, function(){
-        var loader = new Loader(_.extend(defaultOptions, {
+        var loader = new Loader(_.extend({}, defaultOptions, {
           directory: directory
         }));
 
@@ -140,7 +140,7 @@ describe('Load', function(){
     it('should return resolved promise if directory doesn\'t exist', function(){
       var directory = getTmpDirectoryName();
 
-      var loader = new Loader(_.extend(defaultOptions, {
+      var loader = new Loader(_.extend({}, defaultOptions, {
         directory: directory
       }));