Request - it's definitely not a Singleton, and it needs the context

[catagits/Catalyst-Runtime.git] / lib / Catalyst / IOC / LifeCycle / Request.pm

diff --git a/lib/Catalyst/IOC/LifeCycle/Request.pm b/lib/Catalyst/IOC/LifeCycle/Request.pm
index 1d6f3e3..3b277da 100644 (file)
--- a/lib/Catalyst/IOC/LifeCycle/Request.pm
+++ b/lib/Catalyst/IOC/LifeCycle/Request.pm
@@ -1,11 +1,29 @@
 package Catalyst::IOC::LifeCycle::Request;
 use Moose::Role;
 use namespace::autoclean;
-
-# based on Bread::Board::LifeCycle::Request from OX
-# just behaves like a singleton - ::Request instances
-# will get flushed after the response is sent
-with 'Bread::Board::LifeCycle::Singleton';
+with 'Bread::Board::LifeCycle';
+
+around get => sub {
+    my $orig = shift;
+    my $self = shift;
+
+    my $instance = $self->$orig(@_);
+
+# FIXME -
+# during setup in Catalyst.pm:
+#  - $class->setup_actions (line 3025)
+#      - $c->dispatcher->setup_actions (line 2271)
+#          - $c->components in Catalyst/Dispatcher.pm line 604
+# which boils down to line 616 in Catalyst/IOC/Container.pm
+# resolving the component _without_ the 'context' parameter.
+# Should it get the context parameter? Should all calls to a
+# ConstructorInjection service pass that parameter?
+    my $ctx = $self->param('ctx')
+        or return $instance;
+
+    my $stash_key = "__Catalyst_IOC_LifeCycle_Request_" . $self->name;
+    return $ctx->stash->{$stash_key} ||= $instance;
+};
 
 1;