From 9b128b8dbed2ff40b4cb4cc5666e101de90e1d17 Mon Sep 17 00:00:00 2001
From: Ben Moon <software@guiltydolphin.com>
Date: Mon, 28 Aug 2017 23:06:55 +0100
Subject: [PATCH] Shuffle: Update to use Parse::List Role (#3619)

* Update list parsing/formatting to use role

* Remove tests that duplicate role testing
---
 lib/DDG/Goodie/Shuffle.pm | 61 ++++++---------------------------------
 t/Shuffle.t               | 10 +------
 2 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/lib/DDG/Goodie/Shuffle.pm b/lib/DDG/Goodie/Shuffle.pm
index 6498f020e..69a55010f 100644
--- a/lib/DDG/Goodie/Shuffle.pm
+++ b/lib/DDG/Goodie/Shuffle.pm
@@ -6,9 +6,9 @@ use warnings;
 use utf8;
 use DDG::Goodie;
 
-use List::Util qw( shuffle pairs );
-use Data::Record;
-use Regexp::Common;
+use List::Util qw( shuffle );
+
+with qw(DDG::GoodieRole::Parse::List);
 
 zci answer_type => 'shuffle';
 
@@ -54,53 +54,10 @@ sub parse_range {
     return @result;
 }
 
-sub is_conj {
-    return shift =~ qr/^$RE{list}{and}$/i;
-}
-
-sub get_separator {
-    my $text = shift;
-    my $comma_sep = qr/\s*,\s*/io;
-    return qr/(?:\s*,?\s*and\s*|$comma_sep)/io if is_conj($text);
-    return $comma_sep;
-}
-
-sub remove_parens {
-    my $text = shift;
-    foreach (pairs @parens) {
-        my ($opening, $closing) = map { quotemeta $_ } @$_;
-        next unless $text =~ /^$RE{balanced}{-parens=>"$opening$closing"}$/;
-        $text =~ s/^$opening(.+?)$closing$/$1/;
-        return $text;
-    }
-    return $text if is_conj($text);
-    return;
-}
-
-sub trim_whitespace {
-    my $to_trim = shift;
-    $to_trim =~ s/^\s+//ro =~ s/\s+$//ro;
-}
-
-sub parse_list {
+sub shuffle_parse_list {
     my $list_text = shift;
-    $list_text = remove_parens($list_text)
-        // return parse_range($list_text);
-    if (my @items = parse_range($list_text)) {
-        return @items;
-    }
-    my $sep = get_separator($list_text);
-    my $record = Data::Record->new({
-        split => $sep,
-        unless => $RE{quoted},
-    });
-    my @items = map { trim_whitespace $_ } $record->records($list_text);
-    return @items;
-}
-
-sub display_list {
-    my @items = @_;
-    return "[@{[join ', ', @items]}]";
+    my @parse = @{parse_list($list_text)};
+    @parse == 1 ? parse_range($parse[0]) : @parse;
 }
 
 handle remainder => sub {
@@ -108,12 +65,12 @@ handle remainder => sub {
     my $remainder = $_;
     return if $remainder eq '';
 
-    my @items = parse_list($remainder) or return;
+    my @items = shuffle_parse_list($remainder) or return;
     return unless $#items;
     srand;
     my @shuffled = shuffle @items;
-    my $shuffled_display = display_list @shuffled;
-    my $original_display = display_list @items;
+    my $shuffled_display = format_list(\@shuffled);
+    my $original_display = format_list(\@items);
     return "$original_display",
         structured_answer => {
 
diff --git a/t/Shuffle.t b/t/Shuffle.t
index c6b5a65fe..645abca09 100644
--- a/t/Shuffle.t
+++ b/t/Shuffle.t
@@ -62,16 +62,8 @@ ddg_goodie_test(
     # Example queries
     'shuffle [1, 2, 3, 4]'   => build_test([1, 2, 3, 4]),
     'a..h in a random order' => build_test(['a'..'h']),
-    # Different types of brackets
-    'shuffle [1, 2]' => build_test([1, 2]),
-    'shuffle (1, 2)' => build_test([1, 2]),
-    'shuffle {1, 2}' => build_test([1, 2]),
-    # In words
-    'shuffle 1 and 2 and 3'  => build_test([1, 2, 3]),
-    'shuffle 1, 2, and 3'    => build_test([1, 2, 3]),
-    'shuffle 1 and 2, and 3' => build_test([1, 2, 3]),
     # Ranges
-    'shuffle (1..3)'   => build_test([1, 2, 3]),
+    'shuffle [1..3]'   => build_test([1, 2, 3]),
     'shuffle a..c'     => build_test(['a', 'b', 'c']),
     'shuffle 1..30'    => build_test([1..30]), # Max items with range
     'shuffle 1..31'    => undef, # Too many range items