Merge pull request #48 from jorol/dev

Upgrading Catmandu using new group binds for pica_each
gbv · Jun 30, 2017 · e72a5e5 · e72a5e5
2 parents 41f785b + d9f8d64
commit e72a5e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/cpanfile b/cpanfile
@@ -5,7 +5,7 @@ on 'test', sub {
   requires 'IO::File' , '1.14';
 };
 
-requires 'Catmandu', '0.9504';
+requires 'Catmandu', '1.0601';
 requires 'PICA::Data', '0.30';
 requires 'PICA::Parser', '0.585';
 requires 'PICA::Path', '0.31';

diff --git a/lib/Catmandu/Fix/Bind/pica_each.pm b/lib/Catmandu/Fix/Bind/pica_each.pm
@@ -5,7 +5,7 @@ our $VERSION = '0.19';
 use Moo;
 use Catmandu::Util;
 
-with 'Catmandu::Fix::Bind';
+with 'Catmandu::Fix::Bind', 'Catmandu::Fix::Bind::Group';
 
 has done => (is => 'ro');
 
@@ -16,7 +16,7 @@ sub unit {
 }
 
 sub bind {
-    my ($self,$mvar,$func,$name,$fixer) = @_;
+    my ($self,$mvar,$code) = @_;
 
     return $mvar if $self->done;
 
@@ -28,7 +28,7 @@ sub bind {
 
         $mvar->{record} = [$row];
 
-        my $fixed = $fixer->fix($mvar);
+        my $fixed = $code->($mvar);
 
         push @new , @{$fixed->{record}} if defined($fixed) && exists $fixed->{record};
     }

diff --git a/t/07-pica-each.t b/t/07-pica-each.t
@@ -22,18 +22,13 @@ my $fixer = Catmandu::Fix->new(fixes => [q|
 		if pica_match("010@a",'ger')
 			add_field(is_ger,true)
 		end
-		if pica_match("045.",'.*')
-			reject()
-		end
 	end
-	pica_map("045.",test)
 |]);
 
 my $importer = Catmandu::Importer::PICA->new( file => './t/files/picaplus.dat', type => "PLUS" );
 my $record = $fixer->fix($importer->first);
 
 ok exists $record->{record}, 'created a PICA record';
 is $record->{is_ger}, 'true', 'created is_ger tag';
-ok ! exists $record->{test} , 'fields 045. deleted';
 
 done_testing;