From b6e20ba6d4c768c987acdb6446a30fd0d8f4b13e Mon Sep 17 00:00:00 2001 From: Tom Bebbington Date: Mon, 18 Nov 2013 00:52:59 +0000 Subject: [PATCH] After/before can now use the pretty year --- lib/DDG/Goodie/LeapYear.pm | 4 +++- t/LeapYear.t | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/DDG/Goodie/LeapYear.pm b/lib/DDG/Goodie/LeapYear.pm index a0b85f91e..a60bfbee4 100644 --- a/lib/DDG/Goodie/LeapYear.pm +++ b/lib/DDG/Goodie/LeapYear.pm @@ -84,10 +84,12 @@ handle remainder => sub { if(defined($3) && $3 =~ /^(bce|bc)$/i) { $cyear = -$cyear; } + print "\nCyear: $cyear\n"; my $dir = 1; - if($1 eq "before") { + if($direction eq "before") { $dir = -1; } + print "\nDir: $dir\n"; my @years = search_leaps(5, $dir, 0, $cyear); @years = map(format_year, @years); my @pretty_years = join(', ', @years); diff --git a/t/LeapYear.t b/t/LeapYear.t index 74bc6838e..79b6a2cd5 100644 --- a/t/LeapYear.t +++ b/t/LeapYear.t @@ -14,8 +14,8 @@ ddg_goodie_test( 'was 2012 a leap year' => test_zci('2012 CE was a leap year'), 'will 3012 be a leap year' => test_zci('3012 CE will be a leap year'), 'was 1 bce a leap year' => test_zci('1 BCE was not a leap year'), - 'leap years after 2005' => test_zci('The 5 leap years after 2005 are 2008 CE, 2012 CE, 2016 CE, 2020 CE, 2024 CE, 2028 CE'), - 'leap years before 2 bc' => test_zci('The 5 leap years before 2 BCE are 0 BCE, 4 BCE, 8 BCE, 12 BCE, 16 BCE, 20 BCE'), + 'leap years after 2005' => test_zci('The 5 leap years after 2005 CE are 2008 CE, 2012 CE, 2016 CE, 2020 CE, 2024 CE, 2028 CE'), + 'leap years before 2 bc' => test_zci('The 5 leap years before 2 BCE are 4 BCE, 8 BCE, 12 BCE, 16 BCE, 20 BCE, 24 BCE'), ); done_testing;