From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 12 Apr 2009 13:28:23 +0000 (+0000)
Subject: Merge branch 'register_actions'
X-Git-Tag: 5.80001~40
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=bafb7fb41dd4cbc70fc18a173841cebf850f5b35

Merge branch 'register_actions'

register_actions:
remove trailing whitespace
mis-rebase
split out methods to show rafl what I mean
Tidy error, remove debug, tidy warn.
And fix it properly.
We actually need Moose::Object::meta to avoid metaclass incompat fail, or at least this fixes the test..
Bump MX::MethodAttributes::Inheritable dep
Update todo having gone through all the smokes
Metaclass compatibility fail. This needs to be reduced to a test for Moose..
List of things from smokes which appear to fail here
backout, wrong branch fail
Update TODO
Use get_all_methods_with_attributes to get all possible actions.
Update prereqs.
Don't stringify the meta method. Use its name instead.
First steps towards throwing out attributes.
Create branch register_actions.

Conflicts:
Changes
Makefile.PL
---

bafb7fb41dd4cbc70fc18a173841cebf850f5b35
diff --cc Changes
index 1104d51,462377d..21e8386
--- a/Changes
+++ b/Changes
@@@ -1,28 -1,7 +1,30 @@@
  # This file documents the revision history for Perl extension Catalyst.
  
 +        - Add the Catalyst::Dispatcher->dispatch_type method (ash)
 +        - Throw an exception rather than loading an app if an action
 +          tries to chain to itself (t0m)
 +          - Tests for this
 +        - Change the $c->visit and $c->go methods to optionally take
 +          CaptureArgs, making them useful to call ActionChains with (t0m)
 +          - Tests for this (radek)
 +        - Fix _invoke_as_component method to find the proper action instance
 +          for dispatchable actions so that ->visit or ->going to ActionChains
 +          with qw/Class::Name method_name/ works correctly (t0m)
 +          - Tests for this (radek)
 +        - Added Catalyst::Test::ctx_request to be able to inspect
 +          the context object after a request is made (Jos Boumans)
 +        - debug() POD rewrite (jhannah)
 +        - Change the warning when you have conflicting components to
 +          present a list (t0m)
 +        - Move NEXT use and testing deprecated features out to its own
 +          test application so that the main TestApp isn't polluted with
 +          spurious warnings (t0m)
 +        - Add a warning for the old ::[MVC]:: style naming scheme (t0m)
 +          - Test for this (t0m)
 +        - Kill Class::C3::Adopt::NEXT warnings for the Catalyst:: namespace
 +          in production versions (t0m)
+         - Tidy up Catalyst::ClassData to ensure that all components get
+           the correct metaclass (t0m)
          - Make MyApp.pm restartable by unsetting setup_finished in
            the restarter process (t0m)
          - Non-naive implementation of making mutable on restart using
diff --cc Makefile.PL
index dfea2dc,04fe2cd..a02ffe8
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -7,11 -7,12 +7,12 @@@ all_from 'lib/Catalyst/Runtime.pm'
  
  requires 'namespace::clean';
  requires 'Scope::Upper' => '0.06';
 +requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00801';
 +requires 'Moose' => '0.73';
+ requires 'MooseX::MethodAttributes::Inheritable' => '0.05';
 -requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800';
 -requires 'Moose' => '0.70';
  requires 'Carp';
  requires 'Class::C3::Adopt::NEXT' => '0.07';
 -requires 'Class::MOP';
 +requires 'Class::MOP' => '0.79';
  requires 'CGI::Simple::Cookie';
  requires 'Data::Dump';
  requires 'File::Modified';