X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=65b93bf411b1abd36075decabc8a95a53ec190d3;hp=3b9e975a3cba8ea35cf3a15ed41fbbfa41b74fee;hb=9e7f288e0bd785c69c8e54c77d951b2e878f5b8f;hpb=044e7667c0cb0cd8dac8b33df1d503abdab0d70c
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3b9e975..65b93bf 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -157,7 +157,7 @@ sub composed_stats_class {
__PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC);
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90089_001';
+our $VERSION = '5.90089_003';
$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
sub import {
@@ -199,6 +199,11 @@ sub _application { $_[0] }
Catalyst - The Elegant MVC Web Application Framework
+=for html
+
+
+
=head1 SYNOPSIS
See the L distribution for comprehensive
@@ -493,7 +498,7 @@ L<< detach|/"$c->detach( $action [, \@arguments ] )" >>. Like C<< $c->visit >>,
C<< $c->go >> will perform a full dispatch on the specified action or method,
with localized C<< $c->action >> and C<< $c->namespace >>. Like C,
C escapes the processing of the current request chain on completion, and
-does not return to its caller.
+does not return to its cunless blessed $cunless blessed $caller.
@arguments are arguments to the final destination of $action. @captures are
arguments to the intermediate steps, if any, on the way to the final sub of
@@ -542,6 +547,7 @@ t/middleware-stash.t in the distribution /t directory.
sub stash {
my $c = shift;
+ $c->log->error("You are requesting the stash but you don't have a context") unless blessed $c;
return Catalyst::Middleware::Stash::get_stash($c->req->env)->(@_);
}
@@ -714,19 +720,15 @@ sub _comp_names {
# Filter a component before returning by calling ACCEPT_CONTEXT if available
-#our %tracker = ();
sub _filter_component {
my ( $c, $comp, @args ) = @_;
- # die "Circular Dependencies Detected." if $tracker{$comp};
- # $tracker{$comp}++;
if(ref $comp eq 'CODE') {
- $comp = $comp->($c);
+ $comp = $comp->();
}
- #$tracker{$comp}++;
if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) {
- return $comp->ACCEPT_CONTEXT( $c, @args );
+ return $comp->ACCEPT_CONTEXT( $c, @args );
}
$c->log->warn("You called component '${\$comp->catalyst_component_name}' with arguments [@args], but this component does not ACCEPT_CONTEXT, so args are ignored.") if scalar(@args) && $c->debug;
@@ -2309,9 +2311,7 @@ sub prepare {
$c->response->_context($c);
- if($c->use_stats) {
- $c->stats($class->composed_stats_class->new)->enable;
- }
+ $c->stats($class->stats_class->new)->enable($c->use_stats);
if ( $c->debug || $c->config->{enable_catalyst_header} ) {
$c->res->headers->header( 'X-Catalyst' => $Catalyst::VERSION );
@@ -2853,25 +2853,49 @@ sub setup_components {
# of named components in the configuration that are not actually existing (not a
# real file).
+ my @injected_components = $class->setup_injected_components;
+
+ # All components are registered, now we need to 'init' them.
+ foreach my $component_name (@comps, @injected_components) {
+ $class->components->{$component_name} = $class->components->{$component_name}->() if
+ (ref($class->components->{$component_name}) || '') eq 'CODE';
+ }
+}
+
+=head2 $app->setup_injected_components
+
+Called by setup_compoents to setup components that are injected.
+
+=cut
+
+sub setup_injected_components {
+ my ($class) = @_;
my @injected_components = keys %{$class->config->{inject_components} ||+{}};
+
foreach my $injected_comp_name(@injected_components) {
- my $component_class = $class->config->{inject_components}->{$injected_comp_name}->{from_component} || '';
- if($component_class) {
- my @roles = @{$class->config->{inject_components}->{$injected_comp_name}->{roles} ||[]};
- my %args = %{ $class->config->{$injected_comp_name} || +{} };
+ $class->setup_injected_component(
+ $injected_comp_name,
+ $class->config->{inject_components}->{$injected_comp_name});
+ }
+
+ return @injected_components;
+}
+
+=head2 $app->setup_injected_component( $injected_component_name, $config )
+
+Setup a given injected component.
+=cut
+
+sub setup_injected_component {
+ my ($class, $injected_comp_name, $config) = @_;
+ if(my $component_class = $config->{from_component}) {
+ my @roles = @{$config->{roles} ||[]};
Catalyst::Utils::inject_component(
into => $class,
component => $component_class,
(scalar(@roles) ? (traits => \@roles) : ()),
as => $injected_comp_name);
- }
- }
-
- # All components are registered, now we need to 'init' them.
- foreach my $component_name (keys %{$class->components||{}}) {
- $class->components->{$component_name} = $class->components->{$component_name}->() if
- (ref($class->components->{$component_name}) || '') eq 'CODE';
}
}
@@ -3001,8 +3025,7 @@ sub setup_component {
return $component;
}
- my $suffix = Catalyst::Utils::class2classsuffix( $component );
- my $config = $class->config->{ $suffix } || {};
+ my $config = $class->config_for($component);
# Stash catalyst_component_name in the config here, so that custom COMPONENT
# methods also pass it. local to avoid pointlessly shitting in config
# for the debug screen, as $component is already the key name.
@@ -3040,6 +3063,33 @@ sub setup_component {
return $instance;
}
+=head2 $app->config_for( $component_name )
+
+Return the application level configuration (which is not yet merged with any
+local component configuration, via $component_class->config) for the named
+component or component object. Example:
+
+ MyApp->config(
+ 'Model::Foo' => { a => 1, b => 2},
+ );
+
+ my $config = MyApp->config_for('MyApp::Model::Foo');
+
+In this case $config is the hashref C< {a=>1, b=>2} >.
+
+This is also handy for looking up configuration for a plugin, to make sure you follow
+existing L standards for where a plugin should put its configuration.
+
+=cut
+
+sub config_for {
+ my ($class, $component_name) = @_;
+ my $component_suffix = Catalyst::Utils::class2classsuffix($component_name);
+ my $config = $class->config->{ $component_suffix } || {};
+
+ return $config;
+}
+
=head2 $c->setup_dispatcher
Sets up dispatcher.