remove deprecated collecting method from Mojo::UserAgent::CookieJar

mojolicious · Dec 2, 2015 · d4c81de · d4c81de
1 parent 029683c
commit d4c81de
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 6.35  2015-12-02
+  - Removed deprecated collecting method from Mojo::UserAgent::CookieJar.
   - Fixed warnings in Mojo::Cookie::Response.
 
 6.34  2015-12-01

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -98,9 +98,7 @@ sub _connect {
   if ($proto eq 'socks') {
     @options{qw(socks_address socks_port)} = @options{qw(address port)};
     ($proto, @options{qw(address port)}) = $t->endpoint($tx);
-    my $req      = $tx->req;
-    my $userinfo = $req->proxy->userinfo;
-    $req->via_proxy(0);
+    my $userinfo = $tx->req->via_proxy(0)->proxy->userinfo;
     @options{qw(socks_user socks_pass)} = split ':', $userinfo if $userinfo;
   }
 

diff --git a/lib/Mojo/UserAgent/CookieJar.pm b/lib/Mojo/UserAgent/CookieJar.pm
@@ -3,7 +3,6 @@ use Mojo::Base -base;
 
 use Mojo::Cookie::Request;
 use Mojo::Path;
-use Mojo::Util 'deprecated';
 
 has 'ignore';
 has max_cookie_size => 4096;
@@ -40,9 +39,6 @@ sub all {
 sub collect {
   my ($self, $tx) = @_;
 
-  # DEPRECATED in Clinking Beer Mugs!
-  return unless $self->{collecting} // 1;
-
   my $url = $tx->req->url;
   for my $cookie (@{$tx->res->cookies}) {
 
@@ -60,16 +56,6 @@ sub collect {
   }
 }
 
-# DEPRECATED in Clinking Beer Mugs!
-sub collecting {
-  deprecated 'Mojo::UserAgent::CookieJar::collecting is DEPRECATED in favor of'
-    . ' Mojo::UserAgent::CookieJar::ignore';
-  my $self = shift;
-  return $self->{collecting} //= 1 unless @_;
-  $self->{collecting} = shift;
-  return $self;
-}
-
 sub empty { delete shift->{jar} }
 
 sub find {

diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -7,4 +7,4 @@ plan skip_all => 'set TEST_POD to enable this test (developer only!)'
 plan skip_all => 'Test::Pod::Coverage 1.04+ required for this test!'
   unless eval 'use Test::Pod::Coverage 1.04; 1';
 
-all_pod_coverage_ok({also_private => [qw(collecting format_regex)]});
+all_pod_coverage_ok({also_private => ['format_regex']});