X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestAppCustomContainer%2FNoSugarContainer.pm;h=d345aad0925d47cf183bfbb8a45a3ce935e05598;hb=96c9f5d4c9cebf815970a5ea94b90ad693ebaa93;hp=10f50fd2927cc421702a18dde04ad1ac2bf3bede;hpb=04189a0f6c54fc880f1688dc28785016671f5d34;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index 10f50fd..d345aad 100644
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -8,7 +8,6 @@ extends 'Catalyst::IOC::Container';
 sub BUILD {
     my $self = shift;
 
-    warn("Add Bar to model");
     $self->get_sub_container('model')->add_service(
         Catalyst::IOC::ConstructorInjection->new(
             name             => 'SingletonLifeCycle',
@@ -16,32 +15,33 @@ sub BUILD {
             class            => 'TestAppCustomContainer::Model::SingletonLifeCycle',
             catalyst_component_name => 'TestAppCustomContainer::Model::SingletonLifeCycle',
             dependencies     => {
-                application_name => depends_on( '/application_name' ),
-                foo => depends_on('/model/DefaultSetup'),
+                catalyst_application => depends_on( '/catalyst_application' ),
+            },
+        )
+    );
+
+    $self->get_sub_container('model')->add_service(
+        Catalyst::IOC::ConstructorInjection->new(
+            name         => 'RequestLifeCycle',
+            lifecycle    => '+Catalyst::IOC::LifeCycle::Request',
+            class        => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            dependencies => {
+                catalyst_application => depends_on( '/catalyst_application' ),
             },
         )
     );
 
 #    $self->get_sub_container('model')->add_service(
-#        # FIXME - i think it should be a ConstructorInjection
-#        # but only BlockInjection gets ctx parameter
-#        Catalyst::IOC::BlockInjection->new(
-#            name         => 'Baz',
-#            lifecycle    => '+Catalyst::IOC::LifeCycle::Request',
-#            dependencies => [
-#                Bread::Board::Dependency->new(
-#                    service_name => 'foo',
-#                    service_path => 'Foo',
-#
-#                    # FIXME - same as above
-#                    service_params => {
-#                        ctx => +{},
-#                        accept_context_args => [ +{} ],
-#                    },
-#                ),
-#            ],
-#            block => sub {
-#                TestAppCustomContainer::Model::Baz->new(foo => shift->param('foo'));
+#        Catalyst::IOC::ConstructorInjection->new(
+#            name             => 'DependsOnDefaultSetup',
+#            class            => 'TestAppCustomContainer::Model::DependsOnDefaultSetup',
+#            catalyst_component_name => 'TestAppCustomContainer::Model::DependsOnDefaultSetup',
+#            dependencies     => {
+#                catalyst_application => depends_on( '/catalyst_application' ),
+#                # FIXME - this is what is blowing up everything:
+#                # DefaultSetup needs the context. It's not getting it here!
+#                foo => depends_on('/model/DefaultSetup'),
 #            },
 #        )
 #    );
@@ -58,29 +58,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( '/catalyst_application' ),
+#            ],
+#            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;