X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=7c51d8de924b3d75a26b985a4012c0f9c1aeb328;hb=5cd3e38f295b5e88b588f4a2dbd09cb5ccb2342f;hp=a19de10f20db531f0e092251ba805d05db63d90e;hpb=10c4d3b090ae82398a7939d6ead79d40937ed834;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index a19de10..7c51d8d 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -15,9 +15,7 @@ use Catalyst::Response; use Catalyst::Utils; use Catalyst::Controller; use Data::OptList; -use Devel::InnerPackage (); use File::stat; -use Module::Pluggable::Object (); use Text::SimpleTable (); use Path::Class::Dir (); use Path::Class::File (); @@ -79,7 +77,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.80032'; +our $VERSION = '5.80033'; sub import { my ( $class, @arguments ) = @_; @@ -566,13 +564,7 @@ If you want to search for controllers, pass in a regexp as the argument. =cut -sub controller { - my ( $c, $name, @args ) = @_; - - $name ||= Catalyst::Utils::class2classshortsuffix( $c->action->class ); - - return $c->container->get_component_from_sub_container( 'controller', $name, $c, @args); -} +sub controller { shift->_lookup_mvc('controller', @_) } =head2 $c->model($name) @@ -595,20 +587,7 @@ If you want to search for models, pass in a regexp as the argument. =cut -sub model { - my ( $c, $name, @args ) = @_; - - if (ref $c && !$name) { - return $c->stash->{current_model_instance} - if $c->stash->{current_model_instance}; - - $name = $c->stash->{current_model} - if $c->stash->{current_model}; - } - - return $c->container->get_component_from_sub_container( 'model', $name, $c, @args); -} - +sub model { shift->_lookup_mvc('model', @_) } =head2 $c->view($name) @@ -631,18 +610,23 @@ If you want to search for views, pass in a regexp as the argument. =cut -sub view { - my ( $c, $name, @args ) = @_; +sub view { shift->_lookup_mvc('view', @_) } + +sub _lookup_mvc { + my ( $c, $type, $name, @args ) = @_; if (ref $c && !$name) { - return $c->stash->{current_view_instance} - if $c->stash->{current_view_instance}; + my $current_instance = $c->stash->{"current_${type}_instance"}; + return $current_instance + if $current_instance && $type ne 'controller'; - $name = $c->stash->{current_view} - if $c->stash->{current_view}; + $name = $type eq 'controller' + ? Catalyst::Utils::class2classshortsuffix($c->action->class) + : $c->stash->{"current_${type}"} + ; } - return $c->container->get_component_from_sub_container( 'view', $name, $c, @args); + return $c->container->get_component_from_sub_container($type, $name, $c, @args); } =head2 $c->controllers @@ -1033,11 +1017,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" ); } @@ -1448,9 +1432,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(); @@ -2292,10 +2274,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 } @@ -2311,102 +2293,37 @@ sub finalize_config { } This method is called internally to set up the application's components. It finds modules by calling the L method, expands them to -package names with the L method, and then installs -each component into the application. +package names with the $container->expand_component_module method, and then +installs each component into the application. The C config option is passed to both of the above methods. =cut sub setup_components { - my $class = shift; - - 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 = $class->locate_components($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 ) { - - # 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 - - Catalyst::Utils::ensure_class_loaded( $component, { ignore_loaded => 1 } ); - } - - my $container = $class->container; - - for my $component (@comps) { - $container->add_component( $component, $class ); -# FIXME - $instance->expand_modules() is broken - my @expanded_components = $class->expand_component_module( $component, $config ); - for my $component (@expanded_components) { - next if $comps{$component}; - - $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; - - $container->add_component( $component, $class ); - } - } - - $container->get_sub_container('model')->make_single_default; - $container->get_sub_container('view')->make_single_default; + shift->container->setup_components(); } - -=head2 $c->locate_components( $setup_component_config ) - -This method is meant to provide a list of component modules that should be -setup for the application. By default, it will use L. - -Specify a C config option to pass additional options directly -to L. +=head2 locate_components =cut +# FIXME - removed locate_components +# don't people mess with this method directly? +# what to do with that? + sub locate_components { - my $class = shift; - my $config = shift; + my $class = shift; - my @paths = qw( ::Controller ::C ::Model ::M ::View ::V ); - - my $locator = Module::Pluggable::Object->new( - search_path => [ map { s/^(?=::)/$class/; $_; } @paths ], - %$config - ); + $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.'); # XXX think about ditching this sort entirely - my @comps = sort { length $a <=> length $b } $locator->plugins; - - return @comps; + return sort { length $a <=> length $b } + @{ $class->container->resolve( service => 'locate_components' ) }; } -=head2 $c->expand_component_module( $component, $setup_component_config ) - -Components found by C will be passed to this method, which -is expected to return a list of component (package) names to be set up. - -=cut - -sub expand_component_module { - my ($class, $module) = @_; - return Devel::InnerPackage::list_packages( $module ); -} =head2 $c->setup_dispatcher