forgot name in the default_model service

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

diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 9b27e25..c2e75bf 100644 (file)
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -10,12 +10,6 @@ use namespace::autoclean;
 
 extends 'Bread::Board::Container';
 
-has disable_regex_fallback => (
-    is      => 'ro',
-    isa     => 'Bool',
-    default => 1,
-);
-
 has config_local_suffix => (
     is      => 'ro',
     isa     => 'Str',
@@ -62,6 +56,8 @@ sub BUILD {
     $self->add_service(
         $self->${\"build_${_}_service"}
     ) for qw/
+        default_view
+        default_model
         substitutions
         file
         driver
@@ -88,8 +84,7 @@ sub build_model_subcontainer {
     my $self = shift;
 
     return $self->new_sub_container(
-        name                   => 'model',
-        disable_regex_fallback => $self->disable_regex_fallback,
+        name => 'model',
     );
 }
 
@@ -97,8 +92,7 @@ sub build_view_subcontainer {
     my $self = shift;
 
     return $self->new_sub_container(
-        name                   => 'view',
-        disable_regex_fallback => $self->disable_regex_fallback,
+        name => 'view',
     );
 }
 
@@ -106,8 +100,27 @@ sub build_controller_subcontainer {
     my $self = shift;
 
     return $self->new_sub_container(
-        name                   => 'controller',
-        disable_regex_fallback => $self->disable_regex_fallback,
+        name => 'controller',
+    );
+}
+
+sub build_default_model_service {
+    Bread::Board::BlockInjection->new(
+        name => 'default_model',
+        block => sub {
+            shift->param('config')->{default_model};
+        },
+        dependencies => [ depends_on('config') ],
+    );
+}
+
+sub build_default_view_service {
+    Bread::Board::BlockInjection->new(
+        name => 'default_view',
+        block => sub {
+            shift->param('config')->{default_view};
+        },
+        dependencies => [ depends_on('config') ],
     );
 }
 
@@ -389,6 +402,40 @@ sub _config_substitutions {
     return $arg;
 }
 
+sub get_component_from_sub_container {
+    my ( $self, $sub_container_name, $name, $c, @args ) = @_;
+
+    my $sub_container = $self->get_sub_container( $sub_container_name );
+
+    if (!$name) {
+        my $default_name = 'default_' . $sub_container_name;
+        my $default      = $self->resolve( service => $default_name )
+            if $self->has_service($default_name);
+
+        return $sub_container->get_component( $default, $c, @args )
+            if $default && $sub_container->has_service( $default );
+
+        # this is never a controller, so this is safe
+        $c->log->warn( "Calling \$c->$sub_container_name() is not supported unless you specify one of:" );
+        $c->log->warn( "* \$c->config(default_$sub_container_name => 'the name of the default $sub_container_name to use')" );
+        $c->log->warn( "* \$c->stash->{current_$sub_container_name} # the name of the view to use for this request" );
+        $c->log->warn( "* \$c->stash->{current_${sub_container_name}_instance} # the instance of the $sub_container_name to use for this request" );
+    }
+
+    return $sub_container->get_component_regexp( $name, $c, @args )
+        if ref $name;
+
+    return $sub_container->get_component( $name, $c, @args )
+        if $sub_container->has_service( $name );
+
+    $c->log->warn(
+        "Attempted to use $sub_container_name '$name', " .
+        "but it does not exist"
+    );
+
+    return;
+}
+
 1;
 
 __END__
@@ -407,6 +454,10 @@ Catalyst::Container - IOC for Catalyst components
 
 =head2 build_controller_subcontainer
 
+=head2 build_default_model_service
+
+=head2 build_default_view_service
+
 =head2 build_name_service
 
 =head2 build_driver_service