X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=2decf10dc9f7896882a4eef209da6f6a84a8a483;hb=2efad04b4d6590ecf00566d698e94622198909aa;hp=be0d75854110b7a333142150b6ba2104ca846af1;hpb=43c581537432e9e6dd82d10375e1aac4cbcff5fb;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index be0d758..2decf10 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -7,6 +7,8 @@ use Catalyst::Utils;
 use Class::C3::Adopt::NEXT;
 use MRO::Compat;
 use mro 'c3';
+use Scalar::Util 'blessed';
+use namespace::clean -except => 'meta';
 
 with 'MooseX::Emulate::Class::Accessor::Fast';
 with 'Catalyst::ClassData';
@@ -59,14 +61,27 @@ __PACKAGE__->mk_classdata('_plugins');
 __PACKAGE__->mk_classdata('_config');
 
 sub BUILDARGS {
-    my ($self) = @_;
-
-    # Temporary fix, some components does not pass context to constructor
-    my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-
-    my $args =  $self->merge_config_hashes( $self->config, $arguments );
+    my $class = shift;
+    my $args = {};
+
+    if (@_ == 1) {
+        $args = $_[0] if ref($_[0]) eq 'HASH';
+    } elsif (@_ == 2) { # is it ($app, $args) or foo => 'bar' ?
+        if (blessed($_[0])) {
+            $args = $_[1] if ref($_[1]) eq 'HASH';
+        } elsif (Class::MOP::is_class_loaded($_[0]) &&
+                $_[0]->isa('Catalyst') && ref($_[1]) eq 'HASH') {
+            $args = $_[1];
+        } elsif ($_[0] == $_[1]) {
+            $args = $_[1];
+        } else {
+            $args = +{ @_ };
+        }
+    } elsif (@_ % 2 == 0) {
+        $args = +{ @_ };
+    }
 
-    return $args;
+    return $class->merge_config_hashes( $class->config, $args );
 }
 
 sub COMPONENT {
@@ -97,15 +112,16 @@ sub config {
         # this is a bit of a kludge, required to make
         # __PACKAGE__->config->{foo} = 'bar';
         # work in a subclass.
+        # TODO maybe this should be a ClassData option?
         my $class = blessed($self) || $self;
         my $meta = Class::MOP::get_metaclass_by_name($class);
         unless ($meta->has_package_symbol('$_config')) {
-
-            $config = $self->merge_config_hashes( $config, {} );
-            $self->_config( $config );
+            # Call merge_hashes to ensure we deep copy the parent
+            # config onto the subclass
+            $self->_config( Catalyst::Utils::merge_hashes($config, {}) );
         }
     }
-    return $config;
+    return $self->_config;
 }
 
 sub merge_config_hashes {
@@ -120,9 +136,8 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
-no Moose;
-
 __PACKAGE__->meta->make_immutable;
+
 1;
 
 __END__
@@ -134,15 +149,27 @@ __END__
 Called by COMPONENT to instantiate the component; should return an object
 to be stored in the application's component hash.
 
-=head2 COMPONENT($c, $arguments)
+=head2 COMPONENT
+
+C<< my $component_instance = $component->COMPONENT($app, $arguments); >>
 
 If this method is present (as it is on all Catalyst::Component subclasses,
 it is called by Catalyst during setup_components with the application class
 as $c and any config entry on the application for this component (for example,
 in the case of MyApp::Controller::Foo this would be
-MyApp->config->{'Controller::Foo'}). The arguments are expected to be a
-hashref and are merged with the __PACKAGE__->config hashref before calling
-->new to instantiate the component.
+C<< MyApp->config('Controller::Foo' => \%conf >>).
+The arguments are expected to be a hashref and are merged with the
+C<< __PACKAGE__->config >> hashref before calling C<< ->new >>
+to instantiate the component.
+
+You can override it in your components to do custom instantiation, using
+something like this:
+
+  sub COMPONENT {
+      my ($class, $app, $args) = @_;
+      $args = $self->merge_config_hashes($self->config, $args);
+      return $class->new($app, $args);
+  }
 
 =head2 $c->config
 
@@ -190,7 +217,7 @@ Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut