new config key for injected comps

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0e50180..c50bc0f 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -710,12 +710,17 @@ sub _comp_names {
 }
 
 # Filter a component before returning by calling ACCEPT_CONTEXT if available
+
+#our %tracker = ();
 sub _filter_component {
     my ( $c, $comp, @args ) = @_;
 
+    # die "Circular Dependencies Detected." if $tracker{$comp};
+    #   $tracker{$comp}++;
     if(ref $comp eq 'CODE') {
-      $comp = $comp->();
+      $comp = $comp->($c);
     }
+    #$tracker{$comp}++;
 
     if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) {
         return $comp->ACCEPT_CONTEXT( $c, @args );
@@ -2838,41 +2843,33 @@ sub setup_components {
     }
 
     for my $component (@comps) {
-        my $instance = $class->components->{ $component } = $class->setup_component($component);
+        my $instance = $class->components->{ $component } = $class->delayed_setup_component($component);
     }
 
     # Inject a component or wrap a stand alone class in an adaptor. This makes a list
     # of named components in the configuration that are not actually existing (not a
     # real file).
-    my @configured_comps = grep { not($class->components->{$_}||'') }
-      grep { /^(Model)::|(View)::|(Controller::)/ }
-        keys %{$class->config ||+{}};
-
-    foreach my $configured_comp(@configured_comps) {
-      my $component_class = exists $class->config->{$configured_comp}->{from_component} ? 
-        delete $class->config->{$configured_comp}->{from_component} : '';
 
+    my @injected_components = keys %{$class->config->{inject_components} ||+{}};
+    foreach my $injected_comp_name(@injected_components) {
+      my $component_class = $class->config->{inject_components}->{$injected_comp_name}->{from_component} || '';
       if($component_class) {
-        my @roles = @{ exists $class->config->{$configured_comp}->{roles} ?
-          delete $class->config->{$configured_comp}->{roles} : [] };
+        my @roles = @{$class->config->{inject_components}->{$injected_comp_name}->{roles} ||[]};
+        my %args = %{ $class->config->{$injected_comp_name} || +{} };
 
-        my %args = %{ exists $class->config->{$configured_comp}->{args} ? 
-          delete $class->config->{$configured_comp}->{args} : +{} };
-
-        $class->config->{$configured_comp} = \%args;
         Catalyst::Utils::inject_component(
           into => $class,
           component => $component_class,
           (scalar(@roles) ? (traits => \@roles) : ()),
-          as => $configured_comp);
+          as => $injected_comp_name);
       }
     }
 
     # All components are registered, now we need to 'init' them.
     foreach my $component_name (keys %{$class->components||{}}) {
-      $class->components->{$component_name} = $class->components->{$component_name}->();
+      $class->components->{$component_name} = $class->components->{$component_name}->() if
+      (ref($class->components->{$component_name}) || '') eq 'CODE';
     }
-
 }
 
 =head2 $c->locate_components( $setup_component_config )
@@ -2916,6 +2913,21 @@ sub expand_component_module {
     return Devel::InnerPackage::list_packages( $module );
 }
 
+=head2 $app->delayed_setup_component
+
+Returns a coderef that points to a setup_component instance.  Used
+internally for when you want to delay setup until the first time
+the component is called.
+
+=cut
+
+sub delayed_setup_component {
+  my($class, $component, @more) = @_;
+  return sub {
+    return my $instance = $class->setup_component($component, @more);
+  };
+}
+
 =head2 $c->setup_component
 
 =cut
@@ -2923,7 +2935,6 @@ sub expand_component_module {
 sub setup_component {
     my( $class, $component ) = @_;
 
-return sub {
     unless ( $component->can( 'COMPONENT' ) ) {
         return $component;
     }
@@ -2956,19 +2967,17 @@ return sub {
         );
     }
 
-my @expanded_components = $instance->can('expand_modules')
-  ? $instance->expand_modules( $component, $config )
-  : $class->expand_component_module( $component, $config );
-for my $component (@expanded_components) {
-  next if $class->components->{ $component };
-  $class->components->{ $component } = $class->setup_component($component);
-}
+    my @expanded_components = $instance->can('expand_modules')
+      ? $instance->expand_modules( $component, $config )
+      : $class->expand_component_module( $component, $config );
+    for my $component (@expanded_components) {
+      next if $class->components->{ $component };
+      $class->components->{ $component } = $class->setup_component($component);
+    }
 
     return $instance; 
 }
 
-}
-
 =head2 $c->setup_dispatcher
 
 Sets up dispatcher.