[Catalyst-commits] r10746 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-06-30 20:35:40 +0000 (Tue, 30 Jun 2009)
New Revision: 10746

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Response.pm
   Catalyst-Runtime/5.80/trunk/t/unit_response.t
Log:
Core fix for warnings due to undef body as per fix in FillInForm in r10745

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-06-30 20:17:53 UTC (rev 10745)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-06-30 20:35:40 UTC (rev 10746)
@@ -5,6 +5,7 @@
          - Tests for this (Byron Young + Amir Sadoughi)
        - Inherited controller methods can now be specified in
          config->{action(s)}
+       - Assigning an undef response body no longer produces warnings
 
   New features:
        - Add optional second argument to uri_with which appends to existing

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Response.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Response.pm	2009-06-30 20:17:53 UTC (rev 10745)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Response.pm	2009-06-30 20:35:40 UTC (rev 10746)
@@ -6,7 +6,14 @@
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 has cookies   => (is => 'rw', default => sub { {} });
-has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body');
+has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body',
+    clearer => '_clear_body'
+);
+after 'body' => sub { # If someone assigned undef, clear the body so we get ''
+    if (scalar(@_) == 2 && !defined($_[1])) {
+         $_[0]->_clear_body;
+    }
+};
 has location  => (is => 'rw');
 has status    => (is => 'rw', default => 200);
 has finalized_headers => (is => 'rw', default => 0);

Modified: Catalyst-Runtime/5.80/trunk/t/unit_response.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/unit_response.t	2009-06-30 20:17:53 UTC (rev 10745)
+++ Catalyst-Runtime/5.80/trunk/t/unit_response.t	2009-06-30 20:35:40 UTC (rev 10746)
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests => 4;
+use Test::More tests => 6;
 
 use_ok('Catalyst::Response');
 
@@ -12,3 +12,7 @@
 is($res->status, 500, 'code sets status');
 $res->status(501);
 is($res->code, 501, 'status sets code');
+is($res->body, '', "default response body ''");
+$res->body(undef);
+is($res->body, '', "response body '' after assigned undef");
+