Merge 'trunk' into 'deprecate_appclass_actions'

r11369@t0mlaptop (orig r11339):  marcus | 2009-09-09 18:05:32 +0100
un-TODO passing TODO tests
r11370@t0mlaptop (orig r11340):  marcus | 2009-09-09 18:08:03 +0100
Prepare for release
r11374@t0mlaptop (orig r11344):  groditi | 2009-09-09 22:06:59 +0100
add myself to contributors
r11375@t0mlaptop (orig r11345):  t0m | 2009-09-10 01:13:56 +0100
Fix warnings in upcoming moose

diff --git a/Changes b/Changes
index c268650..bba5e3b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,14 @@
 # This file documents the revision history for Perl extension Catalyst.
+#
+
+    - Add allow_mutable_ancestors option when force inlining a constructor onto
+      applications with plugins defining their own (usually Class::Accessor::Fast)
+      new methods, to avoid warnings generated by upcoming Moose releases
+      as we can make a class (MyApp) immutable when not all of it's superclasses
+      (e.g. plugins not fully Moose converted, but using
+       MooseX::Emulate::Class::Accessor::Fast) are not immutable.
+
+5.80012 2009-09-09 19:09:09
 
   Bug fixes:
      - Fix t/optional_http-server.t test.

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index f616ba8..44dd8e6 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -79,7 +79,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.80011';
+our $VERSION = '5.80012';
 
 {
     my $dev_version = $VERSION =~ /_\d{2}$/;
@@ -1134,8 +1134,10 @@ EOF
                 . "Class::Accessor(::Fast)?\nPlease pass "
                 . "(replace_constructor => 1)\nwhen making your class immutable.\n";
         }
-        $meta->make_immutable(replace_constructor => 1)
-            unless $meta->is_immutable;
+        $meta->make_immutable(
+            replace_constructor => 1,
+            allow_mutable_ancestors => 1,
+        ) unless $meta->is_immutable;
     };
 
     $class->setup_finalize;
@@ -2806,6 +2808,8 @@ Gavin Henry C<ghenry@perl.me.uk>
 
 Geoff Richards
 
+groditi: Guillermo Roditi <groditi@gmail.com>
+
 hobbs: Andrew Rodland <andrew@cleverdomain.org>
 
 ilmari: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>

diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm
index d94f3f0..2cf1bd3 100644 (file)
--- a/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@ -7,7 +7,7 @@ BEGIN { require 5.008004; }
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION='5.80011';
+our $VERSION='5.80012';
 
 $VERSION = eval $VERSION;
 

diff --git a/t/aggregate/live_engine_request_escaped_path.t b/t/aggregate/live_engine_request_escaped_path.t
index fbc12ba..0512e6a 100644 (file)
--- a/t/aggregate/live_engine_request_escaped_path.t
+++ b/t/aggregate/live_engine_request_escaped_path.t
@@ -54,8 +54,6 @@ Index: lib/Catalyst/Engine/CGI.pm
 }
 
 # test that request with URL-escaped code works.
-TODO: {
-    local $TODO = 'Actions should match when path parts are url encoded';
     my $request = Catalyst::Utils::request( 'http://localhost/args/param%73/one/two' );
     my $cgi     = HTTP::Request::AsCGI->new( $request, %ENV )->setup;
 
@@ -67,6 +65,8 @@ TODO: {
     TestApp->handle_request( env => \%ENV );
 
     ok( my $response = $cgi->restore->response );
+TODO: {
+    local $TODO = 'Actions should match when path parts are url encoded';
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content, 'onetwo' );
 }