more cleanup, fixes

diff --git a/lib/Catalyst/IOC/ConstructorInjection.pm b/lib/Catalyst/IOC/ConstructorInjection.pm
index 8062a8e..781bf3b 100644 (file)
--- a/lib/Catalyst/IOC/ConstructorInjection.pm
+++ b/lib/Catalyst/IOC/ConstructorInjection.pm
@@ -37,8 +37,8 @@ around resolve_dependencies => sub {
 
 sub get {
     my $self = shift;
-    warn("In get $self");
     my $component   = $self->class;
+    warn("In get $component");
 
     my $params = $self->params;
     my %config = (%{ $self->config }, %{ $params });

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index 350842b..79ef2ba 100644 (file)
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -22,13 +22,13 @@ sub BUILD {
         )
     );
 
+    warn("Add RequestLifeCycle to model");
     $self->get_sub_container('model')->add_service(
-        # FIXME - i think it should be a ConstructorInjection
-        # but only BlockInjection gets ctx parameter
         Catalyst::IOC::ConstructorInjection->new(
             name         => 'RequestLifeCycle',
             lifecycle    => '+Catalyst::IOC::LifeCycle::Request',
             class        => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::RequestLifeCycle',
             dependencies => {
                 application_name => depends_on( '/application_name' ),
                 foo => depends_on('/model/DefaultSetup'),
@@ -48,29 +48,29 @@ sub BUILD {
 #        )
 #    );
 
-    my $fnar_config = $self->resolve(service => 'config')->{'Model::Fnar'} || {};
-    $self->get_sub_container('component')->add_service(
-        Catalyst::IOC::ConstructorInjection->new(
-            name         => 'model_Fnar',
-            lifecycle    => 'Singleton',
-            class        => 'TestAppCustomContainer::External::Class',
-            dependencies => [
-                depends_on( '/application_name' ),
-            ],
-            config => $fnar_config,
-        )
-    );
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'model_Fnar',
-            lifecycle    => 'Singleton',
-            dependencies => [
-                depends_on( '/config' ),
-                depends_on( '/component/model_Fnar' ),
-            ],
-            block => sub { shift->param('model_Fnar') },
-        )
-    );
+#    my $fnar_config = $self->resolve(service => 'config')->{'Model::Fnar'} || {};
+#    $self->get_sub_container('component')->add_service(
+#        Catalyst::IOC::ConstructorInjection->new(
+#            name         => 'model_Fnar',
+#            lifecycle    => 'Singleton',
+#            class        => 'TestAppCustomContainer::External::Class',
+#            dependencies => [
+#                depends_on( '/application_name' ),
+#            ],
+#            config => $fnar_config,
+#        )
+#    );
+#    $self->get_sub_container('model')->add_service(
+#        Catalyst::IOC::BlockInjection->new(
+#            name         => 'model_Fnar',
+#            lifecycle    => 'Singleton',
+#            dependencies => [
+#                depends_on( '/config' ),
+#                depends_on( '/component/model_Fnar' ),
+#            ],
+#            block => sub { shift->param('model_Fnar') },
+#        )
+#    );
 }
 
 __PACKAGE__->meta->make_immutable;