Bump versions for release

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

diff --git a/lib/Catalyst/Action/Deserialize.pm b/lib/Catalyst/Action/Deserialize.pm
index 8b23cf7..ead726d 100644 (file)
--- a/lib/Catalyst/Action/Deserialize.pm
+++ b/lib/Catalyst/Action/Deserialize.pm
@@ -1,73 +1,48 @@
-#
-# Catlyst::Action::Deserialize
-# Created by: Adam Jacob, Marchex, <adam@marchex.com>
-#
-# $Id$
-
 package Catalyst::Action::Deserialize;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
-use Catalyst::Request::REST;
+use MRO::Compat;
+
+our $VERSION = '0.82';
+$VERSION = eval $VERSION;
 
-__PACKAGE__->mk_accessors(qw(plugins));
+has plugins => ( is => 'rw' );
 
 sub execute {
     my $self = shift;
-    my ( $controller, $c, $test ) = @_;
-
-    my $nreq = bless( $c->request, 'Catalyst::Request::REST' );
-    $c->request($nreq);
-
-    unless ( defined( $self->plugins ) ) {
-        my $mpo = Module::Pluggable::Object->new(
-            'require'     => 1,
-            'search_path' => ['Catalyst::Action::Deserialize'],
-        );
-        my @plugins = $mpo->plugins;
-        $self->plugins( \@plugins );
-    }
-    my $content_type = $c->request->content_type;
-    my $sclass       = 'Catalyst::Action::Deserialize::';
-    my $sarg;
-    my $map = $controller->serialize->{'map'};
-    if ( exists( $map->{$content_type} ) ) {
-        my $mc;
-        if ( ref( $map->{$content_type} ) eq "ARRAY" ) {
-            $mc   = $map->{$content_type}->[0];
-            $sarg = $map->{$content_type}->[1];
-        } else {
-            $mc = $map->{$content_type};
-        }
-        $sclass .= $mc;
-        if ( !grep( /^$sclass$/, @{ $self->plugins } ) ) {
-            die "Cannot find plugin $sclass for $content_type!";
-        }
-    } else {
-        if ( exists( $controller->serialize->{'default'} ) ) {
-            $sclass .= $controller->serialize->{'default'};
-        } else {
-            die "I cannot find a default serializer!";
-        }
-    }
+    my ( $controller, $c ) = @_;
 
     my @demethods = qw(POST PUT OPTIONS);
     my $method    = $c->request->method;
     if ( grep /^$method$/, @demethods ) {
+        my ( $sclass, $sarg, $content_type ) =
+          $self->_load_content_plugins( 'Catalyst::Action::Deserialize',
+            $controller, $c );
+        return 1 unless defined($sclass);
+        my $rc;
         if ( defined($sarg) ) {
-            $sclass->execute( $controller, $c, $sarg );
+            $rc = $sclass->execute( $controller, $c, $sarg );
         } else {
-            $sclass->execute( $controller, $c );
+            $rc = $sclass->execute( $controller, $c );
+        }
+        if ( $rc eq "0" ) {
+            return $self->_unsupported_media_type( $c, $content_type );
+        } elsif ( $rc ne "1" ) {
+            return $self->_serialize_bad_request( $c, $content_type, $rc );
         }
-        $self->NEXT::execute( @_, );
-    } else {
-        $self->NEXT::execute(@_);
     }
+
+    $self->maybe::next::method(@_);
+
+    return 1;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 =head1 NAME
 
 Catalyst::Action::Deserialize - Deserialize Data in a Request
@@ -77,17 +52,15 @@ Catalyst::Action::Deserialize - Deserialize Data in a Request
     package Foo::Controller::Bar;
 
     __PACKAGE__->config(
-        serialize => {
-            'default'   => 'YAML',
-            'stash_key' => 'rest',
-            'map'       => {
-                'text/x-yaml'        => 'YAML',
-                'text/x-data-dumper' => [ 'Data::Serializer', 'Data::Dumper' ],
-            },
-        }
+        'default'   => 'text/x-yaml',
+        'stash_key' => 'rest',
+        'map'       => {
+            'text/x-yaml'        => 'YAML',
+            'text/x-data-dumper' => [ 'Data::Serializer', 'Data::Dumper' ],
+        },
     );
 
-    sub begin : ActionClass('Deserialize') {}
+    sub begin :ActionClass('Deserialize') {}
 
 =head1 DESCRIPTION
 
@@ -96,9 +69,6 @@ It assumes that the body of the HTTP Request is a serialized object.
 The serializer is selected by introspecting the requests content-type
 header.
 
-It requires that your Catalyst controller have a "serialize" entry
-in it's configuration.
-
 The specifics of deserializing each content-type is implemented as
 a plugin to L<Catalyst::Action::Deserialize>.  You can see a list
 of currently implemented plugins in L<Catalyst::Controller::REST>.
@@ -106,20 +76,16 @@ of currently implemented plugins in L<Catalyst::Controller::REST>.
 The results of your Deserializing will wind up in $c->req->data.
 This is done through the magic of L<Catalyst::Request::REST>.
 
-=head1 CONFIGURATION
+While it is common for this Action to be called globally as a
+C<begin> method, there is nothing stopping you from using it on a
+single routine:
 
-=over 4
+   sub foo :Local :Action('Deserialize') {}
 
-=item default
+Will work just fine.
 
-The default Serialization format.  See the next section for
-available options.
-
-=item map
-
-Takes a hashref, mapping Content-Types to a given plugin.
-
-=back
+When you use this module, the request class will be changed to
+L<Catalyst::Request::REST>.
 
 =head1 SEE ALSO
 
@@ -128,16 +94,12 @@ a sensible set of defaults for a controller doing REST.
 
 L<Catalyst::Action::Serialize>, L<Catalyst::Action::REST>
 
-=head1 AUTHOR
+=head1 AUTHORS
 
-Adam Jacob <adam@stalecoffee.org>, with lots of help from mst and jrockway
-
-Marchex, Inc. paid me while I developed this module.  (http://www.marchex.com)
+See L<Catalyst::Action::REST> for authors.
 
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.
 
 =cut
-
-1;