v1.21

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

diff --git a/lib/Catalyst/Request/REST.pm b/lib/Catalyst/Request/REST.pm
index 1d7e6af..0fcd31c 100644 (file)
--- a/lib/Catalyst/Request/REST.pm
+++ b/lib/Catalyst/Request/REST.pm
@@ -1,4 +1,5 @@
 package Catalyst::Request::REST;
+
 use Moose;
 
 use Catalyst::Utils;
@@ -7,9 +8,6 @@ use namespace::autoclean;
 extends 'Catalyst::Request';
 with 'Catalyst::TraitFor::Request::REST';
 
-our $VERSION = '0.82';
-$VERSION = eval $VERSION;
-
 # Please don't take this as a recommended way to do things.
 # The code below is grotty, badly factored and mostly here for back
 # compat..
@@ -23,17 +21,28 @@ sub _insert_self_into {
   my $req_class = $app->request_class;
   return if $req_class->isa($class);
   my $req_class_meta = Moose->init_meta( for_class => $req_class );
-  return if $req_class_meta->does_role('Catalyst::TraitFor::Request::REST');
-  my $meta = Moose::Meta::Class->create_anon_class(
-      superclasses => [$req_class],
-      roles => ['Catalyst::TraitFor::Request::REST'],
-      cache => 1
-  );
-  $meta->add_method(meta => sub { $meta });
-  $app->request_class($meta->name);
+  my $role = $class->_related_role;
+  return if $req_class_meta->does_role($role);
+  if ($req_class eq 'Catalyst::Request') {
+    $app->request_class($class);
+  }
+  else {
+      my $meta = Moose::Meta::Class->create_anon_class(
+          superclasses => [$req_class],
+          roles => [$role],
+          cache => 1
+      );
+      $meta->_add_meta_method('meta');
+      $app->request_class($meta->name);
+  }
 }
 
+sub _related_role { 'Catalyst::TraitFor::Request::REST' }
+
 __PACKAGE__->meta->make_immutable;
+
+1;
+
 __END__
 
 =head1 NAME