implement set_root_container and friends

2 files changed, 83 insertions, 5 deletions

diff --git a/lib/Bread/Board.pm b/lib/Bread/Board.pm
index 39b5a4b..eecec5c 100644
--- a/lib/Bread/Board.pm
+++ b/lib/Bread/Board.pm
@@ -360,19 +360,36 @@ role Singleton does Lifecycle is export {
 }
 
 our $CC;
+our $in_container = False;
+
+our sub set_root_container (Container $c) {
+    die "Can't set the root container when we're already in a container"
+        if $in_container;
+    $CC = $c;
+}
 
 proto container is export {*}
-multi container (Container $c, Callable $body) {
+multi container (Container $c, Callable $body = sub {}) {
     $CC.add_sub_container($c)
         if $CC;
-    temp $CC = $c;
-    $body.();
+    # PERL6: temp doesn't work properly in multisubs
+    #temp $CC = $c;
+    #temp $in_container = True;
+    #$body.();
+    my $old_CC = $CC;
+    my $old_in_container = $in_container;
+    $CC = $c;
+    $in_container = True;
+    {
+        LEAVE { $CC = $old_CC; $in_container = $old_in_container };
+        $body.();
+    }
     $c;
 }
-multi container (Str $name, Callable $body) {
+multi container (Str $name, Callable $body = sub {}) {
     container(Container.new(name => $name), $body);
 }
-multi container (Callable $body) {
+multi container (Callable $body = sub {}) {
     container(Container.new, $body);
 }
 
diff --git a/t/022_sugar.t b/t/022_sugar.t
new file mode 100644
index 0000000..47f0744
--- /dev/null
+++ b/t/022_sugar.t
@@ -0,0 +1,61 @@
+use v6;
+use Test;
+
+use Bread::Board;
+
+class FileLogger {
+    has $.log_file;
+}
+
+class MyApplication {
+    has FileLogger $.logger;
+}
+
+sub loggers {
+    service 'log_file', 'logfile.log';
+    service 'logger', (
+        class     => FileLogger,
+        lifecycle => Singleton,
+        dependencies => {
+            log_file => depends_on('log_file'),
+        },
+    );
+}
+
+my $c = container 'MyApp';
+
+Bread::Board::set_root_container($c);
+
+lives_ok { Bread::Board::set_root_container($c) };
+lives_ok { Bread::Board::set_root_container(Bread::Board::Container) };
+
+container $c, {
+    dies_ok { Bread::Board::set_root_container(Bread::Board::Container) };
+};
+
+Bread::Board::set_root_container($c);
+
+loggers(); # reuse baby !!!
+
+service 'application', (
+    class        => MyApplication,
+    dependencies => {
+        logger => depends_on('logger'),
+    },
+);
+
+my $logger = $c.resolve(service => 'logger');
+isa_ok($logger, FileLogger);
+is($logger.log_file, 'logfile.log');
+
+is($c.fetch('logger/log_file').service, $c.fetch('log_file'));
+is($c.fetch('logger/log_file').get, 'logfile.log');
+
+my $app = $c.resolve(service => 'application');
+isa_ok($app, MyApplication);
+isa_ok($app.logger, FileLogger);
+is($app.logger, $logger);
+
+done;
+
+# vim:ft=perl6:foldmethod=manual