Moving app lookup to _insert_self_into

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index f45fcdc..92e7f1a 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -23,7 +23,7 @@ our $VERSION = '0.67_01';
 sub new {
   my $class  = shift;
   my $config = shift;
-  Catalyst::Request::REST->_insert_self_into($config->{class});
+  Catalyst::Request::REST->_insert_self_into( $config->{class} );
   return $class->SUPER::new($config, @_);
 }
 

diff --git a/lib/Catalyst/Action/SerializeBase.pm b/lib/Catalyst/Action/SerializeBase.pm
index 5155140..d4c53b9 100644 (file)
--- a/lib/Catalyst/Action/SerializeBase.pm
+++ b/lib/Catalyst/Action/SerializeBase.pm
@@ -18,9 +18,7 @@ use Catalyst::Utils ();
 sub new {
   my $class  = shift;
   my $config = shift;
-  Catalyst::Request::REST->_insert_self_into(
-    Catalyst::Utils::class2appclass($config->{class})
-  );
+  Catalyst::Request::REST->_insert_self_into( $config->{class} );
   return $class->SUPER::new($config, @_);
 }
 

diff --git a/lib/Catalyst/Request/REST.pm b/lib/Catalyst/Request/REST.pm
index 795614c..7c3b2e4 100644 (file)
--- a/lib/Catalyst/Request/REST.pm
+++ b/lib/Catalyst/Request/REST.pm
@@ -11,10 +11,14 @@ use strict;
 use warnings;
 
 use base qw/Catalyst::Request Class::Accessor::Fast/;
+
+use Catalyst::Utils;
 use HTTP::Headers::Util qw(split_header_words);
 
 sub _insert_self_into {
-  my ($class, $app) = @_;
+  my ($class, $app_class ) = @_;
+  my $app = Catalyst::Utils::class2appclass( $app_class ) || $app_class;
+
   my $req_class = $app->request_class;
   return if $req_class->isa($class);
   if ($req_class eq 'Catalyst::Request') {