X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=53e9b2184ea097c922684a22bb7a9af954fe4e75;hb=4fbc0e853c0b29d1f6082909b0cb54595ea32787;hp=4ce44ede85e87ec0b5608969c970561ae9af04d6;hpb=c3f6d73a290413c26d0f2a1c100fb857a9eb9403;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4ce44ed..53e9b21 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -77,6 +77,12 @@ __PACKAGE__->stats_class('Catalyst::Stats');
# Remember to update this in Catalyst::Runtime as well!
our $VERSION = '5.8000_06';
+
+{
+ my $dev_version = $VERSION =~ /_\d{2}$/;
+ *_IS_DEVELOPMENT_VERSION = sub () { $dev_version };
+}
+
$VERSION = eval $VERSION;
sub import {
@@ -90,7 +96,7 @@ sub import {
return if $caller eq 'main';
# Kill Adopt::NEXT warnings if we're a non-RC version
- if ($VERSION !~ /_\d{2}$/) {
+ unless (_IS_DEVELOPMENT_VERSION()) {
Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/);
}
@@ -492,6 +498,7 @@ sub _comp_search_prefixes {
my ( $c, $name, @prefixes ) = @_;
my $appclass = ref $c || $c;
my $filter = "^${appclass}::(" . join( '|', @prefixes ) . ')::';
+ $filter = qr/$filter/; # Compile regex now rather than once per loop
# map the original component name to the sub part that we will search against
my %eligible = map { my $n = $_; $n =~ s{^$appclass\::[^:]+::}{}; $_ => $n; }
@@ -519,7 +526,9 @@ sub _comp_search_prefixes {
# don't warn if we didn't find any results, it just might not exist
if( @result ) {
- my $msg = "Used regexp fallback for \$c->model('${name}'), which found '" .
+ # Disgusting hack to work out correct method name
+ my $warn_for = lc $prefixes[0];
+ my $msg = "Used regexp fallback for \$c->{$warn_for}('${name}'), which found '" .
(join '", "', @result) . "'. Relying on regexp fallback behavior for " .
"component resolution is unreliable and unsafe.";
my $short = $result[0];
@@ -532,9 +541,9 @@ sub _comp_search_prefixes {
$msg .= " You probably need to set '$short' instead of '${name}' in this " .
"component's config";
} else {
- $msg .= " You probably meant \$c->model('$short') instead of \$c->model{'${name}'}, " .
+ $msg .= " You probably meant \$c->${warn_for}('$short') instead of \$c->${warn_for}({'${name}'}), " .
"but if you really wanted to search, pass in a regexp as the argument " .
- "like so: \$c->model(qr/${name}/)";
+ "like so: \$c->${warn_for}(qr/${name}/)";
}
$c->log->warn( "${msg}$shortmess" );
}
@@ -837,10 +846,21 @@ L
script/${prefix}_create.pl -help
Also, be sure to check out the vast and growing - collection of plugins for Catalyst on CPAN; + collection of plugins for Catalyst on CPAN; you are likely to find what you need there.