From: Rafael Kitover <rkitover@io.com>
Date: Thu, 25 Jun 2009 01:05:10 +0000 (+0000)
Subject: Merge 'trunk' into 'namespace_handling_refactor'
X-Git-Tag: 5.80006~36^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d58edd2a603bb985a2f3beed0175594759b54bb3

Merge 'trunk' into 'namespace_handling_refactor'

r5375@hlagh (orig r10489):  caelum | 2009-06-09 05:46:43 -0700
added test for ->view() with one view not returning a blessed instance
r5452@hlagh (orig r10494):  t0m | 2009-06-10 08:21:32 -0700
Add conflict line to Makefile.PL for Component::ACCEPT_CONTEXT

r5453@hlagh (orig r10497):  rafl | 2009-06-10 13:16:25 -0700
This is version 5.80.
r5454@hlagh (orig r10498):  lukes | 2009-06-10 14:20:57 -0700
prevent encoding plus signs in uri_for args
r5455@hlagh (orig r10499):  dandv | 2009-06-10 23:59:56 -0700
Fixed typos, added parameters for content_like

r5456@hlagh (orig r10500):  dandv | 2009-06-11 00:10:46 -0700
Fixed run-on sentence in COPYRIGHT and s/program/library/

r5457@hlagh (orig r10501):  dandv | 2009-06-11 00:27:56 -0700
Cosmetic: removed trailing whitespace

r5458@hlagh (orig r10502):  caelum | 2009-06-11 05:42:00 -0700
fix $c->view() bug hopefully
r5540@hlagh (orig r10551):  hobbs | 2009-06-16 11:57:17 -0700
Doc patch warning of C<< $c->req->param >>'s fuzzy behavior.

r5541@hlagh (orig r10574):  t0m | 2009-06-17 09:03:51 -0700
Back out 10498 and 10097
r5542@hlagh (orig r10575):  jshirley | 2009-06-17 09:18:29 -0700
Adding failing test for uri_for behaviors
r5543@hlagh (orig r10576):  jshirley | 2009-06-17 09:19:53 -0700
Fixing test count
r5544@hlagh (orig r10579):  t0m | 2009-06-17 18:21:17 -0700
Test dinks
r5545@hlagh (orig r10581):  caelum | 2009-06-17 21:13:07 -0700
slight test fix, but test is still probably wrong
r5554@hlagh (orig r10583):  zarquon | 2009-06-18 03:47:36 -0700
attempt to test for the infamous repeating path-uri-escape evil
r5579@hlagh (orig r10594):  t0m | 2009-06-19 13:35:41 -0700
Just initialize a logger which only logs fatal errors, no mock needed
r5580@hlagh (orig r10595):  t0m | 2009-06-19 13:39:19 -0700
Remove Test::MockObject
r5581@hlagh (orig r10596):  t0m | 2009-06-19 13:39:58 -0700
Remove Test::MockObject
r5582@hlagh (orig r10597):  t0m | 2009-06-19 13:41:46 -0700
Remove MockObject
r5583@hlagh (orig r10598):  t0m | 2009-06-19 13:44:15 -0700
1 more MockObject removal
r5584@hlagh (orig r10599):  t0m | 2009-06-19 13:46:45 -0700
Remove MockObject from Makefile.PL
r5596@hlagh (orig r10605):  t0m | 2009-06-20 16:23:19 -0700
Re-add lukes specific regression test from r10498
r5597@hlagh (orig r10606):  t0m | 2009-06-20 16:25:31 -0700
Update test to be TODO, and note this case used to fail on 5.7
r5600@hlagh (orig r10609):  zarquon | 2009-06-20 17:31:39 -0700
this test is not for the regression which you seek
r5670@hlagh (orig r10612):  t0m | 2009-06-22 09:31:09 -0700
Test closures in config in the testapp. Makes everything go bang.
r5671@hlagh (orig r10613):  t0m | 2009-06-22 09:37:26 -0700
Use merge_hashes rather than dclone
r5672@hlagh (orig r10614):  t0m | 2009-06-22 11:06:48 -0700
Fix uri_for_action test by just reverting to as it was in 5.8003 before various lame tests were added and mismerged
---

d58edd2a603bb985a2f3beed0175594759b54bb3
diff --cc Changes
index 5949589,98c8727..3b28c02
--- a/Changes
+++ b/Changes
@@@ -1,10 -1,16 +1,22 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
-         - Use ~ as prefix for plugins or action classes which are located in 
-           MyApp::Plugin / MyApp::Action (mo)
-         - Controller methods without attributes are now considered actions if 
-           they are specified in config->{action(s)} (mo)
+   Bug fixes:
+         -  Revert change to URL encode things passed into $c->uri_for
+            Args and CaptureArgs as this causes breakage to pre-existing
+            applications.
+         -  Remove use of Test::MockObject as it doesn't install from CPAN
+            in some environments.
+         -  Remove use of dclone to deep copy configs and replace with
+            Catalyst::Utils::merge_hashes which has the same effect, of
+            ensuring child classes don't inherit their parent's config,
+            except works correctly with closures.
+ 
++  New features:
++        -  Use ~ as prefix for plugins or action classes which are located in 
++           MyApp::Plugin / MyApp::Action (mo)
++        -  Controller methods without attributes are now considered actions if 
++           they are specified in config->{action(s)} (mo)
 +
  5.80005 2009-06-06 14:40:00
  
    Behaviour changes:
diff --cc lib/Catalyst.pm
index 877c53c,f9ab9c4..063ee32
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -2502,9 -2509,9 +2509,9 @@@ the plugin name does not begin with C<C
  
          $class->_plugins( {} ) unless $class->_plugins;
          $plugins ||= [];
 -
 -        my @plugins = map { s/\A\+// ? $_ : "Catalyst::Plugin::$_" } @$plugins;
 +                
 +        my @plugins = Catalyst::Utils::resolve_namespace($class . '::Plugin', 'Catalyst::Plugin', @$plugins);
-         
+ 
          for my $plugin ( reverse @plugins ) {
              Class::MOP::load_class($plugin);
              my $meta = find_meta($plugin);