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

CalendarConversion: move to structured answer.

master
Matt Miller 2014-10-06 10:39:48 +02:00
parent bf509173e4
commit edb65e7f52
3 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/DDG/Goodie/CalendarConversion.pm
View File

@ -24,7 +24,6 @@ attribution github => ['http://github.com/mattlehning', 'mattlehning'],
triggers any => 'hijri', 'gregorian', 'jalali';
my $calendars = Load(scalar share('calendars.yml')->slurp);
my $datestring_regex = datestring_regex();
@ -70,10 +69,15 @@ handle query_lc => sub {
($od, $om, $oy) = ($t->jal_day, $t->jal_month, $t->jal_year);
($od, $om, $oy) = g2h($od, $om, $oy) if ($output_calendar eq "hijri");
}
my $input_date = format_date($d, $m, $y, $input_calendar);
my $input_date = format_date($d, $m, $y, $input_calendar);
my $converted_date = format_date($od, $om, $oy, $output_calendar);
return $input_date. ' is '. $converted_date, html => "<div class='zci--calendarconversion text--primary'>$input_date <span class='text--secondary'>is</span> $converted_date</div>";
return $input_date . ' is ' . $converted_date,
structured_answer => {
input => [$input_date],
operation => 'calendar conversion',
result => $converted_date
};
};
sub g2j {
@ -83,6 +87,4 @@ sub g2j {
return ($t->jal_day, $t->jal_month, $t->jal_year);
}
1;

6
share/goodie/calendar_conversion/calendar_conversion.css
View File

@ -1,6 +0,0 @@
.zci--answer .zci--calendarconversion {
font-size: 1.5em;
font-weight: 300;
padding-top: .25em;
padding-bottom: .25em;
}

42
t/CalendarConversion.t
View File

@ -10,18 +10,27 @@ zci is_cached => 0;
my @g22h = (
'22 August 2003 (Gregorian) is 23 Jumaada Thani 1424 (Hijri)',
html =>
"<div class='zci--calendarconversion text--primary'>22 August 2003 (Gregorian) <span class='text--secondary'>is</span> 23 Jumaada Thani 1424 (Hijri)</div>"
structured_answer => {
input => ['22 August 2003 (Gregorian)'],
operation => 'calendar conversion',
result => '23 Jumaada Thani 1424 (Hijri)'
},
);
my @h23g = (
'23 Jumaada Thani 1424 (Hijri) is 22 August 2003 (Gregorian)',
html =>
"<div class='zci--calendarconversion text--primary'>23 Jumaada Thani 1424 (Hijri) <span class='text--secondary'>is</span> 22 August 2003 (Gregorian)</div>"
structured_answer => {
input => ['23 Jumaada Thani 1424 (Hijri)'],
operation => 'calendar conversion',
result => '22 August 2003 (Gregorian)'
},
);
my @g22j = (
'22 August 2003 (Gregorian) is 31 Mordad 1382 (Jalali)',
html =>
"<div class='zci--calendarconversion text--primary'>22 August 2003 (Gregorian) <span class='text--secondary'>is</span> 31 Mordad 1382 (Jalali)</div>"
structured_answer => {
input => ['22 August 2003 (Gregorian)'],
operation => 'calendar conversion',
result => '31 Mordad 1382 (Jalali)'
},
);
ddg_goodie_test(
@ -34,18 +43,27 @@ ddg_goodie_test(
'22/8/2003 to jalali' => test_zci(@g22j),
'31/5/1382 jalali to gregorian' => test_zci(
'31 Mordad 1382 (Jalali) is 22 August 2003 (Gregorian)',
html =>
"<div class='zci--calendarconversion text--primary'>31 Mordad 1382 (Jalali) <span class='text--secondary'>is</span> 22 August 2003 (Gregorian)</div>",
structured_answer => {
input => ['31 Mordad 1382 (Jalali)'],
operation => 'calendar conversion',
result => '22 August 2003 (Gregorian)'
},
),
'31/5/1382 jalali to hijri' => test_zci(
'31 Mordad 1382 (Jalali) is 23 Jumaada Thani 1424 (Hijri)',
html =>
"<div class='zci--calendarconversion text--primary'>31 Mordad 1382 (Jalali) <span class='text--secondary'>is</span> 23 Jumaada Thani 1424 (Hijri)</div>"
structured_answer => {
input => ['31 Mordad 1382 (Jalali)'],
operation => 'calendar conversion',
result => '23 Jumaada Thani 1424 (Hijri)'
},
),
'23/6/1424 in hijri to jalali date' => test_zci(
'23 Jumaada Thani 1424 (Hijri) is 31 Mordad 1382 (Jalali)',
html =>
"<div class='zci--calendarconversion text--primary'>23 Jumaada Thani 1424 (Hijri) <span class='text--secondary'>is</span> 31 Mordad 1382 (Jalali)</div>"
structured_answer => {
input => ['23 Jumaada Thani 1424 (Hijri)'],
operation => 'calendar conversion',
result => '31 Mordad 1382 (Jalali)',
},
),
'August 22nd, 2003 to jalali' => test_zci(@g22j),
'22 Aug 2003 to Hijri' => test_zci(@g22h),