Upgrading Catmandu using new group binds for marc_each

LibreCat · Jun 22, 2017 · 18e6ade · 18e6ade
1 parent 4f32eea
commit 18e6ade
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Build.PL b/Build.PL
@@ -24,7 +24,7 @@ my %module_build_args = (
   "recursive_test_files" => 1,
   "requires" => {
     "Carp" => 0,
-    "Catmandu" => "1.0201",
+    "Catmandu" => "1.0601",
     "JSON::XS" => "2.3",
     "List::Util" => 0,
     "MARC::File::MARCMaker" => "0.05",

diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 Revision history for Catmandu-MARC
 
 {{$NEXT}}
+  - Upgrading to Catmandu 1.06X
+  - Using the Catmandu::Fix::Bind::Group style for marc_each bind
 
 1.13  2017-06-15 09:19:13 CEST
   - Fixing join subfields per field correctly in marc_spec

diff --git a/cpanfile b/cpanfile
@@ -11,7 +11,7 @@ on 'test', sub {
 };
 
 requires 'Carp', '0';
-requires 'Catmandu', '>=1.0201';
+requires 'Catmandu', '>=1.0601';
 requires 'JSON::XS', '2.3';
 requires 'YAML::XS', '0.34';
 requires 'List::Util', '0';

diff --git a/lib/Catmandu/Fix/Bind/marc_each.pm b/lib/Catmandu/Fix/Bind/marc_each.pm
@@ -5,20 +5,20 @@ use Catmandu::Util;
 
 our $VERSION = '1.13';
 
-with 'Catmandu::Fix::Bind';
+with 'Catmandu::Fix::Bind', 'Catmandu::Fix::Bind::Group';
 
 has done => (is => 'ro');
 
 sub unit {
     my ($self,$data) = @_;
 
     $self->{done} = 0;
-    
+
     $data;
 }
 
 sub bind {
-    my ($self,$mvar,$func,$name,$fixer) = @_;
+    my ($self,$mvar,$code) = @_;
 
     return $mvar if $self->done;
 
@@ -30,7 +30,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} && defined $fixed->{record};
     }
@@ -66,7 +66,7 @@ Catmandu::Fix::Bind::marc_each - a binder that loops over MARC fields
 
 =head1 DESCRIPTION
 
-The marc_each binder will iterate over each individual MARC field and execute the fixes only 
+The marc_each binder will iterate over each individual MARC field and execute the fixes only
 in context over each individual field.
 
 If a MARC record contains: