Skip to content

Commit

Permalink
update deps and relike related changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tunnckoCore committed May 13, 2016
1 parent 7d1ea7a commit a9439d1
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 28 deletions.
25 changes: 7 additions & 18 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var utils = require('./utils')

var letta = module.exports = function letta (fn, args) {
var self = this
var Promize = utils.nativeOrAnother(letta.promise)
var Promize = utils.nativeOrAnother(letta.Promise)
args = utils.sliced(arguments, 1)

var promise = new Promize(function (resolve, reject) {
Expand All @@ -46,11 +46,11 @@ var letta = module.exports = function letta (fn, args) {
utils.co.apply(self, [fn].concat(args)).then(resolve, reject)
return
}
utils.relike.promise = letta.promise
utils.relike.promisify.call(self, fn).apply(self, args).then(resolve, reject)
utils.relike.Promise = letta.Promise
utils.relike.apply(self, [fn].concat(args)).then(resolve, reject)
})

return normalizePromise(promise, Promize)
return utils.normalizePromise(promise, Promize)
}

/**
Expand Down Expand Up @@ -104,22 +104,11 @@ var letta = module.exports = function letta (fn, args) {
*/

letta.promisify = letta.wrap = function lettaPromisify (fn, Promize) {
var self = this
function promisified () {
var args = utils.sliced(arguments)
letta.promise = Promize || lettaPromisify.promise || promisified.promise
return letta.apply(this, [fn].concat(args))
letta.Promise = Promize || lettaPromisify.Promise || promisified.Promise
return letta.apply(this || self, [fn].concat(utils.sliced(arguments)))
}
promisified.__generatorFunction__ = fn
return promisified
}

/**
* Inherit and normalize properties
*/

function normalizePromise (promise, Ctor) {
promise.Prome = Ctor
promise.___customPromise = Ctor.___customPromise
promise.___bluebirdPromise = Ctor.___bluebirdPromise
return promise
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"dependencies": {
"co": "^4.6.0",
"is-es6-generator-function": "^1.0.0",
"lazy-cache": "^2.0.0",
"native-or-another": "^3.0.1",
"relike": "^1.0.3",
"lazy-cache": "^2.0.1",
"native-or-another": "^3.0.2",
"relike": "^1.1.1",
"sliced": "^1.0.1"
},
"devDependencies": {
"assertit": "^0.1.0",
"mz": "^2.0.0",
"pinkie": "^2.0.1",
"mz": "^2.4.0",
"pinkie": "^2.0.4",
"pre-commit": "*",
"semver": "^5.0.3",
"semver": "^5.1.0",
"simple-get": "^2.1.0"
},
"files": [
Expand Down Expand Up @@ -86,4 +86,4 @@
]
}
}
}
}
4 changes: 2 additions & 2 deletions test/callbacks.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ test('should handle buffer result from `fs.readFile` passed directly', function
}, done)
})

test('should returned promise can acces used Promise constructor', function (done) {
test('should returned promise can access used Promise constructor', function (done) {
letta.promise = require('pinkie')
var promise = letta(fs.readFile, 'package.json', 'utf8')

Expand All @@ -96,7 +96,7 @@ test('should returned promise can acces used Promise constructor', function (don

// Pinkie Constructor if node >= 0.11.12,
// otherwise native Promise constructor
test.strictEqual(typeof promise.Prome, 'function')
test.strictEqual(typeof promise.Promise, 'function')
done()
}, done)
})
2 changes: 1 addition & 1 deletion test/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var letta = require('../index')

test('should catch TypeError thrown if not function', function (done) {
letta(1234).catch(function (err) {
test.strictEqual(/expect a function/.test(err.message), true)
test.strictEqual(/expect `fn` be function/.test(err.message), true)
done()
})
})
Expand Down
7 changes: 7 additions & 0 deletions utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ require('sliced')

require = fn // eslint-disable-line no-undef, no-native-reassign

utils.normalizePromise = function normalizePromise (promise, Promize) {
promise.Promise = Promize
promise.___customPromise = promise.Promise.___customPromise
promise.___bluebirdPromise = promise.Promise.___bluebirdPromise
return promise
}

/**
* Expose `utils` modules
*/
Expand Down

0 comments on commit a9439d1

Please sign in to comment.