Add ignore_discard argument to save()

Author: Lx

Changes

@@ -2,6 +2,7 @@ Revision history for HTTP-Cookies.  The HTTP::Cookies module used to be bundled
 with the libwww-perl distribution.
 
 {{$NEXT}}
+    - Add "ignore_discard" argument to save() methods
 
 6.07      2019-11-15 18:11:42Z
     - Fix t/issue32.t on old perl versions (GH#59) (Bernhard M. Wiedemann)

lib/HTTP/Cookies.pm

@@ -426,10 +426,16 @@ sub set_cookie
 sub save
 {
     my $self = shift;
-    my $file = shift || $self->{'file'} || return;
+    my %args = (
+        file => $self->{'file'},
+        ignore_discard => $self->{'ignore_discard'},
+        @_ == 1 ? ( file => $_[0] ) : @_
+    );
+    Carp::croak('Unexpected argument to save method') if keys %args > 2;
+    my $file = $args{'file'} || return;
     open(my $fh, '>', $file) or die "Can't open $file: $!";
     print {$fh} "#LWP-Cookies-1.0\n";
-    print {$fh} $self->as_string(!$self->{ignore_discard});
+    print {$fh} $self->as_string(!$args{'ignore_discard'});
     close $fh or die "Can't close $file: $!";
     1;
 }
@@ -783,11 +789,14 @@ attributes like "Comment" and "CommentURL".
 
 =item $cookie_jar->save( $file )
 
+=item $cookie_jar->save( file => $file, ignore_discard => $ignore_discard )
+
 This method file saves the state of the $cookie_jar to a file.
 The state can then be restored later using the load() method.  If a
 filename is not specified we will use the name specified during
-construction.  If the attribute I<ignore_discard> is set, then we
-will even save cookies that are marked to be discarded.
+construction.  If the $ignore_discard value is true (or not specified,
+but attribute I<ignore_discard> was set at cookie jar construction),
+then we will even save cookies that are marked to be discarded.
 
 The default is to save a sequence of "Set-Cookie3" lines.
 "Set-Cookie3" is a proprietary LWP format, not known to be compatible

lib/HTTP/Cookies/Netscape.pm

@@ -36,8 +36,14 @@ sub load
 
 sub save
 {
-    my($self, $file) = @_;
-    $file ||= $self->{'file'} || return;
+    my $self = shift;
+    my %args = (
+        file => $self->{'file'},
+        ignore_discard => $self->{'ignore_discard'},
+        @_ == 1 ? ( file => $_[0] ) : @_
+    );
+    Carp::croak('Unexpected argument to save method') if keys %args > 2;
+    my $file = $args{'file'} || return;
 
     open(my $fh, '>', $file) || return;
 
@@ -53,7 +59,7 @@ EOT
     my $now = time - $HTTP::Cookies::EPOCH_OFFSET;
     $self->scan(sub {
         my ($version, $key, $val, $path, $domain, $port, $path_spec, $secure, $expires, $discard, $rest) = @_;
-        return if $discard && !$self->{ignore_discard};
+        return if $discard && !$args{'ignore_discard'};
         $expires = $expires ? $expires - $HTTP::Cookies::EPOCH_OFFSET : 0;
         return if $now > $expires;
         $secure = $secure ? "TRUE" : "FALSE";

t/cookies.t

@@ -1,7 +1,7 @@
 #!perl -w
 
 use Test;
-plan tests => 79, todo => [78, 79];
+plan tests => 79;
 
 use HTTP::Cookies;
 use HTTP::Request;