Merge branch 'dev'

Author: karnthis

changelog.md

@@ -10,11 +10,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- #### Removed -->
 
 ## Major Releases:
-### v1.0.0 - 2019 03 09
+### v1.0.0 - 2016 09 23
 - Initial Release
 
 ## Minor Releases:
-### [v0.1.5] - 2019 03 11
+### [v0.1.7] - 2019 06 08
+#### Changed
+- Updated existing supported methods to promises
+
+### [v0.1.6] - 2019 06 08
+#### Added
+- `setRange()`
+- `flexRange()`
+
+#### Changed
+- Deprecated: 
+	- `makeRandom.ceil()`
+	- `makeRandom.floor()`
+
+### [v0.1.5] - 2019 05 29
 #### Added
 - changelog.md
 #### Changed
@@ -23,6 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- LINKS -->
 <!-- RELEASES -->
-[Unreleased]: https://github.com/karnthis/make-random/compare/v0.1.5...dev
+[Unreleased]: https://github.com/karnthis/make-random/compare/v0.1.7...dev
+[v0.1.6]: https://github.com/karnthis/make-random/compare/v0.1.6...v0.1.7
+[v0.1.6]: https://github.com/karnthis/make-random/compare/v0.1.5...v0.1.6
 [v0.1.5]: https://github.com/karnthis/make-random/compare/v0.1.4...v0.1.5
 <!-- ISSUES -->

libs/index.js

@@ -3,16 +3,22 @@
 const Purify = require('purify-int')
 const Crypto = require('crypto')
 
-const debug = true
-
 // INTERNAL
 function foundation(base) {
 	const trueBase = Math.abs(base)
 	const byteCount = makeByteCount(trueBase)
-	// if (debug) console.log(byteCount)
-	const hexString = Crypto.randomBytes(byteCount).toString('hex')
-	// if (debug) console.log(parseInt(hexString, 16))
-	return parseInt(hexString, 16) % trueBase
+	return promiseCryptoRBytes(byteCount)
+	.then(buf => buf.toString('hex'))
+	.then(hex => parseInt(hex, 16) % trueBase)
+}
+
+function promiseCryptoRBytes(byteCount = 1) {
+	return new Promise((resolve, reject) => {
+		Crypto.randomBytes(byteCount, (err, buf) => {
+			if (err) throw err
+			resolve(buf)
+		})
+	})
 }
 
 function makeByteCount(max) {
@@ -32,16 +38,15 @@ function offsetNum(v, invert = false) {
 	} else {
 		return (v < 0) ? ++v : --v
 	}
-	
+
 }
 
 // EXTERNAL
 function flexRange(v = 1) {
 	v = (v > 0) ? ++v : --v
 	const pureV = Purify.asInt(v, 1)
-	const result = foundation(pureV)
-	console.log(result)
-	return (pureV < 0 && result !== 0 ) ? result * -1 : result
+	return foundation(pureV)
+	.then(res => (pureV < 0 && res !== 0) ? res * -1 : res)
 }
 
 function setRange(v1 = -100, v2 = 100) {
@@ -55,11 +60,11 @@ function setRange(v1 = -100, v2 = 100) {
 		high = v1
 		low = v2
 	} else {
-		return flexRange(offsetNum(v2,true))
+		return flexRange(offsetNum(v2, true))
 	}
 	const baseValue = high - low
-	const result = foundation(baseValue)
-	return (baseValue < 0) ? (result * -1) + low : result + low
+	return foundation(baseValue)
+	.then(res => (baseValue < 0) ? (res * -1) + low : res + low)
 }
 
 module.exports = { flexRange, setRange }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-random",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Make a random number, powered by Crypto",
   "main": "index.js",
   "scripts": {

readme.md

@@ -9,7 +9,7 @@
 [![npm: version](https://badgen.net/npm/v/make-random)](https://www.npmjs.com/package/make-random)
 [![npm: downloads](https://badgen.net/npm/dt/make-random)](https://www.npmjs.com/package/make-random)
 
-## For Make Random (Legacy) [Please Click Here](https://github.com/karnthis/make-random-legacy)
+## For Make Random (Legacy) [Please Click Here](https://www.npmjs.com/package/make-random-legacy)
 
 ## About Make Random
 

test/main/index.js

@@ -7,45 +7,58 @@ describe('flexRange()', () => {
 	it(`should be a function`, ()=> {
 		expect(flexRange).to.be.a('function');
 	});
-	it(`should return a positive random number`, () => {
-		expect(flexRange(10)).to.be.a('number').and.be.at.least(0);
-		expect(flexRange('10')).to.be.an('number').and.be.at.least(0);
+	it(`should return a positive random number`, async () => {
+		const result1 = await flexRange(10)
+		expect(result1).to.be.a('number').and.be.at.least(0);
+		const result2 = await flexRange('10')
+		expect(result2).to.be.an('number').and.be.at.least(0);
 	});
-	it(`should return a negative random number`, () => {
-		expect(flexRange(-10)).to.be.a('number').and.to.be.at.most(0);
-		expect(flexRange('-10')).to.be.an('number').and.to.be.at.most(0);
+	it(`should return a negative random number`, async () => {
+		const result1 = await flexRange(-10)
+		expect(result1).to.be.a('number').and.to.be.at.most(0);
+		const result2 = await flexRange('-10')
+		expect(result2).to.be.an('number').and.to.be.at.most(0);
 	});
-	it(`should return randomly 0 or 1 if passed no arguments`, () => {
-		expect(flexRange()).to.be.within(0,1);
+	it(`should return randomly 0 or 1 if passed no arguments`, async () => {
+		const result = await flexRange()
+		expect(result).to.be.within(0,1);
 	});
 });
 
 describe('setRange()', () => {
 	it(`should be a function`, ()=> {
 		expect(setRange).to.be.a('function');
 	});
-	it(`should return randomly -100 to 100 if passed no arguments`, () => {
-		expect(setRange()).to.be.an('number').to.be.within(-100,100);
+	it(`should return randomly -100 to 100 if passed no arguments`, async () => {
+		const result = await setRange()
+		expect(result).to.be.an('number').to.be.within(-100,100);
 	});
-	it(`should return randomly 10 to 50 if passed those values`, () => {
-		expect(setRange(10,50)).to.be.an('number').to.be.within(10,50);
+	it(`should return randomly 10 to 50 if passed those values`, async () => {
+		const result = await setRange(10,50)
+		expect(result).to.be.an('number').to.be.within(10,50);
 	});
-	it(`should handle if order is flipped`, () => {
-		expect(setRange(50,10)).to.be.an('number').to.be.within(10,50);
+	it(`should handle if order is flipped`, async () => {
+		const result = await setRange(50,10)
+		expect(result).to.be.an('number').to.be.within(10,50);
 	});
-	it(`should handle mixed positive/negative numbers (-10 to 10)`, () => {
-		expect(setRange(-10,10)).to.be.an('number').to.be.within(-10,10);
+	it(`should handle mixed positive/negative numbers (-10 to 10)`, async () => {
+		const result = await setRange(-10,10)
+		expect(result).to.be.an('number').to.be.within(-10,10);
 	});
-	it(`should handle negative numbers (-10 to -50)`, () => {
-		expect(setRange(-10,-50)).to.be.an('number').to.be.within(-50,-10);
+	it(`should handle negative numbers (-10 to -50)`, async () => {
+		const result = await setRange(-10,-50)
+		expect(result).to.be.an('number').to.be.within(-50,-10);
 	});
-	it(`should handle numbers as strings ('10' to '-50')`, () => {
-		expect(setRange('10','-50')).to.be.an('number').to.be.within(-50,10);
+	it(`should handle numbers as strings ('10' to '-50')`, async () => {
+		const result = await setRange('10','-50')
+		expect(result).to.be.an('number').to.be.within(-50,10);
 	});
-	it(`should handle mixed numbers as strings ('10' to -50)`, () => {
-		expect(setRange('10',-50)).to.be.an('number').to.be.within(-50,10);
+	it(`should handle mixed numbers as strings ('10' to -50)`, async () => {
+		const result = await setRange('10',-50)
+		expect(result).to.be.an('number').to.be.within(-50,10);
 	});
-	it(`should default to flexRange() behavior if input is the same`, () => {
-		expect(setRange(10,10)).to.be.an('number').and.be.greaterThan(-1);
+	it(`should default to flexRange() behavior if input is the same`, async () => {
+		const result = await setRange(10,10)
+		expect(result).to.be.an('number').and.be.greaterThan(-1);
 	});
 });