use hooks

CHANGES

@@ -1,3 +1,6 @@
+    [ API CHANGES ]
+    * Deprecation of 'before', 'before_template' and 'after' in favor of hook
+      (Alberto Simões)
 
     [ BUG FIXES ]
     * Minor corrections (jamhed, felixdo)

lib/Dancer.pm

@@ -100,10 +100,26 @@ our @EXPORT    = qw(
 
 # Dancer's syntax
 
-sub after           { Dancer::Hook->new('after', @_) }
+sub after           {
+    Dancer::Deprecation->deprecated(reason => "use hooks!",
+                                    version => '1.3080',
+                                    fatal => 0);
+    Dancer::Hook->new('after', @_);
+}
+sub before          {
+    Dancer::Deprecation->deprecated(reason => "use hooks!",
+                                    version => '1.3080',
+                                    fatal => 0);
+    Dancer::Hook->new('before', @_);
+}
+sub before_template {
+    Dancer::Deprecation->deprecated(reason => "use hooks!",
+                                    version => '1.3080',
+                                    fatal => 0);
+    Dancer::Hook->new('before_template', @_);
+}
+
 sub any             { Dancer::App->current->registry->any_add(@_) }
-sub before          { Dancer::Hook->new('before', @_) }
-sub before_template { Dancer::Hook->new('before_template', @_) }
 sub captures        { Dancer::SharedData->request->params->{captures} }
 sub cookie          { Dancer::Cookies->cookie( @_ ) }
 sub cookies         { Dancer::Cookies->cookies }

lib/Dancer/Plugin/Ajax.pm

@@ -8,7 +8,7 @@ use Dancer::Plugin;
 
 register 'ajax' => \&ajax;
 
-before sub {
+hook before => sub {
     if (request->is_ajax) {
         content_type('text/xml');
     }

t/02_request/15_headers.t

@@ -41,7 +41,7 @@ Test::TCP::test_tcp(
              show_errors  => 1,
              startup_info => 0 );
 
-        after sub {
+        hook after => sub {
             my $response = shift;
             $response->header('X-Foo', 2);
         };

t/03_route_handler/05_filter.t

@@ -10,8 +10,8 @@ plan tests => 19;
 {
     my $i = 0;
 
-    before sub { content_type('text/xhtml'); };
-    before sub {
+    hook before => sub { content_type('text/xhtml'); };
+    hook before => sub {
         if ( request->path_info eq '/redirect_from' ) {
             redirect('/redirect_to');
         }
@@ -53,7 +53,7 @@ plan tests => 19;
 
 # filters and params
 {
-    before sub {
+    hook before => sub {
         return if request->path !~ /foo/;
         ok( defined( params->{'format'} ),
             "param format is defined in before filter" );
@@ -70,13 +70,13 @@ plan tests => 19;
 
 # filter and halt
 {
-    before sub {
+    hook before => sub {
         unless (params->{'requested'}) {
             return halt("stopped");
         }
     };
 
-    before sub {
+    hook before => sub {
         unless (params->{'requested'}) {
             halt("another halt");
         }

t/03_route_handler/18_auto_page.t

@@ -10,7 +10,7 @@ use Dancer::Test;
     package Foo;
     use Dancer;
 
-    before_template sub {
+    hook before_template => sub {
         my $tokens = shift;
         $tokens->{title} = "Dancer";
     };

t/03_route_handler/23_filter_error_catching.t

@@ -10,7 +10,7 @@ use Dancer::Test;
 set show_errors => true;
 
 {
-    before sub {
+    hook before => sub {
         FooBar->send_error; # FAIL
     };
 

t/03_route_handler/29_redirect_immediately.t

@@ -11,7 +11,7 @@ plan tests => 5;
 
 my $pass = 0;
 
-before sub {
+hook before => sub {
     redirect '/'
       unless request->path eq '/'
           || request->path eq '';

t/03_route_handler/31_infinite_loop.t

@@ -16,7 +16,7 @@ response_status_is [GET => "/$i"] => 200,
   'before not installed yet, response status is 200 looks good for GET /0';
 response_content_is [GET => "/$i"], "whatever $i";
 
-before sub {
+hook before => sub {
     ++$i;
     request->path_info("/$i");
 };

t/03_route_handler/99_bugs.t

@@ -30,7 +30,7 @@ plan tests => 19;
 {
     my $i = 0;
 
-    before( sub { redirect '/somewhere' if request->path eq '/' } );
+    hook before => sub { redirect '/somewhere' if request->path eq '/' };
     get( '/', sub { $i++; 'Hello' } );
 
     route_exists [ GET => '/' ];

t/08_session/10_filter.t

@@ -5,7 +5,7 @@ use Test::More import => ['!pass'], tests => 2;
 use Dancer ':syntax';
 use Dancer::Test;
 
-before sub {
+hook before => sub {
     my $data = session;
     #warn "on a $data";
     #redirect '/nonexistent'

t/12_response/06_filter_halt_status.t

@@ -14,7 +14,7 @@ plan skip_all => "JSON is needed to run this tests"
     set serializer => 'JSON';
     set environment => 'production';
 
-    before sub {
+    hook before => sub {
         if (params->{'troll'}) {
             status 401;
             return halt({error => "Go away you troll!"})

t/14_serializer/17_clear_serializer.t

@@ -50,7 +50,7 @@ Test::TCP::test_tcp(
 
         get '/' => sub { $data };
 
-        after sub { set serializer => undef };
+        hook after => sub { set serializer => undef };
 
         Dancer->dance();
     },

t/22_hooks/00_syntax.t

@@ -4,19 +4,14 @@ use Test::More import => ['!pass'];
 
 use Dancer ':syntax';
 
-plan tests => 5;
+plan tests => 4;
 
-ok( before( sub { 'block before' } ), 'add a before filter' );
-ok( after( sub  { 'block after' } ),  'add an after filter' );
+ok( hook(before => sub { 'block before' } ), 'add a before filter' );
+ok( hook(after => sub  { 'block after' } ),  'add an after filter' );
 
-ok( before_template( sub { 'block before_template' } ),
+ok( hook(before_template=> sub { 'block before_template' } ),
     'add a before_template filter' );
 
-ok(
-    hook( 'before', sub { 'block before' } ),
-    'add a before filter using the hook keyword'
-);
-
 eval {
     hook( 'before', 'This is not a CodeRef' ),
 };

t/22_hooks/02_before.t

@@ -10,15 +10,15 @@ plan tests => 15;
 my $i = 0;
 
 ok(
-    before(
+   hook (before =>
         sub {
             content_type('text/xhtml');
         }
     )
 );
 
 ok(
-    before(
+   hook(before=>
         sub {
             if ( request->path_info eq '/redirect_from' ) {
                 redirect('/redirect_to');

t/22_hooks/03_after.t

@@ -8,7 +8,7 @@ use Dancer::Test;
 plan tests => 3;
 
 ok(
-    after(
+   hook(after =>
         sub {
             my $response = shift;
             $response->content('not index!');

t/22_hooks/04_template.t

@@ -9,7 +9,7 @@ use Time::HiRes qw/gettimeofday tv_interval/;
 my ($t0, $elapsed);
 
 ok(
-    before_template sub {
+    hook before_template => sub {
         my $tokens = shift;
         $tokens->{foo} = 'bar';
         $t0 = [gettimeofday];

t/22_hooks/10_error_in_hook.t

@@ -5,7 +5,7 @@ use Test::More tests => 3, import => ['!pass'];
 use Dancer ':syntax';
 use Dancer::Test;
 
-before_template sub {
+hook before_template => sub {
     die "plop";
 };
 

t/22_hooks/11_error_in_hook.t

@@ -5,7 +5,7 @@ use Test::More tests => 3, import => ['!pass'];
 use Dancer ':syntax';
 use Dancer::Test;
 
-before_template sub {
+hook before_template => sub {
     status 500;
     halt({error => "This is some error"});
 };

t/lib/LinkBlocker.pm

@@ -4,7 +4,7 @@ use Dancer::Plugin;
 
 register block_links_from => sub {
     my ($host) = @_;
-    before sub {
+    hook before => sub {
         if (request->referer && request->referer =~ /http:\/\/$host/) {
             status 403;
         }

t/lib/MyAppFoo.pm

@@ -2,7 +2,7 @@ package MyAppFoo;
 
 use Dancer ':syntax';
 
-before {apps => [qw/MyAppFoo/]}, sub {
+hook before {apps => [qw/MyAppFoo/]}, sub {
     halt('before block in foo');
 };