X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=68e8b425ff5a0de83c844e0855e4a41bf15bff94;hp=ec536ae893682f760602fd029ed0149afaf49a0d;hb=5d8129e9b7bea385dd6fda9b490e7923f61eedd0;hpb=fd0434d760ec012f2031da332c959463e1466ef2 diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm index ec536ae..68e8b42 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 Class::MOP::Object (); -use Scalar::Util qw/blessed/; +use namespace::clean -except => 'meta'; + +BEGIN { extends qw/Catalyst::Component MooseX::MethodAttributes::Inheritable/; } + +use MooseX::MethodAttributes; use Catalyst::Exception; use Catalyst::Utils; +with 'Catalyst::Component::ApplicationAttribute'; + has path_prefix => ( is => 'rw', @@ -25,33 +29,19 @@ has action_namespace => predicate => 'has_action_namespace', ); -has actions => +has _controller_actions => ( is => 'rw', isa => 'HashRef', 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} || {}; my $actions = delete $args->{actions} || {}; my $attr_value = $self->merge_config_hashes($actions, $action); - $self->actions($attr_value); + $self->_controller_actions($attr_value); } =head1 NAME @@ -63,9 +53,9 @@ Catalyst::Controller - Catalyst Controller base class package MyApp::Controller::Search use base qw/Catalyst::Controller/; - sub foo : Local { + sub foo : Local { my ($self,$c,@args) = @_; - ... + ... } # Dispatches to /search/foo =head1 DESCRIPTION @@ -138,7 +128,7 @@ sub action_for { return $app->dispatcher->get_action($name, $self->action_namespace); } -#my opinion is that this whole sub really should be a builder method, not +#my opinion is that this whole sub really should be a builder method, not #something that happens on every call. Anyone else disagree?? -- groditi ## -- apparently this is all just waiting for app/ctx split around action_namespace => sub { @@ -185,42 +175,57 @@ around path_prefix => sub { return $namespace; }; +sub get_action_methods { + my $self = shift; + my $meta = find_meta($self); + confess("Metaclass for " + . ref($meta) . " for " + . $meta->name + . " cannot support register_actions." ) + unless $meta->can('get_nearest_methods_with_attributes'); + my @methods = $meta->get_nearest_methods_with_attributes; + + # actions specified via config are also action_methods + push( + @methods, + map { + $meta->get_method($_) + || confess( 'Action "' + . $_ + . '" is not available from controller ' + . ( ref $self ) ) + } keys %{ $self->_controller_actions } + ) if ( ref $self ); + return @methods; +} + sub register_actions { my ( $self, $c ) = @_; + $self->register_action_methods( $c, $self->get_action_methods ); +} + +sub register_action_methods { + my ( $self, $c, @methods ) = @_; 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 %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 - #moose todo: migrate to eliminate CDI compat - my @action_cache; - for my $isa ( $meta->superclasses, $class ) { - if(my $coderef = $isa->can('_action_cache')){ - push(@action_cache, @{ $isa->$coderef }); - } - } - foreach my $cache (@action_cache) { - my $code = $cache->[0]; - my $method = delete $methods{$code}; # avoid dupe registers - next unless $method; - my $attrs = $self->_parse_attrs( $c, $method, @{ $cache->[1] } ); + foreach my $method (@methods) { + my $name = $method->name; + my $attributes = $method->attributes; + my $attrs = $self->_parse_attrs( $c, $name, @{ $attributes } ); if ( $attrs->{Private} && ( keys %$attrs > 1 ) ) { $c->log->debug( 'Bad action definition "' - . join( ' ', @{ $cache->[1] } ) - . qq/" for "$class->$method"/ ) + . join( ' ', @{ $attributes } ) + . qq/" for "$class->$name"/ ) if $c->debug; next; } - my $reverse = $namespace ? "${namespace}/${method}" : $method; + my $reverse = $namespace ? "${namespace}/${name}" : $name; my $action = $self->create_action( - name => $method, - code => $code, + name => $name, + code => $method->body, reverse => $reverse, namespace => $namespace, class => $class, @@ -269,7 +274,7 @@ sub _parse_attrs { # superior while mantaining really high degree of compat my $actions; if( ref($self) ) { - $actions = $self->actions; + $actions = $self->_controller_actions; } else { my $cfg = $self->config; $actions = $self->merge_config_hashes($cfg->{actions}, $cfg->{action}); @@ -340,7 +345,7 @@ sub _parse_LocalRegex_attr { my $prefix = $self->path_prefix( $c ); $prefix .= '/' if length( $prefix ); - + return ( 'Regex', "^${prefix}${value}" ); } @@ -385,9 +390,8 @@ sub _parse_PathPrefix_attr { sub _parse_ActionClass_attr { my ( $self, $c, $name, $value ) = @_; - unless ( $value =~ s/^\+// ) { - $value = join('::', $self->_action_class, $value ); - } + my $appname = $self->_application; + $value = Catalyst::Utils::resolve_namespace($appname . '::Action', $self->_action_class, $value); return ( 'ActionClass', $value ); } @@ -400,8 +404,6 @@ sub _parse_MyAction_attr { return ( 'ActionClass', $value ); } -no Moose; - __PACKAGE__->meta->make_immutable; 1; @@ -422,28 +424,22 @@ controller name. For instance controller 'MyApp::Controller::Foo::Bar' will be bound to 'foo/bar'. The default Root controller is an example of setting namespace to '' (the null string). -=head2 path +=head2 path Sets 'path_prefix', as described below. =head1 METHODS -=head2 $class->new($app, @args) +=head2 BUILDARGS ($app, @args) -Proxies through to NEXT::new and stashes the application instance as -$self->_application. +From L, stashes the application +instance as $self->_application. =head2 $self->action_for('name') Returns the Catalyst::Action object (if any) for a given method name in this component. -=head2 $self->register_actions($c) - -Finds all applicable actions for this component, creates -Catalyst::Action objects (using $self->create_action) for them and -registers them with $c->dispatcher. - =head2 $self->action_namespace($c) Returns the private namespace for actions in this component. Defaults @@ -458,13 +454,28 @@ Returns the default path prefix for :PathPrefix, :Local, :LocalRegex and relative :Path actions in this component. Defaults to the action_namespace or can be overridden from the "path" config key. +=head2 $self->register_actions($c) + +Finds all applicable actions for this component, creates +Catalyst::Action objects (using $self->create_action) for them and +registers them with $c->dispatcher. + +=head2 $self->get_action_methods() + +Returns a list of L objects, doing the +L role, which are the set of +action methods for this package. + +=head2 $self->register_action_methods($c, @methods) + +Creates action objects for a set of action methods using C< create_action >, +and registers them with the dispatcher. + =head2 $self->create_action(%args) Called with a hash of data to be use for construction of a new Catalyst::Action (or appropriate sub/alternative class) object. -Primarily designed for the use of register_actions. - =head2 $self->_application =head2 $self->_app