duckduckgo/zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #629 from mwmiller/date_math

Browse Source 
DateMath: properly recognize and handle weeks.
This commit is contained in:
Rob Emery 2014-09-10 17:32:40 +01:00
commit 18b89d8870
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DDG/Goodie/DateMath.pm
View File

@ -47,7 +47,7 @@ handle query_lc => sub {
$years = $number if $unit eq "year"; $years = $number if $unit eq "year";
$months = $number if $unit eq "month"; $months = $number if $unit eq "month";
$days = $number if $unit eq "day"; $days = $number if $unit eq "day";
$days = 7*$number if $unit eq "weeks"; $days = 7*$number if $unit eq "week";
my $dur = DateTime::Duration->new( my $dur = DateTime::Duration->new(
years => $years, years => $years,

3
t/DateMath.t
View File

@ -18,13 +18,14 @@ ddg_goodie_test(
'January 1st 2012 plus 32 days' => test_zci( '01 Jan 2012 plus 32 days is 02 Feb 2012' ), 'January 1st 2012 plus 32 days' => test_zci( '01 Jan 2012 plus 32 days is 02 Feb 2012' ),
'January 1st plus 32 days' => test_zci( qr/01 Jan [0-9]{4} plus 32 days is 02 Feb [0-9]{4}/ ), 'January 1st plus 32 days' => test_zci( qr/01 Jan [0-9]{4} plus 32 days is 02 Feb [0-9]{4}/ ),
'1/1/2012 plus 32 days' => test_zci( '01 Jan 2012 plus 32 days is 02 Feb 2012' ), '1/1/2012 plus 32 days' => test_zci( '01 Jan 2012 plus 32 days is 02 Feb 2012' ),
'1/1/2012 plus 5 weeks' => test_zci( '01 Jan 2012 plus 5 weeks is 01 Jan 2012' ), '1/1/2012 plus 5 weeks' => test_zci( '01 Jan 2012 plus 5 weeks is 05 Feb 2012' ),
'1/1/2012 plus 5 months' => test_zci( '01 Jan 2012 plus 5 months is 01 Jun 2012' ), '1/1/2012 plus 5 months' => test_zci( '01 Jan 2012 plus 5 months is 01 Jun 2012' ),
'1/1/2012 PLUS 5 years' => test_zci( '01 Jan 2012 plus 5 years is 01 Jan 2017' ), '1/1/2012 PLUS 5 years' => test_zci( '01 Jan 2012 plus 5 years is 01 Jan 2017' ),
'1/1/2012 plus 1 day' => test_zci( '01 Jan 2012 plus 1 day is 02 Jan 2012' ), '1/1/2012 plus 1 day' => test_zci( '01 Jan 2012 plus 1 day is 02 Jan 2012' ),
'1/1/2012 plus 1 days' => test_zci( '01 Jan 2012 plus 1 day is 02 Jan 2012' ), '1/1/2012 plus 1 days' => test_zci( '01 Jan 2012 plus 1 day is 02 Jan 2012' ),
'01/01/2012 + 1 day' => test_zci( '01 Jan 2012 + 1 day is 02 Jan 2012' ), '01/01/2012 + 1 day' => test_zci( '01 Jan 2012 + 1 day is 02 Jan 2012' ),
'1/1/2012 minus ten days' => test_zci( '01 Jan 2012 minus 10 days is 22 Dec 2011' ), '1/1/2012 minus ten days' => test_zci( '01 Jan 2012 minus 10 days is 22 Dec 2011' ),
'1 jan 2014 plus 2 weeks' => test_zci( '01 Jan 2014 plus 2 weeks is 15 Jan 2014' ),
); );
done_testing; done_testing;