X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=53e06a987495eeb475945025282a5e6a2a8e5b54;hb=3d754f5852a61d0f5ba6321385d2ddb5bbb27ae5;hp=e6a9f4d8e7bf03dbd1cb4eb579966bb79a62e0c1;hpb=1c1bb322fd27968c04987a1b65c0144a99ba7284;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e6a9f4d..53e06a9 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -27,6 +27,7 @@ use URI::https;
 use Tree::Simple qw/use_weak_refs/;
 use Tree::Simple::Visitor::FindByUID;
 use Class::C3::Adopt::NEXT;
+use List::Util qw/first/;
 use List::MoreUtils qw/uniq/;
 use attributes;
 use utf8;
@@ -66,7 +67,7 @@ our $GO        = Catalyst::Exception::Go->new;
 
 #I imagine that very few of these really need to be class variables. if any.
 #maybe we should just make them attributes with a default?
-__PACKAGE__->mk_classdata($_)
+__PACKAGE__->mk_classdata($_) # XXX FIXME - components remove from here
   for qw/container components arguments dispatcher engine log dispatcher_class
   engine_class context_class request_class response_class stats_class
   setup_finished/;
@@ -92,10 +93,12 @@ sub import {
     return if $caller eq 'main';
 
     my $meta = Moose::Meta::Class->initialize($caller);
-    unless ( $caller->isa('Catalyst') ) {
-        my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');
-        $meta->superclasses(@superclasses);
-    }
+
+    unless ( $caller->isa('Catalyst') ) { # XXX - Remove!
+        my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller'); # XXX - Remove!
+        $meta->superclasses(@superclasses); # XXX - Remove!
+    } # XXX - Remove!
+
     # Avoid possible C3 issues if 'Moose::Object' is already on RHS of MyApp
     $meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
 
@@ -677,6 +680,28 @@ sub views {
     return $c->container->get_sub_container('view')->get_service_list;
 }
 
+sub _find_component {
+    my ($c, $component, @args) = @_;
+    my @result;
+
+    my $query = ref $component
+              ? $component
+              : qr{^$component$}
+              ;
+
+    for my $subcontainer_name (qw/model view controller/) {
+        my $subcontainer = $c->container->get_sub_container($subcontainer_name);
+        my @components   = $subcontainer->get_service_list;
+        @result          = grep { m{$component} } @components;
+
+        return map { $subcontainer->get_component( $_, $c, @args ) } @result
+            if @result;
+    }
+
+    # it expects an empty list on failed searches
+    return @result;
+}
+
 =head2 $c->comp($name)
 
 =head2 $c->component($name)
@@ -694,41 +719,35 @@ component name will be returned.
 sub component {
     my ( $c, $component, @args ) = @_;
 
-    if ( $component ) {
-        my ($type, $name) = _get_component_type_name($component);
+    return sort keys %{ $c->components }
+        unless $component;
 
-        if ($type && $c->container->has_sub_container($type)) {
-            my $container = $c->container->get_sub_container($type);
+    my ($type, $name) = _get_component_type_name($component);
 
-            if( !ref $component && $container->has_service($name) ) {
-                return $container->get_component( $name, $c, @args );
-            }
+    return $c->container->get_component_from_sub_container(
+        $type, $name, $c, @args
+    ) if $type;
 
-            return $container->get_component_regexp( $name, $c, @args );
-        }
+    my @result = $c->_find_component( $component, @args );
 
-        if (ref $component) {
-            for my $subcontainer_name (qw/model view controller/) {
-                my $subcontainer = $c->container->get_sub_container($subcontainer_name);
-                my @components   = $subcontainer->get_service_list;
-                my @result       = grep { m{$component} } @components;
+    # list context for regexp searches
+    return @result if ref $component;
 
-                return map { $subcontainer->get_component( $_, $c, @args ) } @result
-                    if @result;
-            }
-        }
+    # only one component (if it's found) for string searches
+    return shift @result if @result;
 
-        # FIXME: I probably shouldn't be doing this
-        # I'm keeping it temporarily for things like $c->comp('MyApp')
-        return $c->components->{$component}
-            if exists $c->components->{$component} and !@args;
+    # FIXME: I probably shouldn't be doing this
+    # I'm keeping it temporarily for things like $c->comp('MyApp')
+    #return $c->components->{$component}
+    #    if exists $c->components->{$component} and !@args;
 
-        $c->log->warn("Looking for '$component', but nothing was found.");
+    $c->log->warn("Looking for '$component', but nothing was found.");
 
-        # I would expect to return an empty list here, but that breaks back-compat
-    }
+    # I would expect to return an empty list here, but that breaks back-compat
+    $c->log->warn("Component not found, returning the list of existing");
+    $c->log->warn("components. This behavior is going to be deprecated");
+    $c->log->warn("in future releases.");
 
-    # fallback
     return sort keys %{ $c->components };
 }
 
@@ -896,7 +915,7 @@ Please do not use this functionality in new code.
 sub plugin {
     my ( $class, $name, $plugin, @args ) = @_;
 
-    # See block comment in t/unit_core_plugin.t
+    # See block comment in t/aggregate/unit_core_plugin.t
     $class->log->warn(qq/Adding plugin using the ->plugin method is deprecated, and will be removed in Catalyst 5.81/);
 
     $class->_register_plugin( $plugin, 1 );
@@ -1026,11 +1045,11 @@ EOF
     }
 
     # Initialize our data structure
-    $class->components( {} );
+    $class->components( {} ); # XXX - Remove!
 
     $class->setup_components;
 
-    if ( $class->debug ) {
+    if ( $class->debug ) { # XXX - Fixme to be a method on the container? (Or at least get a) data structure back from the container!!
         my $column_width = Catalyst::Utils::term_width() - 8 - 9;
         my $t = Text::SimpleTable->new( [ $column_width, 'Class' ], [ 8, 'Type' ] );
         for my $comp ( sort keys %{ $class->components } ) {
@@ -1443,6 +1462,10 @@ Returns a hash of components.
 
 =cut
 
+# FIXME - We deal with ->components({'Foo' => 'Bar'})
+#         however we DO NOT deal with ->components->{Foo} = 'Bar'
+#         We should return a locked hash back to the user? So that if they try the latter, they
+#         get breakage, rather than their addition being silently ignored?
 around components => sub {
     my $orig  = shift;
     my $class = shift;
@@ -2339,6 +2362,7 @@ sub setup_components {
     my $class = shift;
 
     my $config  = $class->config->{ setup_components };
+    my $search_extra = $config->{ search_extra };
 
     my @comps = $class->locate_components($config);
     my %comps = map { $_ => 1 } @comps;
@@ -2362,7 +2386,7 @@ sub setup_components {
 
     for my $component (@comps) {
         my $instance = $class->components->{ $component } = $class->setup_component($component);
-        if ( my ($type, $name) = _get_component_type_name($component) ) {
+        if ( my ($type, $name) = _get_component_type_name($component, $search_extra) ) {
             $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $instance } ));
         }
         my @expanded_components = $instance->can('expand_modules')
@@ -2376,10 +2400,11 @@ sub setup_components {
                 qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
             ) if $deprecatedcatalyst_component_names;
 
-            if (my ($type, $name) = _get_component_type_name($component)) {
+            if (my ($type, $name) = _get_component_type_name($component, $search_extra)) {
                 $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
             }
 
+            # FIXME - Remove this!!
             $class->components->{ $component } = $class->setup_component($component);
         }
     }
@@ -2388,9 +2413,19 @@ sub setup_components {
     $containers->{view}->make_single_default;
 }
 
+# FIXME: should this sub exist?
+# should it be moved to Catalyst::Utils,
+# or replaced by something already existing there?
 sub _get_component_type_name {
-    my $component = shift;
-    my @parts     = split /::/, $component;
+    my ( $component, $search_extra) = @_;
+    $search_extra ||= [];
+    my @search_extra = map { s/^:://; lc $_ } @$search_extra;
+
+    my @parts = split /::/, $component;
+
+    if (scalar @parts == 1) {
+        return (undef, $component);
+    }
 
     while (my $type = shift @parts) {
         return ('controller', join '::', @parts)
@@ -2401,9 +2436,20 @@ sub _get_component_type_name {
 
         return ('view', join '::', @parts)
             if $type =~ /^(v|view)$/i;
+
+        return (_get_component_type($component), join '::', @parts)
+            if @search_extra and ( grep { lc $type eq $_ } @search_extra );
     }
 }
 
+sub _get_component_type {
+    my ( $instance ) = @_;
+
+    return 'controller' if $instance->isa('Catalyst::Controller');
+    return 'model'      if $instance->isa('Catalyst::Model');
+    return 'view'       if $instance->isa('Catalyst::View');
+}
+
 =head2 $c->locate_components( $setup_component_config )
 
 This method is meant to provide a list of component modules that should be
@@ -2452,6 +2498,7 @@ sub expand_component_module {
 
 =cut
 
+## FIXME - Why the hell do we try calling the ->COMPONENT method twice, this is madness!?!
 sub setup_component {
     my( $class, $component ) = @_;