X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=18c825968deb622fdadddf5e6f947652658e80ca;hb=b354201608d428db344c63dd35de096a62a7a9d3;hp=ec536ae893682f760602fd029ed0149afaf49a0d;hpb=fd0434d760ec012f2031da332c959463e1466ef2;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index ec536ae..18c8259 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -1,14 +1,18 @@
 package Catalyst::Controller;
 
-#switch to BEGIN { extends qw/ ... /; } ?
-use base qw/Catalyst::Component Catalyst::AttrContainer/;
 use Moose;
+use Moose::Util qw/find_meta/;
+
+use namespace::clean -except => 'meta';
+
+# Note - Must be done at compile time due to attributes (::AttrContainer)
+BEGIN { extends qw/Catalyst::Component Catalyst::AttrContainer/; }
 
-use Class::MOP::Object ();
-use Scalar::Util qw/blessed/;
 use Catalyst::Exception;
 use Catalyst::Utils;
 
+with 'Catalyst::Component::ApplicationAttribute';
+
 has path_prefix =>
     (
      is => 'rw',
@@ -32,20 +36,6 @@ has actions =>
      init_arg => undef,
     );
 
-# Future - isa => 'ClassName|Catalyst' performance?
-#           required => 1 breaks tests..
-has _application => (is => 'ro');
-sub _app { shift->_application(@_) } 
-
-override 'BUILDARGS' => sub {
-    my ($self, $app) = @_;
-    
-    my $args = super();
-    $args->{_application} = $app;
- 
-    return $args;
-};
-
 sub BUILD {
     my ($self, $args) = @_;
     my $action  = delete $args->{action}  || {};
@@ -191,9 +181,8 @@ sub register_actions {
     my $class = ref $self || $self;
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
-    my $meta = $self->Class::MOP::Object::meta();
+    my $meta = find_meta($self);
     my %methods = map { $_->body => $_->name }
-        grep { $_->package_name ne 'Moose::Object' } #ignore Moose::Object methods
             $meta->get_all_methods;
 
     # Advanced inheritance support for plugins and the like
@@ -400,8 +389,6 @@ sub _parse_MyAction_attr {
     return ( 'ActionClass', $value );
 }
 
-no Moose;
-
 __PACKAGE__->meta->make_immutable;
 
 1;