updated test to look for exception, not warning

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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index b6d6231..6cdeb7f 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -597,11 +597,11 @@ sub model {
     my ( $c, $name, @args ) = @_;
 
     if (ref $c && !$name) {
-        return $c->stash->{current_model_instance}
-            if $c->stash->{current_model_instance};
+        my $current_instance = $c->stash->{current_model_instance};
+        return $current_instance
+            if $current_instance;
 
-        $name = $c->stash->{current_model}
-            if $c->stash->{current_model};
+        $name = $c->stash->{current_model};
     }
 
     return $c->container->get_component_from_sub_container( 'model', $name, $c, @args);
@@ -633,11 +633,11 @@ sub view {
     my ( $c, $name, @args ) = @_;
 
     if (ref $c && !$name) {
-        return $c->stash->{current_view_instance}
-            if $c->stash->{current_view_instance};
+        my $current_instance = $c->stash->{current_view_instance};
+        return $current_instance
+            if $current_instance;
 
-        $name = $c->stash->{current_view}
-            if $c->stash->{current_view};
+        $name = $c->stash->{current_view};
     }
 
     return $c->container->get_component_from_sub_container( 'view', $name, $c, @args);
@@ -1031,11 +1031,11 @@ EOF
 
     if (
         $class->debug and
-        my @comps_types = $class->container->get_components_types
+        my @comps_names_types = $class->container->get_components_names_types
     ) {
         my $column_width = Catalyst::Utils::term_width() - 8 - 9;
         my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
-        $t->row( @$_ ) for @comps_types;
+        $t->row( @$_ ) for @comps_names_types;
 
         $class->log->debug( "Loaded components:\n" . $t->draw . "\n" );
     }
@@ -1446,9 +1446,7 @@ sub components {
     my $container = $class->container;
 
     if ( $comps ) {
-        $container->add_component(
-            $_, $class
-        ) for keys %$comps;
+        $container->add_component( $_ ) for keys %$comps;
     }
 
     return $container->get_all_components();
@@ -2290,10 +2288,10 @@ sub setup_config {
 
     my $container_class = Class::MOP::load_first_existing_class(@container_classes);
 
-    my $container = $container_class->new( %args, name => "$class" );
+    my $container = $container_class->new( %args, application_name => "$class", name => "$class" );
     $class->container($container);
 
-    my $config = $container->resolve(service => 'config');
+    my $config = $container->resolve( service => 'config' );
     $class->config($config);
     $class->finalize_config; # back-compat
 }
@@ -2317,58 +2315,29 @@ The C<setup_components> config option is passed to both of the above methods.
 =cut
 
 sub setup_components {
-    my $class = shift;
-    my $container = $class->container;
-
-    my $config  = $class->config->{ setup_components };
-
-    Catalyst::Exception->throw(
-        qq{You are using search_extra config option. That option is\n} .
-        qq{deprecated, please refer to the documentation for\n} .
-        qq{other ways of achieving the same results.\n}
-    ) if delete $config->{ search_extra };
-
-    my @comps = $container->locate_components($class, $config);
-    my %comps = map { $_ => 1 } @comps;
-
-    my $deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @comps;
-    $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
-        qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
-    ) if $deprecatedcatalyst_component_names;
-
-    for my $component ( @comps ) {
+    shift->container->setup_components();
+}
 
-        # We pass ignore_loaded here so that overlay files for (e.g.)
-        # Model::DBI::Schema sub-classes are loaded - if it's in @comps
-        # we know M::P::O found a file on disk so this is safe
+=head2 locate_components
 
-        Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } );
-    }
+=cut
 
-    for my $component (@comps) {
-        $container->add_component( $component, $class );
-# FIXME - $instance->expand_modules() is broken
-        my @expanded_components = $container->expand_component_module( $component );
-        for my $component (@expanded_components) {
-            next if $comps{$component};
+# FIXME - removed locate_components
+# don't people mess with this method directly?
+# what to do with that?
 
-            # FIXME - Why is it inside the for loop? It makes no sense
-            $deprecatedcatalyst_component_names = grep { /::[CMV]::/ } @expanded_components;
-            $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
-                qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
-            ) if $deprecatedcatalyst_component_names;
+sub locate_components {
+    my $class = shift;
 
-            $container->add_component( $component, $class );
-        }
-    }
+    $class->log->warn('The locate_components method has been deprecated.');
+    $class->log->warn('Please read Catalyst::IOC::Container documentation to');
+    $class->log->warn('update your application.');
 
-    $container->get_sub_container('model')->make_single_default;
-    $container->get_sub_container('view')->make_single_default;
+    # XXX think about ditching this sort entirely
+    return sort { length $a <=> length $b }
+        @{ $class->container->resolve( service => 'locate_components' ) };
 }
 
-# FIXME - removed locate_components
-# don't people mess with this method directly?
-# what to do with that?
 
 =head2 $c->setup_dispatcher