From ca4f9e87ef9d0c15daee21012ea9ee1b78af0c0a Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Wed, 17 May 2017 20:02:56 -0400 Subject: [PATCH 1/2] fix: export gstorage --- lib/index.js | 2 +- package.json | 5 +++-- src/index.coffee | 1 + test/lib/index.coffee | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 test/lib/index.coffee diff --git a/lib/index.js b/lib/index.js index c282325..4cbadd7 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1 +1 @@ -module.exports = Object.assign({}, require('./filesystem-manager'), require('./filesystem-fs'), require('./filesystem-s3')); +module.exports = Object.assign({}, require('./filesystem-manager'), require('./filesystem-fs'), require('./filesystem-s3'), require('./filesystem-google-storage')); diff --git a/package.json b/package.json index 0f34110..55e173d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jaune-fs", - "version": "0.0.5", + "version": "0.0.6", "description": "file system for jaune framework", "main": "index.js", "scripts": { @@ -11,7 +11,8 @@ "author": "Alvaro Juste ", "license": "ISC", "dependencies": { - "jaune-env": "0.0.5", + "jaune-env": "~0.0.5", + "jaune-util": "0.0.6", "mime": "^1.3.4", "ncp": "^2.0.0", "path": "^0.12.7" diff --git a/src/index.coffee b/src/index.coffee index 1b64b70..331ce26 100644 --- a/src/index.coffee +++ b/src/index.coffee @@ -3,4 +3,5 @@ module.exports = Object.assign( require './filesystem-manager' require './filesystem-fs' require './filesystem-s3' + require './filesystem-google-storage' ) diff --git a/test/lib/index.coffee b/test/lib/index.coffee new file mode 100644 index 0000000..02c1a61 --- /dev/null +++ b/test/lib/index.coffee @@ -0,0 +1,20 @@ +{ + equal, + ok +} = require 'assert' + +lib = require '../../' + +describe 'lib/index', -> + + it 'exports expected properties', -> + ok lib + ok lib.FsClient + ok lib.GoogleStorageClient + ok lib.S3Bucket + ok lib.Manager + ok lib.ReadResult + + it 'contains no more properties than expected', -> + + equal 5, Object.getOwnPropertyNames(lib).length From a771ffb1305a0161f121f2d25ec1d0eeac6eaa2a Mon Sep 17 00:00:00 2001 From: Alvaro Juste Date: Wed, 17 May 2017 20:11:14 -0400 Subject: [PATCH 2/2] refactor: get rid of Object.assign --- lib/index.js | 18 +++++++++++++++++- src/index.coffee | 22 +++++++++++++++------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/lib/index.js b/lib/index.js index 4cbadd7..d19e0cc 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1 +1,17 @@ -module.exports = Object.assign({}, require('./filesystem-manager'), require('./filesystem-fs'), require('./filesystem-s3'), require('./filesystem-google-storage')); +var FsClient, GoogleStorageClient, Manager, ReadResult, S3Bucket, ref; + +ref = require('./filesystem-manager'), Manager = ref.Manager, ReadResult = ref.ReadResult; + +FsClient = require('./filesystem-fs').FsClient; + +S3Bucket = require('./filesystem-s3').S3Bucket; + +GoogleStorageClient = require('./filesystem-google-storage').GoogleStorageClient; + +module.exports = { + Manager: Manager, + ReadResult: ReadResult, + FsClient: FsClient, + S3Bucket: S3Bucket, + GoogleStorageClient: GoogleStorageClient +}; diff --git a/src/index.coffee b/src/index.coffee index 331ce26..bd151fc 100644 --- a/src/index.coffee +++ b/src/index.coffee @@ -1,7 +1,15 @@ -module.exports = Object.assign( - {} - require './filesystem-manager' - require './filesystem-fs' - require './filesystem-s3' - require './filesystem-google-storage' -) +{ + Manager + ReadResult +} = require './filesystem-manager' +{ + FsClient +} = require './filesystem-fs' +{ + S3Bucket +} = require './filesystem-s3' +{ + GoogleStorageClient +} = require './filesystem-google-storage' + +module.exports = {Manager, ReadResult, FsClient, S3Bucket, GoogleStorageClient}