Merge branch 'master' of github.com:bobtfish/catalyst-action-rest

* 'master' of github.com:bobtfish/catalyst-action-rest:
  Changelog
  Add tests for Serialize::View error behavior
  Add some real error-handling for Serialize::View
  View is halfway there. Do we want to poke in $c->error? Maybe not.
  Port Serialize classes except for View.
  Change Serialize::execute to expect serializers to throw an exception

diff --git a/Changes b/Changes
index 83b234a..dae830f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+Sat 19 Dec 14:54:00 GMT 2009 - Release 0.80
+
   Convert all classes to Moose
 
   Change Catalyst::Request::REST to be a mostly empty class, with

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index 68ed90a..a525ed6 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -10,7 +10,7 @@ use Catalyst::Controller::REST;
 
 BEGIN { require 5.008001; }
 
-our $VERSION = '0.79';
+our $VERSION = '0.80';
 $VERSION = eval $VERSION;
 
 sub new {

diff --git a/lib/Catalyst/Controller/REST.pm b/lib/Catalyst/Controller/REST.pm
index f2c6a3f..847fa69 100644 (file)
--- a/lib/Catalyst/Controller/REST.pm
+++ b/lib/Catalyst/Controller/REST.pm
@@ -2,7 +2,7 @@ package Catalyst::Controller::REST;
 use Moose;
 use namespace::autoclean;
 
-our $VERSION = '0.79';
+our $VERSION = '0.80';
 $VERSION = eval $VERSION;
 
 =head1 NAME

diff --git a/t/lib/Test/Serialize/Controller/REST.pm b/t/lib/Test/Serialize/Controller/REST.pm
index 118e237..4e7d1ba 100644 (file)
--- a/t/lib/Test/Serialize/Controller/REST.pm
+++ b/t/lib/Test/Serialize/Controller/REST.pm
@@ -33,7 +33,7 @@ __PACKAGE__->config(
 sub monkey_put : Local : ActionClass('Deserialize') {
     my ( $self, $c ) = @_;
     if ( ref($c->req->data) eq "HASH" ) {
-        my $out = $c->req->data->{'sushi'} . $c->req->data->{'chicken'}||'';
+        my $out = ($c->req->data->{'sushi'}||'') . ($c->req->data->{'chicken'}||'');
         utf8::encode($out);
         $c->res->output( $out );
     } else {