From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 26 Aug 2009 00:52:09 +0000 (+0100)
Subject: Merge master up
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Action-REST.git;a=commitdiff_plain;h=roles-saner

Merge master up
---

22e6f2950175823838707481863613b2c85982d2
diff --cc lib/Catalyst/Action/REST.pm
index 631df04,c9d336e..276d655
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@@ -16,8 -17,16 +16,9 @@@ extends 'Catalyst::Action'
  
  BEGIN { require 5.008001; }
  
- our $VERSION = '0.74';
+ our $VERSION = '0.76';
+ $VERSION = eval $VERSION;
  
 -sub new {
 -  my $class  = shift;
 -  my $config = shift;
 -  Catalyst::Request::REST->_insert_self_into( $config->{class} );
 -  return $class->next::method($config, @_);
 -}
 -
  =head1 NAME
  
  Catalyst::Action::REST - Automated REST Method Dispatching
diff --cc t/catalyst-request-rest.t
index 82687d2,2226793..20d96af
--- a/t/catalyst-request-rest.t
+++ b/t/catalyst-request-rest.t
@@@ -168,10 -168,24 +168,12 @@@ use HTTP::Headers
  }
  
  {
+   local %ENV=%ENV;
+   $ENV{CATALYST_DEBUG} = 0;
    my $test = 'Test::Catalyst::Action::REST';
    use_ok $test;
 -  is($test->request_class, 'Catalyst::Request::REST',
 -    'Request::REST took over for Request');
 -
 -  $test->request_class('Some::Other::Class');
 -  eval { $test->setup_finished(0); $test->setup };
 -  like $@, qr/$test has a custom request class Some::Other::Class/;
 -
 -  {
 -    package My::Request;
 -    use base 'Catalyst::Request::REST';
 -  }
 -  $test->request_class('My::Request');
 -  eval { $test->setup_finished(0); $test->setup };
 -  is $@, '', 'no error from Request::REST subclass';
 +  is($test->request_class, 'Catalyst::Request',
 +    'Request::REST did not take over for Request');
  }
  
  package MockContext;