Base takes namespace from self if object

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Base.pm

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index eb1adeb..16eae62 100644 (file)
--- 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} )
       || '';
@@ -158,8 +159,7 @@ sub create_action {
                     : $self->_action_class);
 
     unless ( Class::Inspector->loaded($class) ) {
-      $class->require;
-      die "Couldn't load action class ${class}: $@" if $@;
+        require Class::Inspector->filename($class);
     }
     
     return $class->new( \%args );
@@ -167,7 +167,9 @@ sub create_action {
 
 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)
@@ -178,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 {