Merge branch 'master' into roles-saner

diff --cc lib/Catalyst/Action/REST.pm
index a1dbdaf,0b55263..4a35ece
--- 1/lib/Catalyst/Action/REST.pm
--- 2/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@@ -84,29 -89,36 +84,39 @@@ sub dispatch 
      my $self = shift;
      my $c    = shift;
  
 +    Catalyst::RequestRole::REST->meta->apply($c->request)
 +        unless does_role($c->request, 'Catalyst::RequestRole::REST');
 +
      my $controller = $c->component( $self->class );
-     my $method     = $self->name . "_" . uc( $c->request->method );
+     my $rest_method = $self->name . "_" . uc( $c->request->method );
  
-     if (my $code = $controller->can($method)) {
-         $c->execute( $self->class, $self, @{ $c->req->args } ) if $code;
-         local $self->{reverse} = $self->{reverse} . "_" . uc( $c->request->method );
-         local $self->{code} = $code;
+     my ($code, $name);
  
-         return $c->execute( $self->class, $self, @{ $c->req->args } );
+     # Common case, for foo_GET etc
+     if ($code = $controller->can($rest_method)) {
+         # Exceute normal action
+         $c->execute( $self->class, $self, @{ $c->req->args } );
+         $name = $rest_method;
      }
-     if ($c->request->method eq "OPTIONS") {
-         local $self->{reverse} = $self->{reverse} . "_" . uc( $c->request->method );
-         local $self->{code} = sub { $self->can('_return_options')->($self->name, @_) };
-         return $c->execute( $self->class, $self, @{ $c->req->args } );
+ 
+     # Generic handling for foo_OPTIONS
+     if (!$code && $c->request->method eq "OPTIONS") {
+         $name = $rest_method;
+         $code = sub { $self->_return_options($self->name, @_) };
+     }
+ 
+     # Otherwise, not implemented.
+     if (!$code) {
+         $name = $self->name . "_not_implemented";
+         $code = $controller->can($name) # User method
+             # Generic not implemented
+             || sub { $self->_return_not_implemented($self->name, @_) };
      }
-     my $not_implemented_method = $self->name . "_not_implemented";
-     local $self->{code} = $controller->can($not_implemented_method)
-         || sub { $self->can('_return_not_implemented')->($self->name, @_); };
  
-     local $self->{reverse} = $not_implemented_method;
+     # localise stuff so we can dispatch the action 'as normal, but get
+     # different stats shown, and different code run.
+     local $self->{code} = $code;
+     local $self->{reverse} = $name;
  
      $c->execute( $self->class, $self, @{ $c->req->args } );
  }