Merge branch 'michal-josef-spacek-process_csv_bom' into dev

Author: nics

lib/Catmandu/Importer/CSV.pm

@@ -58,11 +58,12 @@ sub generator {
         state $csv  = do {
             if ($self->header) {
                 if ($self->fields) {
-                    $self->csv->getline($fh);
+                    $self->csv->header($fh, { 'sep_set' => [$self->sep_char] });
                     $line++;
                 }
                 else {
-                    $self->_set_fields($self->csv->getline($fh));
+                    my @hdr = $self->csv->header($fh, { 'munge_column_names' => 'none', 'sep_set' => [$self->sep_char] });
+                    $self->_set_fields(\@hdr);
                     $line++;
                 }
             }

t/Catmandu-Importer-CSV.t

@@ -26,7 +26,19 @@ my $importer = $pkg->new(file => \$csv);
 
 isa_ok $importer, $pkg;
 
-is_deeply $importer->to_array, $data;
+is_deeply $importer->to_array, $data, 'CSV with header.';
+
+$csv = <<EOF;
+\xEF\xBB\xBF"name","age"
+"Patrick","39"
+"Nicolas","34"
+EOF
+
+$importer = $pkg->new(file => \$csv);
+
+isa_ok $importer, $pkg;
+
+is_deeply $importer->to_array, $data, 'CSV with header, BOM.';
 
 $data = [{0 => 'Patrick', 1 => '39'}, {0 => 'Nicolas', 1 => '34'},];
 
@@ -37,7 +49,7 @@ EOF
 
 $importer = $pkg->new(file => \$csv, header => 0);
 
-is_deeply $importer->to_array, $data;
+is_deeply $importer->to_array, $data, 'CSV without header.';
 
 $data = [{name => 'Nicolas', age => '34'},];
 
@@ -48,7 +60,16 @@ EOF
 
 $importer = $pkg->new(file => \$csv, sep_char => '\t');
 
-is_deeply $importer->to_array, $data;
+is_deeply $importer->to_array, $data, 'CSV with header, separator is tab.';
+
+$csv = <<EOF;
+\xEF\xBB\xBF"name"	"age"
+"Nicolas"	"34"
+EOF
+
+$importer = $pkg->new(file => \$csv, sep_char => '\t');
+
+is_deeply $importer->to_array, $data, 'CSV with header, separator is tab, BOM.';
 
 done_testing;