[Catalyst-commits] r13012 - in Catalyst-Runtime/5.80/branches/param_filtering: . lib lib/Catalyst lib/Catalyst/DispatchType lib/Catalyst/Engine t/aggregate

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Sat Mar 6 20:29:47 GMT 2010


Author: t0m
Date: 2010-03-06 20:29:47 +0000 (Sat, 06 Mar 2010)
New Revision: 13012

Modified:
   Catalyst-Runtime/5.80/branches/param_filtering/
   Catalyst-Runtime/5.80/branches/param_filtering/Changes
   Catalyst-Runtime/5.80/branches/param_filtering/Makefile.PL
   Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst.pm
   Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/DispatchType/Index.pm
   Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Engine/FastCGI.pm
   Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Runtime.pm
   Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for.t
   Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for_action.t
Log:
 r13036 at t0mlaptop (orig r13000):  t0m | 2010-03-03 22:57:24 +0000
 The no warnings stanza does nothing, so remove it
 r13037 at t0mlaptop (orig r13001):  t0m | 2010-03-03 23:03:13 +0000
 Bump versions, expand somewhat on the changelog
 r13045 at t0mlaptop (orig r13009):  hobbs | 2010-03-05 02:16:07 +0000
 Tiny doc fix for Engine::FastCGI
 
 r13046 at t0mlaptop (orig r13010):  matthewt | 2010-03-05 03:36:57 +0000
 fix Index uri_for_action bug



Property changes on: Catalyst-Runtime/5.80/branches/param_filtering
___________________________________________________________________
Modified: svk:merge
   - 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/aggregate_more:11803
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/better_scripts:12074
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/disable_regex_fallback:11456
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/fix_path_info_decoding:12089
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/index_default_fuckage:10646
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/namespace_handling_refactor:10655
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_encode_captures_andor_args_take2:11811
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_for_utf8:12834
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:12978
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11331
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
   + 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/compres:7999
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/branches/context_go:8001
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:8533
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/Catalyst-Test-Updates:8363
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/add_captures_to_visit:9546
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/aggregate_more:11803
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/better_scripts:12074
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/disable_regex_fallback:11456
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/fix_path_info_decoding:12089
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/index_default_fuckage:10646
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/moose:7911
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/namespace_handling_refactor:10655
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_encode_captures_andor_args_take2:11811
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/branches/uri_for_utf8:12834
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.80/trunk:13010
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
6d45476b-5895-46b8-b13a-8b969fa34c98:/local/Catalyst-Runtime-better_scripts:11331
8a9521aa-ff93-41d6-9f87-b05cafcdab40:/local/cat/Catalyst-Runtime/5.80/trunk:8157
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442

Modified: Catalyst-Runtime/5.80/branches/param_filtering/Changes
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/Changes	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/Changes	2010-03-06 20:29:47 UTC (rev 13012)
@@ -1,8 +1,15 @@
 # This file documents the revision history for Perl extension Catalyst.
 
   Bug fixed:
-   - uri_for will now escape unsafe chars in captures and encode utf8 chars
+    - DispatchType::Index's uri_for_action only returns for actions registered
+      with it (prevents 'index :Path' or similar resolving to the wrong URI)
 
+5.80021 2010-03-03 23:02:01
+
+  Bug fixed:
+   - $c->uri_for will now escape unsafe characterss in captures
+     ($c->request->captures) and correctly encode utf8 charracters.
+
 5.80020 2010-02-04 06:51:18
 
   New features:

Modified: Catalyst-Runtime/5.80/branches/param_filtering/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/Makefile.PL	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/Makefile.PL	2010-03-06 20:29:47 UTC (rev 13012)
@@ -1,14 +1,12 @@
 use strict;
 use warnings;
 use inc::Module::Install 0.91;
-{   # Ensure that these get used - yes, M::I loads them for us, but if you're
-    # in author mode and don't have them installed, then the error is tres
-    # cryptic.
-    no warnings 'redefine';
-    use Module::Install::AuthorRequires;
-    use Module::Install::CheckConflicts;
-    use Module::Install::AuthorTests;
-}
+# Ensure that these get used - yes, M::I loads them for us, but if you're
+# in author mode and don't have them installed, then the error is tres
+# cryptic.
+use Module::Install::AuthorRequires;
+use Module::Install::CheckConflicts;
+use Module::Install::AuthorTests;
 
 perl_version '5.008004';
 

Modified: Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/DispatchType/Index.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/DispatchType/Index.pm	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/DispatchType/Index.pm	2010-03-06 20:29:47 UTC (rev 13012)
@@ -67,7 +67,7 @@
 sub register {
     my ( $self, $c, $action ) = @_;
 
-    $self->_actions->{ $action->reverse } = $action;
+    $self->_actions->{ $action->reverse } = $action if $action->name eq 'index';
 
     return 1;
 }
@@ -84,7 +84,7 @@
 
     return undef if @$captures;
 
-    return undef unless $action->name eq 'index';
+    return undef unless exists $self->_actions->{ $action->reverse };
 
     return "/".$action->namespace;
 }

Modified: Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Engine/FastCGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Engine/FastCGI.pm	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Engine/FastCGI.pm	2010-03-06 20:29:47 UTC (rev 13012)
@@ -297,7 +297,7 @@
 =head3 Standalone server mode
 
     FastCgiExternalServer /tmp/myapp.fcgi -socket /tmp/myapp.socket
-    Alias /myapp/ /tmp/myapp/myapp.fcgi/
+    Alias /myapp/ /tmp/myapp.fcgi/
 
     # Or, run at the root
     Alias / /tmp/myapp.fcgi/

Modified: Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Runtime.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Runtime.pm	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst/Runtime.pm	2010-03-06 20:29:47 UTC (rev 13012)
@@ -7,7 +7,7 @@
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION='5.80020';
+our $VERSION='5.80021';
 
 $VERSION = eval $VERSION;
 

Modified: Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst.pm	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/lib/Catalyst.pm	2010-03-06 20:29:47 UTC (rev 13012)
@@ -78,7 +78,7 @@
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.80020';
+our $VERSION = '5.80021';
 our $PRETTY_VERSION = $VERSION;
 
 $VERSION = eval $VERSION;

Modified: Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for.t
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for.t	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for.t	2010-03-06 20:29:47 UTC (rev 13012)
@@ -159,6 +159,17 @@
     );
 }
 
+{
+    my $index_not_private = $dispatcher->get_action_by_path(
+                             '/action/chained/argsorder/index'
+                            );
 
+    is(
+      Catalyst::uri_for( $context, $index_not_private )->as_string,
+      'http://127.0.0.1/argsorder',
+      'Return non-DispatchType::Index path for index action with args'
+    );
+}
+
 done_testing;
 

Modified: Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for_action.t
===================================================================
--- Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for_action.t	2010-03-06 01:00:00 UTC (rev 13011)
+++ Catalyst-Runtime/5.80/branches/param_filtering/t/aggregate/unit_core_uri_for_action.t	2010-03-06 20:29:47 UTC (rev 13012)
@@ -21,6 +21,8 @@
                        '/class_forward_test_method'
                      );
 
+warn $dispatcher->uri_for_action($private_action);
+
 ok(!defined($dispatcher->uri_for_action($private_action)),
    "Private action returns undef for URI");
 




More information about the Catalyst-commits mailing list