From 2ca1df6df1864cb9a6bcecff9991682f5ddeacd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=2EAzer=20Ko=C3=A7ulu?= Date: Sat, 26 Oct 2013 23:04:48 -0700 Subject: [PATCH] year as 12 x month --- lib/units.js | 7 ++----- test.js | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/units.js b/lib/units.js index 3e6aaf0..0f8382c 100644 --- a/lib/units.js +++ b/lib/units.js @@ -3,7 +3,8 @@ var seconds = x(milliseconds, 1000), hours = x(minutes, 60), days = x(hours, 24), weeks = x(days, 7), - months = x(days, 31); + months = x(days, 31), + years = x(months, 12); module.exports = { m: milliseconds, @@ -50,10 +51,6 @@ function milliseconds (n){ return n; } -function years (n) { - return n * days(365) + hours(6); -} - function x (fn, multiples){ return function(n){ return fn(n) * multiples; diff --git a/test.js b/test.js index 5f1abfd..822b9c7 100644 --- a/test.js +++ b/test.js @@ -16,8 +16,8 @@ it('converts time written in english to epoch', function(){ expect(time('3 weeks, 5 days, 6 hours')).to.equal(2268000000); expect(time('a month')).to.equal(2678400000); expect(time('5 months')).to.equal(13392000000); - expect(time('one year')).to.equal(31557600000); - expect(time('one year and five months')).to.equal(31557600000 + 13392000000); + expect(time('one year')).to.equal(32140800000); + expect(time('one year and five months')).to.equal(32140800000 + 13392000000); }); it('ignores unrecognized patterns', function(){