diff --git a/index.js b/index.js index c714a67..97fe624 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ 'use strict'; var FileInfo = require('./lib/fileinfo.js'); -var configs = require('./lib/configs'); +var configs = require('./lib/configs.js'); var formidable = require('formidable'); var fs = require('fs'); var path = require('path'); @@ -10,7 +10,8 @@ module.exports = uploadService; function uploadService(opts) { var options = configs.apply(opts); - var transporter = require('./lib/transport/'+options.storage.type === 'local'?'aws':'local')(options); + var transporter = options.storage.type === 'local'?require('./lib/transport/local.js'):require('./lib/transport/aws.js'); + transporter = transporter(options); var fileUploader = {}; diff --git a/lib/configs.js b/lib/configs.js index 60e96c1..10e3675 100644 --- a/lib/configs.js +++ b/lib/configs.js @@ -1,8 +1,5 @@ -var checkExists = require('./checkFolder'); -/** - * default configurations - */ -module.exports = options; +var checkExists = require('./checkFolder.js'); + var options = { tmpDir: __dirname + '/tmp', uploadDir: __dirname + '/public/files', @@ -53,10 +50,6 @@ var options = { this.validate(); - delete this.apply; - delete this.specialApply; - delete this.validate(); - return this; }, @@ -122,3 +115,8 @@ var options = { } }; + +/* + * default configurations + */ +module.exports = options; diff --git a/specs/fileupload-spec.js b/specs/fileupload-spec.js index cbb5e36..7e20a04 100644 --- a/specs/fileupload-spec.js +++ b/specs/fileupload-spec.js @@ -1,5 +1,4 @@ 'use strict'; - describe('FileInfo package', function() { var FileInfo = require('../lib/fileinfo.js'); // TODO - FileInfo default constructor or mock parameters @@ -25,6 +24,11 @@ describe('Uploader configuration', function() { // TODO - Create a mock object for the filesystem uploader = require('../index'); }); + + it('can require configs without error',function(){ + var configs = require('../lib/configs.js'); + expect(configs).not.toBe(null); + }); it('should have default config values', function() { options = {};