I'm really sorry

diff --git a/lib/Catalyst/IOC.pm b/lib/Catalyst/IOC.pm
index dbb0184..1ac807b 100644 (file)
--- a/lib/Catalyst/IOC.pm
+++ b/lib/Catalyst/IOC.pm
@@ -3,6 +3,7 @@ use strict;
 use warnings;
 use Bread::Board qw/depends_on/;
 use Catalyst::IOC::ConstructorInjection;
+no strict 'refs';
 
 # FIXME - All of these imports need to get the importing package
 #         as the customise_container and current_container variables
@@ -41,34 +42,34 @@ use Sub::Exporter -setup => {
 #Moose::Exporter->setup_import_methods(
 #    also => ['Bread::Board'],
 #);
-our $customise_container;
-our $current_container;
-
 sub container (&) {
     my $code = shift;
-    $customise_container = sub {
+    my $caller = caller;
+    ${"${caller}::customise_container"} = sub {
         warn("In customise container");
-        local $current_container = shift();
+        local ${"${caller}::current_container"} = shift;
         $code->();
     };
 }
 
 sub model (&) {
     my $code = shift;
-    local $current_container = $current_container->get_sub_container('model');
+    my $caller = caller;
+    local ${"${caller}::current_container"} = ${"${caller}::current_container"}->get_sub_container('model');
     $code->();
 }
 
 sub component {
     my ($name, %args) = @_;
+    my $caller = caller;
     $args{dependencies} ||= {};
     $args{dependencies}{application_name} = depends_on( '/application_name' );
 
     # FIXME - check $args{type} here!
 
     my $component_name = join '::', (
-        $current_container->resolve(service => '/application_name'),
-        ucfirst($current_container->name),
+        ${"${caller}::current_container"}->resolve(service => '/application_name'),
+        ucfirst(${"${caller}::current_container"}->name),
         $name
     );
 
@@ -80,7 +81,7 @@ sub component {
         #            from dependencies (like config)
         catalyst_component_name => $component_name,
     );
-    $current_container->add_service($service);
+    ${"${caller}::current_container"}->add_service($service);
 }
 
 1;

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 07d7fc5..4370a9a 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -108,6 +108,13 @@ sub BUILD {
     $self->add_sub_container(
         $self->build_model_subcontainer( @default_model )
     );
+
+    {
+        no strict 'refs';
+        my $class = ref $self;
+        warn("In build " . ${ $class . '::customise_container' });
+        ${ $class . '::customise_container' }->($self);
+    }
 }
 
 sub build_model_subcontainer {

diff --git a/t/lib/TestAppCustomContainer/SugarContainer.pm b/t/lib/TestAppCustomContainer/SugarContainer.pm
index 514ccbb..8c0bab7 100644 (file)
--- a/t/lib/TestAppCustomContainer/SugarContainer.pm
+++ b/t/lib/TestAppCustomContainer/SugarContainer.pm
@@ -2,15 +2,8 @@ package TestAppCustomContainer::SugarContainer;
 use Moose;
 use namespace::autoclean;
 use Catalyst::IOC;
-use Bread::Board qw/ depends_on /;
 extends 'Catalyst::IOC::Container';
 
-sub BUILD {
-    my $self = shift;
-    warn("In build");
-    $Catalyst::IOC::customise_container->($self);
-}
-
 container {
     model {
         component(