Sisimai::Mail->hook is not needed #399

sisimai · Jun 12, 2020 · b6f3509 · b6f3509
1 parent f43c697
commit b6f3509
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 63 deletions.
diff --git a/lib/Sisimai.pm b/lib/Sisimai.pm
@@ -42,7 +42,16 @@ sub make {
             $args = { 'data' => $mesg, 'delivered' => $argv1->{'delivered'}, 'origin' => $path };
             $sisi = Sisimai::Data->make(%$args);
         }
-        $mail->hook($c___, \$r, $sisi) if $c___;
+
+        if( $c___ ) {
+            # Run the callback function specified with "c___" parameter of Sisimai->make
+            # after reading each email file in Maildir/ every time
+            eval {
+                $args = { 'kind' => $mail->kind, 'mail' => \$r, 'path' => $mail->data->path, 'sisi' => $sisi };
+                $c___->($args);
+            };
+            warn sprintf(" ***warning: Something is wrong in hook method 'c___': %s", $@) if $@;
+        }
         push @$list, @$sisi if scalar @$sisi;
     }
     return undef unless scalar @$list;

diff --git a/lib/Sisimai/Mail.pm b/lib/Sisimai/Mail.pm
@@ -83,36 +83,6 @@ sub read {
     return $self->{'data'}->read;
 }
 
-sub hook {
-    # Callback method for each email file
-    # @param    [Code]   hook   Hook method
-    # @param    [String] data   Contents of the email
-    # @apram    [Array]  sisi   List of Sisimai::Data object (parsed results)
-    # @return   [Integer]       1 = Successfully executed the callback method
-    #                           0 = Something was wrong at the callback method
-    # @since v4.25.8
-    my $self = shift;
-    my $hook = shift || return undef;
-    my $data = shift || return undef;
-    my $sisi = shift || return undef;
-
-    return undef unless length $$data;
-    eval {
-        # Run the callback function specified with "c___" parameter of Sisimai->make
-        # after reading each email file in Maildir/ every time
-        my $args = {
-            'kind' => $self->{'kind'},
-            'mail' => $data,
-            'path' => $self->{'data'}->{'path'},
-            'sisi' => $sisi,
-        };
-        $hook->($args);
-    };
-    warn sprintf(" ***warning: Something is wrong in hook method 'c___': %s", $@) if $@;
-    return 0 if $@;
-    return 1;
-}
-
 sub close {
     # Close the handle
     # @return   [Integer] 0: Mail handle is not defined
@@ -211,37 +181,6 @@ Sisimai::Mail::Mbox->read or Sisimai::Mail::Maildir->read method.
 
 =head2 C<B<close()>>
 
-=head2 C<B<hook()>>
-
-C<hook()> is a method of the callback feature for each email file, is called
-from inside of the loop in C<Sisimai->make()> method when a hook method was
-specified at C<c___> parameter as an argument.
-
-    my $e = sub {
-        my $argv = shift;
-        my $kind = $argv->{'kind'}; # Sisimai::Mail->kind
-        my $mail = $argv->{'data'}; # Contents of each email file
-        my $path = $argv->{'path'}; # Sisimai::Mail->path
-        my $sisi = $argv->{'sisi'}; # List of Sisimai::Data objects
-
-        my $time = localtime(Time::Piece->new);
-        for my $p ( @$sisi ) {
-            # Add "parsedat" into the parsed results
-            $p->{'parsedat'} = sprintf("%s %s", $time->ymd('-'), $time->hms());
-        }
-
-        if( $kind eq 'maildir' ) {
-            # Remove the email file in Maildir/ if it parsed successfully
-            unlink $path if scalar @$sisi;
-        }
-        return 1;   # Not needed, Sisimai::Mail->hook does not receive the return value
-    };
-    my $v = Sisimai->make('path/to/maildir', 'c___' => $e);
-    print $v->[0]->{'parsedat'};    # 2020/02/22 22:22:22
-
-
-=head2 C<B<close()>>
-
 C<close()> Close the handle of the mailbox or the Maildir/.
 
     my $o = $mailbox->close;

diff --git a/t/020-mail.t b/t/020-mail.t
@@ -6,7 +6,7 @@ use Sisimai::Mail;
 my $PackageName = 'Sisimai::Mail';
 my $MethodNames = {
     'class' => ['new'],
-    'object' => ['path', 'kind', 'data', 'type', 'mail', 'hook', 'close'],
+    'object' => ['path', 'kind', 'data', 'type', 'mail', 'close'],
 };
 my $SampleEmail = {
     'mailbox' => './set-of-emails/mailbox/mbox-0',