better deprecation warnings

mojolicious · Feb 23, 2013 · e15f134 · e15f134
1 parent 6beb2c9
commit e15f134
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 109 deletions.
diff --git a/Changes b/Changes
diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -82,8 +82,8 @@ sub rel_file { catfile(@{shift->{parts} || []}, split '/', shift) }
 
 # DEPRECATED in Rainbow!
 sub slurp_rel_file {
-  deprecated 'Mojo::Home->slurp_rel_file is DEPRECATED in favor of '
-    . 'Mojo::Util->slurp';
+  deprecated
+    'Mojo::Home::slurp_rel_file is DEPRECATED in favor of Mojo::Util::slurp';
   slurp shift->rel_file(@_);
 }
 

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -61,15 +61,15 @@ sub app_url {
 
 # DEPRECATED in Rainbow!
 sub build_form_tx {
-  deprecated 'Mojo::UserAgent->build_form_tx is DEPRECATED in favor of '
-    . 'Mojo::UserAgent->build_tx';
+  deprecated 'Mojo::UserAgent::build_form_tx is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::build_tx';
   shift->transactor->form(@_);
 }
 
 # DEPRECATED in Rainbow!
 sub build_json_tx {
-  deprecated 'Mojo::UserAgent->build_json_tx is DEPRECATED in favor of '
-    . 'Mojo::UserAgent->build_tx';
+  deprecated 'Mojo::UserAgent::build_json_tx is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::build_tx';
   shift->transactor->json(@_);
 }
 
@@ -90,17 +90,17 @@ sub need_proxy {
 
 # DEPRECATED in Rainbow!
 sub post_form {
-  deprecated 'Mojo::UserAgent->post_form is DEPRECATED in favor of '
-    . 'Mojo::UserAgent->post';
+  deprecated 'Mojo::UserAgent::post_form is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::post';
   my $self = shift;
   my $cb = ref $_[-1] eq 'CODE' ? pop : undef;
   return $self->start($self->build_form_tx(@_), $cb);
 }
 
 # DEPRECATED in Rainbow!
 sub post_json {
-  deprecated 'Mojo::UserAgent->post_json is DEPRECATED in favor of '
-    . 'Mojo::UserAgent->post';
+  deprecated 'Mojo::UserAgent::post_json is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::post';
   my $self = shift;
   my $cb = ref $_[-1] eq 'CODE' ? pop : undef;
   return $self->start($self->build_json_tx(@_), $cb);

diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -47,8 +47,8 @@ sub endpoint {
 
 # DEPRECATED in Rainbow!
 sub form {
-  deprecated 'Mojo::UserAgent::Transactor->form is DEPRECATED in favor of '
-    . 'Mojo::UserAgent::Transactor->tx';
+  deprecated 'Mojo::UserAgent::Transactor::form is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::Transactor::tx';
   my ($self, $url, $charset) = (shift, shift, shift);
   my $form = ref $charset ? $charset : shift;
   $charset = undef if ref $charset;
@@ -57,8 +57,8 @@ sub form {
 
 # DEPRECATED in Rainbow!
 sub json {
-  deprecated 'Mojo::UserAgent::Transactor->json is DEPRECATED in favor of '
-    . 'Mojo::UserAgent::Transactor->tx';
+  deprecated 'Mojo::UserAgent::Transactor::json is DEPRECATED in favor of '
+    . 'Mojo::UserAgent::Transactor::tx';
   my ($self, $url, $data) = (shift, shift, shift);
   return $self->tx(POST => $url, @_, json => $data);
 }

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -122,8 +122,8 @@ sub hmac_sha1_sum { _hmac(\&sha1, @_) }
 
 # DEPRECATED in Rainbow!
 sub html_escape {
-  deprecated 'Mojo::Util->html_escape is DEPRECATED in favor of '
-    . 'Mojo::Util->xml_escape';
+  deprecated 'Mojo::Util::html_escape is DEPRECATED in favor of '
+    . 'Mojo::Util::xml_escape';
   my ($string, $pattern) = @_;
   $pattern ||= '^\n\r\t !#$%(-;=?-~';
   return $string unless $string =~ /[^$pattern]/;

diff --git a/lib/Mojolicious/Commands.pm b/lib/Mojolicious/Commands.pm
@@ -106,8 +106,8 @@ sub run {
 
 # DEPRECATED in Rainbow!
 sub start {
-  deprecated 'Mojolicious::Commands->start is DEPRECATED in favor of '
-    . 'Mojolicious::Commands->start_app';
+  deprecated 'Mojolicious::Commands::start is DEPRECATED in favor of '
+    . 'Mojolicious::Commands::start_app';
   my $self = shift;
   return $self->start_app($ENV{MOJO_APP} => @_) if $ENV{MOJO_APP};
   return $self->new->app->start(@_);

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -81,8 +81,8 @@ sub lookup {
 
 # DEPRECATED in Rainbow!
 sub namespace {
-  deprecated 'Mojolicious::Routes->namespace is DEPRECATED in favor of '
-    . 'Mojolicious::Routes->namespaces';
+  deprecated 'Mojolicious::Routes::namespace is DEPRECATED in favor of '
+    . 'Mojolicious::Routes::namespaces';
   my $self = shift;
   return $self->namespaces->[0] unless @_;
   $self->namespaces->[0] = shift;

diff --git a/lib/Test/Mojo.pm b/lib/Test/Mojo.pm
@@ -220,17 +220,17 @@ sub post_ok  { shift->_request_ok(post  => @_) }
 
 # DEPRECATED in Rainbow!
 sub post_form_ok {
-  deprecated 'Test::Mojo->post_form_ok is DEPRECATED in favor of '
-    . 'Test::Mojo->post_ok';
+  deprecated
+    'Test::Mojo::post_form_ok is DEPRECATED in favor of Test::Mojo::post_ok';
   my ($self, $url) = (shift, shift);
   my $tx = $self->tx($self->ua->post_form($url, @_))->tx;
   return $self->_test('ok', $tx->is_finished, encode('UTF-8', "post $url"));
 }
 
 # DEPRECATED in Rainbow!
 sub post_json_ok {
-  deprecated 'Test::Mojo->post_json_ok is DEPRECATED in favor of '
-    . 'Test::Mojo->post_ok';
+  deprecated
+    'Test::Mojo::post_json_ok is DEPRECATED in favor of Test::Mojo::post_ok';
   my ($self, $url) = (shift, shift);
   my $tx = $self->tx($self->ua->post_json($url, @_))->tx;
   return $self->_test('ok', $tx->is_finished, encode('UTF-8', "post $url"));
@@ -376,7 +376,7 @@ sub _wait {
   # DEPRECATED in Rainbow!
   my $new = $self->{new} //= $wait;
   deprecated
-    'Testing WebSocket messages without Test::Mojo->message_ok is DEPRECATED'
+    'Testing WebSocket messages without Test::Mojo::message_ok is DEPRECATED'
     unless $new;
   return $self->message if $new && !$wait;
 

diff --git a/lib/ojo.pm b/lib/ojo.pm
@@ -42,11 +42,11 @@ sub import {
 
   # DEPRECATED in Rainbow!
   my $f = sub {
-    deprecated 'ojo->f is DEPRECATED in favor of ojo->p';
+    deprecated 'ojo::f is DEPRECATED in favor of ojo::p';
     _request($UA->build_form_tx(@_));
   };
   my $n = sub {
-    deprecated 'ojo->n is DEPRECATED in favor of ojo->p';
+    deprecated 'ojo::n is DEPRECATED in favor of ojo::p';
     _request($UA->build_json_tx(@_));
   };
   monkey_patch $caller, f => $f, n => $n;