X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FRequest%2FREST.pm;h=e03d4d125eb1ebc8e9168dd778ac41a1e4f2de8d;hb=3d1e10e70eb17bd02ed4c3ba440fce3a94696833;hp=a646e7c47598a2dae7104e647e7c9a6fd6e54d63;hpb=38e05ec40d124a14cee7ba0503f918a40a8ac5e1;p=catagits%2FCatalyst-Action-REST.git

diff --git a/lib/Catalyst/Request/REST.pm b/lib/Catalyst/Request/REST.pm
index a646e7c..e03d4d1 100644
--- a/lib/Catalyst/Request/REST.pm
+++ b/lib/Catalyst/Request/REST.pm
@@ -7,6 +7,9 @@ use namespace::autoclean;
 extends 'Catalyst::Request';
 with 'Catalyst::TraitFor::Request::REST';
 
+our $VERSION = '1.10';
+$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..
@@ -20,22 +23,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 $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 => ['Catalyst::TraitFor::Request::REST'],
+          roles => [$role],
           cache => 1
       );
-      $meta->add_method(meta => sub { $meta });
+      $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
@@ -53,11 +62,12 @@ Catalyst::Request::REST - A REST-y subclass of Catalyst::Request
 =head1 DESCRIPTION
 
 This is a subclass of C<Catalyst::Request> that applies the
-L<Catalyst::TraitFor::Request::REST> which adds a few methods to
-the request object to faciliate writing REST-y code.
+L<Catalyst::TraitFor::Request::REST> role to your request class. That trait
+adds a few methods to the request object to facilitate writing REST-y code.
 
-This class is only here for backwards compatibility with applications
-already subclassing this class.
+This class is only here for backwards compatibility with applications already
+subclassing this class. New code should use
+L<Catalyst::TraitFor::Request::REST> directly.
 
 L<Catalyst::Action::REST> and L<Catalyst::Controller::REST> will arrange
 for the request trait to be applied if needed.