X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=16eae6228b3c88e19fa0e304399a427d2d3677b5;hb=9488795ca5244087fc99828f92d70769d9f80b22;hp=ea2063acd4e5d6e919b31d5fbe8c5cf1ba321449;hpb=b8f669f3c51dab87bfe9387dbaac0c07027abcfd;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index ea2063a..16eae62 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -85,7 +85,8 @@ Determine the namespace for actions in this component.
 
 sub action_namespace {
     my ( $self, $c ) = @_;
-    return $self->config->{namespace} if exists $self->config->{namespace};
+    my $hash = (ref $self ? $self : $self->config);
+    return $hash->{namespace} if exists $hash->{namespace};
     return Catalyst::Utils::class2prefix( ref($self) || $self,
         $c->config->{case_sensitive} )
       || '';
@@ -151,12 +152,24 @@ sub register_actions {
 
 sub create_action {
     my $self = shift;
-    $self->_action_class->new( { @_ } );
+    my %args = @_;
+
+    my $class = (exists $args{attributes}{ActionClass}
+                    ? $args{attributes}{ActionClass}[0]
+                    : $self->_action_class);
+
+    unless ( Class::Inspector->loaded($class) ) {
+        require Class::Inspector->filename($class);
+    }
+    
+    return $class->new( \%args );
 }
 
 sub _parse_attrs {
     my ( $self, $c, $name, @attrs ) = @_;
-    my %attributes;
+
+    my %raw_attributes;
+
     foreach my $attr (@attrs) {
 
         # Parse out :Foo(bar) into Foo => bar etc (and arrayify)
@@ -167,14 +180,25 @@ sub _parse_attrs {
             if ( defined $value ) {
                 ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
             }
+            push( @{ $raw_attributes{$key} }, $value );
+        }
+    }
+
+    my %final_attributes;
+
+    foreach my $key (keys %raw_attributes) {
+
+        foreach my $value (@{$raw_attributes{$key}}) {
+
             my $meth = "_parse_${key}_attr";
             if ( $self->can($meth) ) {
                 ( $key, $value ) = $self->$meth( $c, $name, $value );
             }
-            push( @{ $attributes{$key} }, $value );
+            push( @{ $final_attributes{$key} }, $value );
         }
     }
-    return \%attributes;
+
+    return \%final_attributes;
 }
 
 sub _parse_Global_attr {
@@ -220,6 +244,14 @@ sub _parse_LocalRegex_attr {
 
 sub _parse_LocalRegexp_attr { shift->_parse_LocalRegex_attr(@_); }
 
+sub _parse_ActionClass_attr {
+    my ( $self, $c, $name, $value ) = @_;
+    unless ( $value =~ s/^\+// ) {
+      $value = join('::', $self->_action_class, $value );
+    }
+    return ( 'ActionClass', $value );
+}
+
 =head1 SEE ALSO
 
 L<Catalyst>, L<Catalyst::Controller>.