Merge branch 'master' of git://github.com/bobtfish/catalyst-action-rest

[catagits/Catalyst-Action-REST.git] / lib / Catalyst / Action / REST.pm

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index 898ce60..f4e0a2f 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -17,7 +17,8 @@ use Catalyst::Controller::REST;
 
 BEGIN { require 5.008001; }
 
-our $VERSION = '0.74';
+our $VERSION = '0.76';
+$VERSION = eval $VERSION;
 
 sub new {
   my $class  = shift;
@@ -94,8 +95,9 @@ sub dispatch {
     my ($code, $name);
 
     # Common case, for foo_GET etc
-    if ( my $action = $controller->action_for($rest_method) ) {
-        return $c->forward( $action,  $c->req->args );
+    if ( $code = $controller->action_for($rest_method) ) {
+        $c->execute( $self->class, $self, @{ $c->req->args } );
+        return $c->forward( $code,  $c->req->args );
      } elsif ($code = $controller->can($rest_method)) {
         # Exceute normal action
         $c->execute( $self->class, $self, @{ $c->req->args } );
@@ -175,24 +177,10 @@ L<Catalyst::Action::Serialize>, L<Catalyst::Action::Deserialize>
 
 =item Q: I'm getting a "415 Unsupported Media Type" error. What gives?!
 
-<<<<<<< HEAD:lib/Catalyst/Action/REST.pm
-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). >>
->>>>>>> f04ed654a172628f642bdefe8483c1e6becf9ad1:lib/Catalyst/Action/REST.pm
 
 B<NOTE> Apache will refuse %2F unless configured otherise.
 Make sure C<< AllowEncodedSlashes On >> is in your httpd.conf file in orde