merge gsoc_breadboard_moved_setup_component

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4d1be14..a19de10 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1443,11 +1443,13 @@ sub components {
     my ( $class, $comps ) = @_;
 
     # people create components calling this sub directly, before setup
-    $class->setup_config unless my $container = $class->container;
+    $class->setup_config unless $class->container;
+
+    my $container = $class->container;
 
     if ( $comps ) {
         $container->add_component(
-            $_, $class->setup_component($_)
+            $_, $class
         ) for keys %$comps;
     }
 
@@ -2314,9 +2316,6 @@ each component into the application.
 
 The C<setup_components> config option is passed to both of the above methods.
 
-Installation of each component is performed by the L<setup_component> method,
-below.
-
 =cut
 
 sub setup_components {
@@ -2347,12 +2346,12 @@ sub setup_components {
         Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
     }
 
+    my $container = $class->container;
+
     for my $component (@comps) {
-        my $instance = $class->setup_component($component);
-        $class->container->add_component( $component, $instance );
-        my @expanded_components = $instance->can('expand_modules')
-            ? $instance->expand_modules( $component, $config )
-            : $class->expand_component_module( $component, $config );
+        $container->add_component( $component, $class );
+# FIXME - $instance->expand_modules() is broken
+        my @expanded_components = $class->expand_component_module( $component, $config );
         for my $component (@expanded_components) {
             next if $comps{$component};
 
@@ -2361,12 +2360,12 @@ sub setup_components {
                 qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
             ) if $deprecatedcatalyst_component_names;
 
-            $class->container->add_component( $component, $class->setup_component($component) );
+            $container->add_component( $component, $class );
         }
     }
 
-    $class->container->get_sub_container('model')->make_single_default;
-    $class->container->get_sub_container('view')->make_single_default;
+    $container->get_sub_container('model')->make_single_default;
+    $container->get_sub_container('view')->make_single_default;
 }
 
 
@@ -2409,47 +2408,6 @@ sub expand_component_module {
     return Devel::InnerPackage::list_packages( $module );
 }
 
-=head2 $c->setup_component
-
-=cut
-
-## FIXME - Why the hell do we try calling the ->COMPONENT method twice, this is madness!?!
-sub setup_component {
-    my( $class, $component ) = @_;
-
-    unless ( $component->can( 'COMPONENT' ) ) {
-        return $component;
-    }
-
-    my $suffix = Catalyst::Utils::class2classsuffix( $component );
-    my $config = $class->config->{ $suffix } || {};
-    # Stash catalyst_component_name in the config here, so that custom COMPONENT
-    # methods also pass it. local to avoid pointlessly shitting in config
-    # for the debug screen, as $component is already the key name.
-    local $config->{catalyst_component_name} = $component;
-
-    my $instance = eval { $component->COMPONENT( $class, $config ); };
-
-    if ( my $error = $@ ) {
-        chomp $error;
-        Catalyst::Exception->throw(
-            message => qq/Couldn't instantiate component "$component", "$error"/
-        );
-    }
-    elsif (!blessed $instance) {
-        my $metaclass = Moose::Util::find_meta($component);
-        my $method_meta = $metaclass->find_method_by_name('COMPONENT');
-        my $component_method_from = $method_meta->associated_metaclass->name;
-        my $value = defined($instance) ? $instance : 'undef';
-        Catalyst::Exception->throw(
-            message =>
-            qq/Couldn't instantiate component "$component", COMPONENT() method (from $component_method_from) didn't return an object-like value (value was $value)./
-        );
-    }
-
-    return $instance;
-}
-
 =head2 $c->setup_dispatcher
 
 Sets up dispatcher.

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 71bc69c..040dc83 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -6,6 +6,7 @@ use Data::Visitor::Callback;
 use Catalyst::Utils ();
 use Hash::Util qw/lock_hash/;
 use MooseX::Types::LoadableClass qw/ LoadableClass /;
+use Moose::Util;
 use Catalyst::IOC::BlockInjection;
 use namespace::autoclean;
 
@@ -523,9 +524,7 @@ sub get_all_components {
 }
 
 sub add_component {
-# FIXME I'm aware it shouldn't be getting $instance as an argument
-# and that setup_component should be removed. This is temporary
-    my ( $self, $component, $instance ) = @_;
+    my ( $self, $component, $class ) = @_;
     my ( $type, $name ) = _get_component_type_name($component);
 
     return unless $type;
@@ -533,7 +532,7 @@ sub add_component {
     $self->get_sub_container($type)->add_service(
         Catalyst::IOC::BlockInjection->new(
             name  => $name,
-            block => sub { $instance },
+            block => sub { $self->setup_component( $component, $class ) },
         )
     );
 }
@@ -560,6 +559,48 @@ sub _get_component_type_name {
     return (undef, $component);
 }
 
+# FIXME ugly and temporary
+# Just moved it here the way it was, so we can work on it here in the container
+sub setup_component {
+    my ( $self, $component, $class ) = @_;
+
+    unless ( $component->can( 'COMPONENT' ) ) {
+        return $component;
+    }
+
+    # FIXME I know this isn't the "Dependency Injection" way of doing things,
+    # its just temporary
+    my $suffix = Catalyst::Utils::class2classsuffix( $component );
+    my $config = $self->resolve(service => 'config')->{ $suffix } || {};
+
+    # Stash catalyst_component_name in the config here, so that custom COMPONENT
+    # methods also pass it. local to avoid pointlessly shitting in config
+    # for the debug screen, as $component is already the key name.
+    local $config->{catalyst_component_name} = $component;
+
+    my $instance = eval { $component->COMPONENT( $class, $config ); };
+
+    if ( my $error = $@ ) {
+        chomp $error;
+        Catalyst::Exception->throw(
+            message => qq/Couldn't instantiate component "$component", "$error"/
+        );
+    }
+    elsif (!blessed $instance) {
+        my $metaclass = Moose::Util::find_meta($component);
+        my $method_meta = $metaclass->find_method_by_name('COMPONENT');
+        my $component_method_from = $method_meta->associated_metaclass->name;
+        my $value = defined($instance) ? $instance : 'undef';
+        Catalyst::Exception->throw(
+            message =>
+            qq/Couldn't instantiate component "$component", COMPONENT() method (from $component_method_from) didn't return an object-like value (value was $value)./
+        );
+    }
+
+    return $instance;
+}
+
+
 1;
 
 __END__
@@ -671,6 +712,8 @@ Searches for components in all containers. If $component is the full class name,
 
 Finds components that match a given regexp. Used internally, by find_component.
 
+=head2 setup_component
+
 =head2 _fix_syntax
 
 =head2 _config_substitutions