Rolled back to previous design without structured_answer.

master
stefolof 2015-01-22 16:58:00 +00:00
parent 15ee104932
commit 010a00443c
2 changed files with 9 additions and 60 deletions

View File

@ -66,22 +66,8 @@ Quarter Note: " . $straight_values[2] . ", Triplet: " . $triplet_values[2] . ",
$html_content = $html_content .
"</table></div></div></div>";
return $plain_text_content,
structured_answer => {
input => [html_enc($bpm)],
operation => 'BPMToMs',
result => $html_content,
};
#return html => $html_content,
# answer => "$bpm bpm in milliseconds
#Whole Note: " . $straight_values[0] . ", Triplet: " . $triplet_values[0] . ", Dotted: " . $dotted_values[0] . "
#Half Note: " . $straight_values[1] . ", Triplet: " . $triplet_values[1] . ", Dotted: " . $dotted_values[1] . "
#Quarter Note: " . $straight_values[2] . ", Triplet: " . $triplet_values[2] . ", Dotted: " . $dotted_values[2] . "
#1/8 Note: " . $straight_values[3] . ", Triplet: " . $triplet_values[3] . ", Dotted: " . $dotted_values[3] . "
#1/16 Note: " . $straight_values[4] . ", Triplet: " . $triplet_values[4] . ", Dotted: " . $dotted_values[4] . "
#1/32 Note: " . $straight_values[5] . ", Triplet: " . $triplet_values[5] . ", Dotted: " . $dotted_values[5];
return html => $html_content,
answer => $plain_text_content;
};
1;

View File

@ -18,11 +18,7 @@ Quarter Note: 500, Triplet: 333, Dotted: 750
1/8 Note: 250, Triplet: 167, Dotted: 375
1/16 Note: 125, Triplet: 83, Dotted: 188
1/32 Note: 63, Triplet: 42, Dotted: 94',
structured_answer => {
input => ['120'],
operation => 'BPMToMs',
result => qr#<td class="record__cell__key record_keyspacing">Whole Note</td><td class="record__cell__value numbers">2000</td>#,
},
html => qr#<td class="record__cell__key record_keyspacing">Whole Note</td><td class="record__cell__value numbers">2000</td>#
)) } ( '120 bpm to ms', '120 beats per minute to note lengths', '120 bpm timings' )),
(map { ("$_" => test_zci(
'61 bpm in milliseconds
@ -32,44 +28,11 @@ Quarter Note: 984, Triplet: 656, Dotted: 1475
1/8 Note: 492, Triplet: 328, Dotted: 738
1/16 Note: 246, Triplet: 164, Dotted: 369
1/32 Note: 123, Triplet: 82, Dotted: 184',
structured_answer => {
input => ['61'],
operation => 'BPMToMs',
result => qr#<td class="record__cell__key record_keyspacing">Whole Note</td><td class="record__cell__value numbers">3934</td>#,
},
html => qr#<td class="record__cell__key record_keyspacing">Whole Note</td><td class="record__cell__value numbers">3934</td>#
)) } ( '61 beats per minute to ms', '61 bpm', '61 bpm to note values' )),
'-1 bpm to ms' => undef,
'some bpm to ms' => undef,
'bpm' => undef,
);
# '<div class="bpmto_ms"><h3 class="zci__header">120 bpm in milliseconds</h3><div class="zci__content"><div class="record"><table class="maintable"><tr class="record"><td class="record__cell__key record_keyspacing">Whole Note</td><td class="record__cell__value numbers">2000</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">1333</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">3000</td></tr><tr class="record"><td class="record__cell__key record_keyspacing">Half Note</td><td class="record__cell__value numbers">1000</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">667</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">1500</td></tr><tr class="record"><td class="record__cell__key record_keyspacing">Quarter Note</td><td class="record__cell__value numbers">500</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">333</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">750</td></tr><tr class="record"><td class="record__cell__key record_keyspacing">1/8 Note</td><td class="record__cell__value numbers">250</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">167</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">375</td></tr><tr class="record"><td class="record__cell__key record_keyspacing">1/16 Note</td><td class="record__cell__value numbers">125</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">83</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">188</td></tr><tr class="record"><td class="record__cell__key record_keyspacing">1/32 Note</td><td class="record__cell__value numbers">63</td><td /><td /><td class="record__cell__key record_keyspacing">Triplet</td><td class="record__cell__value numbers">42</td><td /><td /><td class="record__cell__key record_keyspacing">Dotted</td><td class="record__cell__value numbers">94</td></tr></table></div></div></div>'
#ddg_goodie_test(
# [qw( DDG::Goodie::BPMToMs)],
# (map { ("$_" => test_zci(
#'120 bpm in milliseconds
#Whole Note: 2000, Triplet: 1333, Dotted: 3000
#Half Note: 1000, Triplet: 667, Dotted: 1500
#Quarter Note: 500, Triplet: 333, Dotted: 750
#1/8 Note: 250, Triplet: 167, Dotted: 375
#1/16 Note: 125, Triplet: 83, Dotted: 188
#1/32 Note: 63, Triplet: 42, Dotted: 94',
# html => qr#.*#
#)) } ( '120 bpm to ms', '120 beats per minute to note lengths', '120 bpm timings' )),
# (map { ("$_" => test_zci(
#'61 bpm in milliseconds
#Whole Note: 3934, Triplet: 2623, Dotted: 5902
#Half Note: 1967, Triplet: 1311, Dotted: 2951
#Quarter Note: 984, Triplet: 656, Dotted: 1475
#1/8 Note: 492, Triplet: 328, Dotted: 738
#1/16 Note: 246, Triplet: 164, Dotted: 369
#1/32 Note: 123, Triplet: 82, Dotted: 184',
# html => qr#.*#
#)) } ( '61 beats per minute to ms', '61 bpm', '61 bpm to note values' )),
# '-1 bpm to ms' => undef,
# 'some bpm to ms' => undef,
# 'bpm' => undef,
#);
done_testing;