X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FREST.pm;h=4a607b0baa10a35967116eae60def5e3f18fcb10;hb=5f749844ef9839e412a0c3e37ec7d3da007bc70a;hp=79e8ef3a52677de6d39ce48372ac7104e17770ad;hpb=6df7d0aece4b37bbfa3c4a6941cf3c1343f72958;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm index 79e8ef3..4a607b0 100644 --- a/lib/Catalyst/Action/REST.pm +++ b/lib/Catalyst/Action/REST.pm @@ -12,19 +12,19 @@ use warnings; use base 'Catalyst::Action'; use Class::Inspector; -use Catalyst; use Catalyst::Request::REST; use Catalyst::Controller::REST; BEGIN { require 5.008001; } -our $VERSION = '0.67'; +our $VERSION = '0.74'; -# This is wrong in several ways. First, there's no guarantee that -# Catalyst.pm has not been subclassed. Two, there's no guarantee that -# the user isn't already using their request subclass. -Catalyst->request_class('Catalyst::Request::REST') - unless Catalyst->request_class->isa('Catalyst::Request::REST'); +sub new { + my $class = shift; + my $config = shift; + Catalyst::Request::REST->_insert_self_into( $config->{class} ); + return $class->next::method($config, @_); +} =head1 NAME @@ -36,11 +36,11 @@ Catalyst::Action::REST - Automated REST Method Dispatching ... do setup for HTTP method specific handlers ... } - sub foo_GET { + sub foo_GET { ... do something for GET requests ... } - sub foo_PUT { + sub foo_PUT { ... do somethign for PUT requests ... } @@ -48,13 +48,13 @@ Catalyst::Action::REST - Automated REST Method Dispatching This Action handles doing automatic method dispatching for REST requests. It takes a normal Catalyst action, and changes the dispatch to append an -underscore and method name. +underscore and method name. For example, in the synopsis above, calling GET on "/foo" would result in the foo_GET method being dispatched. -If a method is requested that is not implemented, this action will -return a status 405 (Method Not Found). It will populate the "Allow" header +If a method is requested that is not implemented, this action will +return a status 405 (Method Not Found). It will populate the "Allow" header with the list of implemented request methods. You can override this behavior by implementing a custom 405 handler like so: @@ -89,59 +89,74 @@ sub dispatch { my $c = shift; my $controller = $c->component( $self->class ); - my $method = $self->name . "_" . uc( $c->request->method ); - if ( $controller->can($method) ) { + my $rest_method = $self->name . "_" . uc( $c->request->method ); + + my ($code, $name); + + # Common case, for foo_GET etc + if ( $code = $controller->action_for($rest_method) ) { $c->execute( $self->class, $self, @{ $c->req->args } ); - return $controller->$method( $c, @{ $c->req->args } ); - } else { - if ( $c->request->method eq "OPTIONS" ) { - return $self->_return_options($c); - } else { - my $handle_ni = $self->name . "_not_implemented"; - if ( $controller->can($handle_ni) ) { - return $controller->$handle_ni( $c, @{ $c->req->args } ); - } else { - return $self->_return_not_implemented($c); - } - } + return $c->forward( $code, $c->req->args ); + } elsif ($code = $controller->can($rest_method)) { + # Exceute normal action + $c->execute( $self->class, $self, @{ $c->req->args } ); + $name = $rest_method; } -} -sub _return_options { - my ( $self, $c ) = @_; + # Generic handling for foo_OPTIONS + if (!$code && $c->request->method eq "OPTIONS") { + $name = $rest_method; + $code = sub { $self->_return_options($self->name, @_) }; + } - my @allowed = $self->_get_allowed_methods($c); - $c->response->content_type('text/plain'); - $c->response->status(200); - $c->response->header( 'Allow' => \@allowed ); + # 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, @_) }; + } + + # 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 } ); } sub _get_allowed_methods { - my ( $self, $c ) = @_; - - my $controller = $self->class; - my $methods = Class::Inspector->methods($controller); + my ( $self, $controller, $c, $name ) = @_; + my $class = ref($controller) ? ref($controller) : $controller; + my $methods = Class::Inspector->methods($class); my @allowed; foreach my $method ( @{$methods} ) { - my $name = $self->name; if ( $method =~ /^$name\_(.+)$/ ) { push( @allowed, $1 ); } } return @allowed; +}; + +sub _return_options { + my ( $self, $method_name, $controller, $c) = @_; + 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 ); } sub _return_not_implemented { - my ( $self, $c ) = @_; + my ( $self, $method_name, $controller, $c ) = @_; - my @allowed = $self->_get_allowed_methods($c); + 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 ); $c->response->body( "Method " . $c->request->method . " not implemented for " - . $c->uri_for( $self->reverse ) ); + . $c->uri_for( $method_name ) ); } 1; @@ -161,23 +176,16 @@ L, L =item Q: I'm getting a "415 Unsupported Media Type" error. What gives?! -A: Most likely, you haven't set Content-type equal to "application/json", or one of the -accepted return formats. You can do this by setting it in your query string thusly: -?content-type=application%2Fjson (where %2F == / uri escaped). - -**NOTE** Apache will refuse %2F unless configured otherise. -Make sure AllowEncodedSlashes On is in your httpd.conf file in order for this to run smoothly. - -=cut - -=cut - +A: Most likely, you haven't set Content-type equal to "application/json", or +one of the accepted return formats. You can do this by setting it in your query +accepted return formats. You can do this by setting it in your query string +thusly: C<< ?content-type=application%2Fjson (where %2F == / uri escaped). >> +B Apache will refuse %2F unless configured otherise. +Make sure C<< AllowEncodedSlashes On >> is in your httpd.conf file in orde +for this to run smoothly. - -=head1 MAINTAINER - -J. Shirley +=back =head1 CONTRIBUTORS @@ -189,11 +197,17 @@ John Goulah Daisuke Maki +J. Shirley + +Hans Dieter Pearcey + +Tomas Doran (t0m) + =head1 AUTHOR Adam Jacob , with lots of help from mst and jrockway -Marchex, Inc. paid me while I developed this module. (http://www.marchex.com) +Marchex, Inc. paid me while I developed this module. (L) =head1 LICENSE