From: Arthur Axel 'fREW' Schmidt <frioux@gmail.com>
Date: Thu, 27 Aug 2009 00:47:21 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/bobtfish/catalyst-action-rest
X-Git-Tag: 1.08~203
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=29739a599abe110c310ec26dc2b528f773bc579b;hp=-c;p=catagits%2FCatalyst-Action-Serialize-Data-Serializer.git

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

29739a599abe110c310ec26dc2b528f773bc579b
diff --combined lib/Catalyst/Action/REST.pm
index 4a607b0,c9d336e..f4e0a2f
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@@ -17,7 -17,8 +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,10 -95,7 +95,10 @@@ sub dispatch 
      my ($code, $name);
  
      # Common case, for foo_GET etc
 -    if ($code = $controller->can($rest_method)) {
 +    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 } );
          $name = $rest_method;