tick-tock
Advanced tools
Comparing version 0.0.8 to 0.0.9
47
index.js
@@ -220,48 +220,3 @@ 'use strict'; | ||
*/ | ||
Tick.parse = function time(ms) { | ||
if ('string' !== typeof ms || +ms) return +ms; | ||
var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(ms) | ||
, second = 1000 | ||
, minute = second * 60 | ||
, hour = minute * 60 | ||
, day = hour * 24 | ||
, amount; | ||
if (!match) return 0; | ||
amount = parseFloat(match[1]); | ||
switch (match[2].toLowerCase()) { | ||
case 'days': | ||
case 'day': | ||
case 'd': | ||
return amount * day; | ||
case 'hours': | ||
case 'hour': | ||
case 'hrs': | ||
case 'hr': | ||
case 'h': | ||
return amount * hour; | ||
case 'minutes': | ||
case 'minute': | ||
case 'mins': | ||
case 'min': | ||
case 'm': | ||
return amount * minute; | ||
case 'seconds': | ||
case 'second': | ||
case 'secs': | ||
case 'sec': | ||
case 's': | ||
return amount * second; | ||
default: | ||
return amount; | ||
} | ||
}; | ||
Tick.parse = require('millisecond'); | ||
// | ||
@@ -268,0 +223,0 @@ // Expose the timer factory. |
{ | ||
"name": "tick-tock", | ||
"version": "0.0.8", | ||
"version": "0.0.9", | ||
"description": "Timer management, never forget to clear timers again", | ||
@@ -38,3 +38,6 @@ "main": "index.js", | ||
"pre-commit": "0.0.x" | ||
}, | ||
"dependencies": { | ||
"millisecond": "0.0.x" | ||
} | ||
} |
64
test.js
@@ -35,66 +35,2 @@ /* istanbul ignore next */ | ||
describe('.parse', function () { | ||
it('should preserve ms', function () { | ||
assume(Tick.parse('100')).to.equal(100); | ||
}); | ||
it('can parse numbers', function () { | ||
assume(Tick.parse(100)).to.equal(100); | ||
}); | ||
it('should convert from m to ms', function () { | ||
assume(Tick.parse('1m')).to.equal(60000); | ||
assume(Tick.parse('1min')).to.equal(60000); | ||
assume(Tick.parse('1mins')).to.equal(60000); | ||
assume(Tick.parse('1minute')).to.equal(60000); | ||
assume(Tick.parse('1minutes')).to.equal(60000); | ||
}); | ||
it('should convert from h to ms', function () { | ||
assume(Tick.parse('1h')).to.equal(3600000); | ||
assume(Tick.parse('1hr')).to.equal(3600000); | ||
assume(Tick.parse('1hrs')).to.equal(3600000); | ||
assume(Tick.parse('1hour')).to.equal(3600000); | ||
assume(Tick.parse('1hours')).to.equal(3600000); | ||
}); | ||
it('should convert d to ms', function () { | ||
assume(Tick.parse('2d')).to.equal(172800000); | ||
assume(Tick.parse('2day')).to.equal(172800000); | ||
assume(Tick.parse('2days')).to.equal(172800000); | ||
}); | ||
it('should convert s to ms', function () { | ||
assume(Tick.parse('1s')).to.equal(1000); | ||
assume(Tick.parse('1sec')).to.equal(1000); | ||
assume(Tick.parse('1secs')).to.equal(1000); | ||
assume(Tick.parse('1second')).to.equal(1000); | ||
assume(Tick.parse('1seconds')).to.equal(1000); | ||
}); | ||
it('should convert ms to ms', function () { | ||
assume(Tick.parse('100ms')).to.equal(100); | ||
}); | ||
it('should work with decimals', function () { | ||
assume(Tick.parse('1.5h')).to.equal(5400000); | ||
}); | ||
it('should work with multiple spaces', function () { | ||
assume(Tick.parse('1 s')).to.equal(1000); | ||
}); | ||
it('should return 0 if invalid', function () { | ||
assume(Tick.parse('Hello mom')).to.equal(0); | ||
}); | ||
it('should be case-insensitive', function () { | ||
assume(Tick.parse('1.5H')).to.equal(5400000); | ||
}); | ||
it('should work with numbers starting with .', function () { | ||
assume(Tick.parse('.5ms')).to.equal(0.5); | ||
}); | ||
}); | ||
describe('#setInterval', function () { | ||
@@ -101,0 +37,0 @@ it('adds a setInterval', function (next) { |
17813
1
428
+ Addedmillisecond@0.0.x
+ Addedmillisecond@0.0.1(transitive)