Skip to content

Commit d0ba7cb

Browse files
committed
- upgrade modules
- fix bug: @log instead of log in native server provider - fix bug: incorrect parentheses for Promise.all in native server provider - fix bug: should passin full opt object to provider in server entry point `dist/server.js` - tweak gcs provider option to better align spec. - bump version
1 parent 5bb5954 commit d0ba7cb

File tree

10 files changed

+26
-21
lines changed

10 files changed

+26
-21
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# Change Logs
22

3-
## v0.1.2 (upcoming)
3+
## v0.1.2
44

55
- upgrade modules
6+
- fix bug: @log instead of log in native server provider
7+
- fix bug: incorrect parentheses for Promise.all in native server provider
8+
- fix bug: should passin full opt object to provider in server entry point `dist/server.js`
9+
- tweak gcs provider option to better align spec.
610

711

812
## v0.1.1

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,9 @@ sample configurations:
300300

301301
config native provider with following options:
302302

303-
- `folder`: fs path for saving all files.
304-
- `url`: url prefix ( relative or absolute ). if omitted, fallback to `folder`
303+
- `config`: native provider specific configs, including:
304+
- `folder`: fs path for saving all files. if omitted, fallback to `uploads`
305+
- `url`: url prefix ( relative or absolute ). if omitted, fallback to `folder`
305306
- `adopt: (req, {name, path, url, id})`: post process function after files are saved.
306307
- if provided, will be called for each file saved.
307308
- options:

dist/server.js

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "@plotdb/uploadr",
44
"license": "MIT",
55
"description": "File Upload Library",
6-
"version": "0.1.1",
6+
"version": "0.1.2",
77
"main": "dist/server.js",
88
"files": [
99
"dist/**/*",

providers/gcs.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

providers/native.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/providers/gcs/server.ls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ provider-gcs = (opt={}) ->
66
@opt = {} <<< opt
77
@config = opt.config or {}
88
@adopt = opt.adopt or {upload: (->Promise.resolve!), download: (->Promise.resolve!)}
9-
@bucket = opt.bucket or @config.bucket
9+
@bucket = @config.bucket
1010
@gcs = new storage.Storage @config
1111
@
1212

src/providers/native/server.ls

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ require! <[fs fs-extra path crypto imgtype]>
22

33
provider-native = (opt = {}) ->
44
@opt = opt
5+
@config = opt.config or {}
56
@adopt = opt.adopt or {upload: (->Promise.resolve!), download: (->Promise.resolve!)}
6-
@folder = opt.folder or \uploads
7-
@rooturl = opt.url or @folder
7+
@folder = @config.folder or \uploads
8+
@rooturl = @config.url or @folder
89
@log = opt.log or (-> console.log it)
910
@catch = opt.catch or null
1011
@
@@ -49,7 +50,7 @@ provider-native.prototype = Object.create(Object.prototype) <<< do
4950
if e => throw e
5051
res {path: des, url, name, id: hk}
5152
.catch (err) ~>
52-
log err
53+
@log err
5354
res {name}
5455

5556
/**
@@ -80,7 +81,7 @@ provider-native.prototype = Object.create(Object.prototype) <<< do
8081
files = (req.files or {}).file
8182
files = if !files => [] else if Array.isArray(files) => files else [files]
8283
if cfg and cfg.target => files = files.map -> it <<< {target: cfg.target}
83-
Promise.all files .map ~> @archive(it).then((ret) ~> @adopt.upload(req, ret) .then -> ret)
84+
Promise.all files.map ~> @archive(it).then((ret) ~> @adopt.upload(req, ret) .then -> ret)
8485

8586
get-upload-router: -> (req, res, next) ~> @router req, res, next
8687

src/server.ls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ lib = path.dirname fs.realpathSync __filename
44
uploadr =
55
provider: (opt) ->
66
provider = require("../providers/#{opt.host}")
7-
new provider {config: opt.config}
7+
new provider opt
88

99
module.exports = uploadr

0 commit comments

Comments
 (0)