X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FREST.pm;h=508d2ff47655aafec7486cc9bd144a945fbf9c80;hb=258f6e7c203bb2a0a29d2eccd0f1f029a13275b9;hp=bc715f638868301ca0c4abc6221d729282587bb9;hpb=e566b7c797b76740ac385886bd717c5c82caea77;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index bc715f6..508d2ff 100644
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -10,7 +10,7 @@ use Catalyst::Controller::REST;
 
 BEGIN { require 5.008001; }
 
-our $VERSION = '1.02';
+our $VERSION = '1.04';
 $VERSION = eval $VERSION;
 
 sub BUILDARGS {
@@ -61,7 +61,8 @@ by implementing a custom 405 handler like so:
 
 If you do not provide an _OPTIONS subroutine, we will automatically respond
 with a 200 OK.  The "Allow" header will be populated with the list of
-implemented request methods.
+implemented request methods. If you do not provide an _HEAD either, we will
+auto dispatch to the _GET one in case it exists.
 
 It is likely that you really want to look at L<Catalyst::Controller::REST>,
 which brings this class together with automatic Serialization of requests
@@ -130,7 +131,9 @@ sub _dispatch_rest_method {
                     || sub { $self->_return_not_implemented($self->name, @_) };
             },
         };
-        my $respond = ($code_action->{$req->method}
+        my ( $http_method, $action_name ) = ( $rest_method, $self->name );
+        $http_method =~ s{\Q$action_name\E\_}{};
+        my $respond = ($code_action->{$http_method}
                        || $code_action->{'default'})->();
         return $respond unless $name;
     }
@@ -146,25 +149,31 @@ sub _dispatch_rest_method {
     $c->execute( $self->class, $self, @{ $req->args } );
 }
 
-sub _get_allowed_methods {
+sub get_allowed_methods {
     my ( $self, $controller, $c, $name ) = @_;
     my $class = ref($controller) ? ref($controller) : $controller;
-    my $methods = Class::Inspector->methods($class);
-    return map { /^$name\_(.+)$/ } @$methods;
+    my $methods = {
+      map { /^$name\_(.+)$/ ? ( $1 => 1 ) : () }
+        @{ Class::Inspector->methods($class) }
+    };
+    $methods->{'HEAD'} = 1 if $methods->{'GET'};
+    delete $methods->{'not_implemented'};
+    return keys %$methods;
 };
 
 sub _return_options {
     my ( $self, $method_name, $controller, $c) = @_;
-    my @allowed = $self->_get_allowed_methods($controller, $c, $method_name);
+    my @allowed = $self->get_allowed_methods($controller, $c, $method_name);
     $c->response->content_type('text/plain');
     $c->response->status(200);
     $c->response->header( 'Allow' => \@allowed );
+    $c->response->body(q{});
 }
 
 sub _return_not_implemented {
     my ( $self, $method_name, $controller, $c ) = @_;
 
-    my @allowed = $self->_get_allowed_methods($controller, $c, $method_name);
+    my @allowed = $self->get_allowed_methods($controller, $c, $method_name);
     $c->response->content_type('text/plain');
     $c->response->status(405);
     $c->response->header( 'Allow' => \@allowed );
@@ -243,6 +252,8 @@ Gerv http://www.gerv.net/
 
 Colin Newell <colin@opusvl.com>
 
+Wallace Reis E<lt>wreis@cpan.orgE<gt>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2006-2012 the above named AUTHOR and CONTRIBUTORS