[Catalyst-commits] r13401 - in Catalyst-Runtime/5.80/branches/psgi: . lib/Catalyst/Engine t/aggregate t/lib/TestApp/View/Dump

[jnapiorkowski at dev.catalyst.perl.org]

Author: jnapiorkowski
Date: 2010-07-08 14:11:14 +0100 (Thu, 08 Jul 2010)
New Revision: 13401

Modified:
   Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t
   Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp/View/Dump/Env.pm
Log:
fixed running unnder http server test failure and added some pod

Modified: Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/Makefile.PL	2010-07-07 20:40:27 UTC (rev 13400)
+++ Catalyst-Runtime/5.80/branches/psgi/Makefile.PL	2010-07-08 13:11:14 UTC (rev 13401)
@@ -59,6 +59,7 @@
 test_requires 'Class::Data::Inheritable';
 test_requires 'Test::Exception';
 test_requires 'Test::More' => '0.88';
+test_requires 'Data::Dump';
 
 # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
 if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.35_05')) {

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm	2010-07-07 20:40:27 UTC (rev 13400)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine/Loader.pm	2010-07-08 13:11:14 UTC (rev 13401)
@@ -39,4 +39,31 @@
 };
 
 __PACKAGE__->meta->make_immutable( inline_constructor => 0 );
+
 1;
+
+__END__
+
+=head1 NAME
+
+Catalyst::Engine::Loader - The Catalyst Engine Loader
+
+=head1 SYNOPSIS
+
+See L<Catalyst>.
+
+=head1 DESCRIPTION
+
+Wrapper on L<Plack::Loader> which resets the ::Engine if you are using some
+version of mod_perl.
+
+=head1 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
+
+=head1 COPYRIGHT
+
+This library is free software. You can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=cut

Modified: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t	2010-07-07 20:40:27 UTC (rev 13400)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/live_engine_request_env.t	2010-07-08 13:11:14 UTC (rev 13401)
@@ -24,8 +24,6 @@
 use HTTP::Request::Common;
 
 {
-    my $env;
-
     my $response = request("http://localhost/dump/env", {
         extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL },
     });
@@ -33,6 +31,8 @@
     ok( $response, 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
+
+    my $env;
     ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' );
     is ref($env), 'HASH';
     ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var';

Modified: Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp/View/Dump/Env.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp/View/Dump/Env.pm	2010-07-07 20:40:27 UTC (rev 13400)
+++ Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp/View/Dump/Env.pm	2010-07-08 13:11:14 UTC (rev 13401)
@@ -13,5 +13,14 @@
     });
 }
 
+## We override Data::Dumper here since its not reliably outputting
+## something that is roundtrip-able.
+
+sub dump {
+    my ( $self, $reference ) = @_;
+    use Data::Dump ();
+    return Data::Dump::dump($reference);
+}
+
 1;