Merge branch 'dev' of github.com:LibreCat/Catmandu into dev

Author: phochste

Changes

@@ -1,6 +1,7 @@
 Revision history for Catmandu
 
 {{$NEXT}}
+  - #403: Add support for BOM in CSV header ()
 
 1.2024  2025-01-16 16:23:49 CET
   - #402: Fix cli with Getopt::Long::Descriptive >= 0.116 

README-Docker.md

@@ -0,0 +1,35 @@
+# Catmandu Docker
+
+For a quick installation of Catmandu using [Docker](https://www.docker.com) use the following command:
+
+```
+docker run -it librecat/catmandu
+```
+
+Now you should be able to run Catmandu in the Docker terminal:
+
+```
+catmandu@d45e783d0bca:~$ catmandu help
+```
+
+To have access to your local files use one of the following commands:
+
+Windows:
+
+```
+docker run -v C:\Users\yourname:/home/catmandu/Home -it librecat/catmandu
+```
+
+OSX:
+
+```
+docker run -v /Users/yourname:/home/catmandu/Home -it librecat/catmandu
+```
+
+Linux:
+
+```
+docker run -v /home/yourname:/home/catmandu/Home -it librecat/catmandu
+```
+
+For more information about the Catmandu extension that are available in the Docker image check the [docker-catmandu](https://github.com/LibreCat/docker-catmandu) project.

lib/Catmandu.pm

@@ -362,6 +362,8 @@ Stefan Weil
 
 Tom Hukins
 
+Michal Josef Špaček C<<michal.josef.spacek at gmail.com>>
+
 =head1 QUESTIONS, ISSUES & BUG REPORTS
 
 For any questions on the use of our modules, or bug reports, or feature requests,

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;