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=6abc3d6b1c01c3234520544a6c35c4f80b00305c;hpb=f831deb1b1b468c3c884061f84c05b48722ab93c;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestAppCustomContainer/NoSugarContainer.pm b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
index 6abc3d6..d345aad 100644
--- a/t/lib/TestAppCustomContainer/NoSugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/NoSugarContainer.pm
@@ -8,100 +8,79 @@ extends 'Catalyst::IOC::Container';
 sub BUILD {
     my $self = shift;
 
-    $self->get_sub_container('component')->add_service(
-        Catalyst::IOC::ConstructorInjection->new(
-            name         => 'model_Bar',
-            class        => 'TestAppCustomContainer::Model::Bar',
-            dependencies => [
-                depends_on( '/application_name' ),
-                depends_on( '/config' ),
-                depends_on( '/model/Foo' ),
-            ],
-        )
-    );
     $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Bar',
-            dependencies => [
-                depends_on( '/model/Foo' ),
-                depends_on( '/component/model_Bar' ),
-            ],
-            block => sub {
-                my $s        = shift;
-                my $foo      = $s->param('Foo');
-                my $instance = $s->param('model_Bar');
-                return $instance;
+        Catalyst::IOC::ConstructorInjection->new(
+            name             => 'SingletonLifeCycle',
+            lifecycle        => 'Singleton',
+            class            => 'TestAppCustomContainer::Model::SingletonLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::SingletonLifeCycle',
+            dependencies     => {
+                catalyst_application => depends_on( '/catalyst_application' ),
             },
         )
     );
 
-    $self->get_sub_container('component')->add_service(
+    $self->get_sub_container('model')->add_service(
         Catalyst::IOC::ConstructorInjection->new(
-            name         => 'model_Baz',
-            class        => 'TestAppCustomContainer::Model::Baz',
-
-# FIXME - it should simply be Request (or InstancePerRequest, etc)
-# see Bread/Board/Service.pm line 47
+            name         => 'RequestLifeCycle',
             lifecycle    => '+Catalyst::IOC::LifeCycle::Request',
-            dependencies => [
-                depends_on( '/application_name' ),
-                depends_on( '/config' ),
-                depends_on( '/model/Foo' ),
-            ],
-        )
-    );
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Baz',
-            dependencies => [
-                depends_on( '/model/Foo' ),
-                depends_on( '/component/model_Baz' ),
-            ],
-            block => sub {
-                my $s        = shift;
-                my $foo      = $s->param('Foo');
-                my $instance = $s->param('model_Baz');
-                return $instance;
+            class        => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            catalyst_component_name => 'TestAppCustomContainer::Model::RequestLifeCycle',
+            dependencies => {
+                catalyst_application => depends_on( '/catalyst_application' ),
             },
         )
     );
 
-    $self->get_sub_container('model')->add_service(
-        Catalyst::IOC::BlockInjection->new(
-            name         => 'Quux',
+#    $self->get_sub_container('model')->add_service(
+#        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'),
+#            },
+#        )
+#    );
 
-# FIXME - it should probably be our
-# Catalyst::IOC::LifeCycle::Singleton
-            lifecycle    => 'Singleton',
-            dependencies => [
-                depends_on( '/component/model_Quux' ),
-            ],
-            block => sub { shift->param('model_Bar') },
-        )
-    );
+# Broken deps!?!
+#    $self->get_sub_container('model')->add_service(
+#        Catalyst::IOC::BlockInjection->new(
+#            name         => 'Quux',
+#            lifecycle    => 'Singleton',
+#            dependencies => [
+#                depends_on( '/component/model_Quux' ),
+#            ],
+#            block => sub { shift->param('model_Bar') },
+#        )
+#    );
 
-    $self->get_sub_container('component')->add_service(
-        Catalyst::IOC::ConstructorInjection->new(
-            name         => 'model_Fnar',
-            lifecycle    => 'Singleton',
-            class        => 'My::External::Class',
-            dependencies => [
-                depends_on( '/application_name' ),
-                depends_on( '/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;