package Catalyst::Controller;
+#switch to BEGIN { extends qw/ ... /; } ?
+use base qw/Catalyst::Component Catalyst::AttrContainer/;
use Moose;
-use Class::MOP ();
-#use MooseX::ClassAttribute;
+
+use Scalar::Util qw/blessed/;
use Catalyst::Exception;
use Catalyst::Utils;
use Class::Inspector;
-use NEXT;
-
-#extends qw/Catalyst::Component Catalyst::AttrContainer/;
-use base qw/Catalyst::Component Catalyst::AttrContainer/;
-
-# class_has _dispatch_steps =>
-# (
-# is => 'rw',
-# isa => 'ArrayRef',
-# required => 1,
-# default => sub{ [qw/_BEGIN _AUTO _ACTION/] },
-# );
-
-# class_has _action_class =>
-# (
-# is => 'rw',
-# isa => 'ClassName',
-# required => 1,
-# default => sub{ 'Catalyst::Action' },
-# );
-
-__PACKAGE__->mk_classdata('_dispatch_steps');
-__PACKAGE__->mk_classdata('_action_class');
-
-__PACKAGE__->_action_class('Catalyst::Action');
-__PACKAGE__->_dispatch_steps([qw/_BEGIN _AUTO _ACTION/]);
-
-has _application => ( is => 'rw' );
-### _app as alias
-*_app = *_application;
+has path_prefix =>
+ (
+ is => 'ro',
+ isa => 'Str',
+ init_arg => 'path',
+ predicate => 'has_path_prefix',
+ );
+
+has action_namespace =>
+ (
+ is => 'ro',
+ isa => 'Str',
+ init_arg => 'namespace',
+ predicate => 'has_action_namespace',
+ );
+
+has actions =>
+ (
+ is => 'rw',
+ isa => 'HashRef',
+ init_arg => undef,
+ );
+
+# isa => 'ClassName|Catalyst' ?
+has _application => (is => 'rw');
+sub _app{ shift->_application(@_) } # eww
+
+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);
+}
=head1 NAME
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
=cut
-# just emulating old behavior. we could probably do this
-# via BUILD later or pass $app as application => $app
-around new => sub {
- my $orig = shift;
- my $self = shift;
- my $app = $_[0];
- my $new = $self->$orig(@_);
- $new->_application( $app );
- return $new;
-};
+#I think both of these could be attributes. doesn't really seem like they need
+#to ble class data. i think that attributes +default would work just fine
+__PACKAGE__->mk_classdata($_) for qw/_dispatch_steps _action_class/;
+
+__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] );
+__PACKAGE__->_action_class('Catalyst::Action');
sub _DISPATCH : Private {
return !@{ $c->error };
}
+around new => sub {
+ my $orig = shift;
+ my $self = shift;
+ my $app = $_[0];
+ my $new = $self->$orig(@_);
+ $new->_application( $app );
+ return $new;
+};
+
sub action_for {
my ( $self, $name ) = @_;
my $app = ($self->isa('Catalyst') ? $self : $self->_application);
return $app->dispatcher->get_action($name, $self->action_namespace);
}
-sub action_namespace {
- my ( $self, $c ) = @_;
- unless ( $c ) {
- $c = ($self->isa('Catalyst') ? $self : $self->_application);
+around action_namespace => sub {
+ my ( $orig, $self, $c ) = @_;
+
+ if( ref($self) ){
+ return $self->$orig if $self->has_action_namespace;
+ } else {
+ return $self->config->{namespace} if exists $self->config->{namespace};
}
- my $hash = (ref $self ? $self : $self->config); # hate app-is-class
- return $hash->{namespace} if exists $hash->{namespace};
- return Catalyst::Utils::class2prefix( ref($self) || $self,
- $c->config->{case_sensitive} )
- || '';
-}
-sub path_prefix {
- my ( $self, $c ) = @_;
- unless ( $c ) {
- $c = ($self->isa('Catalyst') ? $self : $self->_application);
+ #the following looks like a possible target for a default setting. i am not
+ #making the below the builder because i don't know if $c will vary from
+ #call to call, which would affect case sensitivitysettings -- groditi
+ my $case_s;
+ if( $c ){
+ $case_s = $c->config->{case_sensitive};
+ } else {
+ if ($self->isa('Catalyst')) {
+ $case_s = $self->config->{case_sensitive};
+ } else {
+ if (ref $self) {
+ $case_s = $self->_application->config->{case_sensitive};
+ } else {
+ confess("Can't figure out case_sensitive setting");
+ }
+ }
}
- my $hash = (ref $self ? $self : $self->config); # hate app-is-class
- return $hash->{path} if exists $hash->{path};
- return shift->action_namespace(@_);
-}
+
+ return Catalyst::Utils::class2prefix(ref($self) || $self, $case_s) || '';
+};
+
+
+around path_prefix => sub {
+ my $orig = shift;
+ my $self = shift;
+ if( ref($self) ){
+ return $self->$orig if $self->has_path_prefix;
+ } else {
+ return $self->config->{path} if exists $self->config->{path};
+ }
+ return $self->action_namespace(@_);
+};
sub register_actions {
my ( $self, $c ) = @_;
my $class = ref $self || $self;
+ #this is still not correct for some reason.
my $namespace = $self->action_namespace($c);
my %methods;
- {
- my $meth_map = $class->meta->get_method_map;
- @methods{values %$meth_map} = (keys %$meth_map);
+ if( $self->can('meta') ){
+ my $meta = $self->meta;
+ %methods = map{ $_->{code}->body => $_->{name} }
+ grep {$_->{class} ne 'Moose::Object'} #ignore Moose::Object methods
+ $meta->compute_all_applicable_methods;
+ } else { #until we are sure there's no moose stuff left...
+ $methods{ $self->can($_) } = $_
+ for @{ Class::Inspector->methods($class) || [] };
}
- #Moose TODO: something tells me that roles could kill the directly code below
# Advanced inheritance support for plugins and the like
+ #to be modified to use meta->superclasses
+ #moose todo: migrate to eliminate CDI compat
my @action_cache;
{
no strict 'refs';
if $c->debug;
next;
}
- my $reverse = $namespace ? "$namespace/$method" : $method;
+ my $reverse = $namespace ? "${namespace}/${method}" : $method;
my $action = $self->create_action(
name => $method,
code => $code,
? $args{attributes}{ActionClass}[0]
: $self->_action_class);
- #can we replace with a single call to Class::MOP::load_class() ?
- #unless ( Class::Inspector->loaded($class) ) {
- # require Class::Inspector->filename($class);
- #}
Class::MOP::load_class($class);
-
return $class->new( \%args );
}
}
}
- my $hash = (ref $self ? $self : $self->config); # hate app-is-class
-
- if (exists $hash->{actions} || exists $hash->{action}) {
- my $a = $hash->{actions} || $hash->{action};
- %raw_attributes = ((exists $a->{'*'} ? %{$a->{'*'}} : ()),
- %raw_attributes,
- (exists $a->{$name} ? %{$a->{$name}} : ()));
+ #I know that the original behavior was to ignore action if actions was set
+ # but i actually think this may be a little more sane? we can always remove
+ # the merge behavior quite easily and go back to having actions have
+ # presedence over action by modifying the keys. i honestly think this is
+ # superior while mantaining really high degree of compat
+ my $actions;
+ if( ref($self) ) {
+ $actions = $self->actions;
+ } else {
+ my $cfg = $self->config;
+ $actions = $self->merge_config_hashes($cfg->{actions}, $cfg->{action});
}
+ %raw_attributes = ((exists $actions->{'*'} ? %{$actions->{'*'}} : ()),
+ %raw_attributes,
+ (exists $actions->{$name} ? %{$actions->{$name}} : ()));
+
+
my %final_attributes;
foreach my $key (keys %raw_attributes) {
foreach my $value (ref($raw) eq 'ARRAY' ? @$raw : $raw) {
my $meth = "_parse_${key}_attr";
- if ( $self->can($meth) ) {
- ( $key, $value ) = $self->$meth( $c, $name, $value );
+ if ( my $code = $self->can($meth) ) {
+ ( $key, $value ) = $self->$code( $c, $name, $value );
}
push( @{ $final_attributes{$key} }, $value );
}
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.
projects / catagits/Catalyst-Runtime.git / blobdiff