[Catalyst-commits] r9640 - in Catalyst-Runtime/5.80/branches/register_actions: . lib lib/Catalyst

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-04-02 01:49:35 +0100 (Thu, 02 Apr 2009)
New Revision: 9640

Modified:
   Catalyst-Runtime/5.80/branches/register_actions/Changes
   Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst.pm
   Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm
Log:
Tidy error, remove debug, tidy warn.

Modified: Catalyst-Runtime/5.80/branches/register_actions/Changes
===================================================================
--- Catalyst-Runtime/5.80/branches/register_actions/Changes	2009-04-02 00:40:57 UTC (rev 9639)
+++ Catalyst-Runtime/5.80/branches/register_actions/Changes	2009-04-02 00:49:35 UTC (rev 9640)
@@ -1,5 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+        - 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

Modified: Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm	2009-04-02 00:40:57 UTC (rev 9639)
+++ Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst/Controller.pm	2009-04-02 00:49:35 UTC (rev 9640)
@@ -181,7 +181,8 @@
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
     my $meta = find_meta($self);
-    confess("Wrong metaclass $meta for $self - " . $meta->name)
+    confess("Metaclass for " . ref($meta) ." for " . $meta->name 
+        . " cannot support register_actions.")
         unless $meta->can('get_all_methods_with_attributes');
     my @methods = $meta->get_all_methods_with_attributes;
 

Modified: Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst.pm	2009-04-02 00:40:57 UTC (rev 9639)
+++ Catalyst-Runtime/5.80/branches/register_actions/lib/Catalyst.pm	2009-04-02 00:49:35 UTC (rev 9640)
@@ -2085,8 +2085,6 @@
 sub setup_component {
     my( $class, $component ) = @_;
 
-
-    #warn("Component $component has meta " . $component->meta);
     unless ( $component->can( 'COMPONENT' ) ) {
         return $component;
     }