Rename Engine::Loader to EngineLoader

It's not an engine, as those exist no more, so move it out of the ::Engine::
namespace.

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a854124..02110ed 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -30,7 +30,7 @@ use Class::C3::Adopt::NEXT;
 use List::MoreUtils qw/uniq/;
 use attributes;
 use String::RewritePrefix;
-use Catalyst::Engine::Loader;
+use Catalyst::EngineLoader;
 use utf8;
 use Carp qw/croak carp shortmess/;
 use Try::Tiny;
@@ -2599,7 +2599,7 @@ sub engine_class {
 sub setup_engine {
     my ($class) = @_;
 
-    $class->engine_loader(Catalyst::Engine::Loader->new(application_name => $class));
+    $class->engine_loader(Catalyst::EngineLoader->new(application_name => $class));
 
     my $engine = $class->engine_class;
     Class::MOP::load_class($engine);

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 16895f3..56486f6 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -14,7 +14,7 @@ use Moose::Util::TypeConstraints;
 use Plack::Loader;
 use Plack::Middleware::Conditional;
 use Plack::Middleware::ReverseProxy;
-use Catalyst::Engine::Loader;
+use Catalyst::EngineLoader;
 use Encode ();
 use utf8;
 
@@ -794,7 +794,7 @@ sub run {
     my $server = pop @args if (scalar @args && blessed $args[-1]);
     my $options = pop @args if (scalar @args && ref($args[-1]) eq 'HASH');
     if (! $server ) {
-        $server = Catalyst::Engine::Loader->new(application_name => ref($self))->auto();
+        $server = Catalyst::EngineLoader->new(application_name => ref($self))->auto();
         # We're not being called from a script,
                                                     # so auto detect what backend to run on.
                                                     # This should never happen, as mod_perl

diff --git a/lib/Catalyst/Engine/Loader.pm b/lib/Catalyst/EngineLoader.pm
similarity index 97%
rename from lib/Catalyst/Engine/Loader.pm
rename to lib/Catalyst/EngineLoader.pm
index d2b54a4..3499b50 100644 (file)
--- a/lib/Catalyst/Engine/Loader.pm
+++ b/lib/Catalyst/EngineLoader.pm
@@ -1,4 +1,4 @@
-package Catalyst::Engine::Loader;
+package Catalyst::EngineLoader;
 use Moose;
 use Catalyst::Exception;
 use Catalyst::Utils;
@@ -97,7 +97,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::Engine::Loader - The Catalyst Engine Loader
+Catalyst::EngineLoader - The Catalyst Engine Loader
 
 =head1 SYNOPSIS
 

diff --git a/lib/Catalyst/ScriptRole.pm b/lib/Catalyst/ScriptRole.pm
index f726626..e5231e7 100644 (file)
--- a/lib/Catalyst/ScriptRole.pm
+++ b/lib/Catalyst/ScriptRole.pm
@@ -3,7 +3,7 @@ use Moose::Role;
 use MooseX::Types::Moose qw/Str Bool/;
 use Pod::Usage;
 use MooseX::Getopt;
-use Catalyst::Engine::Loader;
+use Catalyst::EngineLoader;
 use MooseX::Types::LoadableClass qw/LoadableClass/;
 use namespace::autoclean;
 
@@ -26,7 +26,7 @@ has loader_class => (
     isa => LoadableClass,
     is => 'ro',
     coerce => 1,
-    default => 'Catalyst::Engine::Loader',
+    default => 'Catalyst::EngineLoader',
     documentation => 'The class to use to detect and load the PSGI engine',
 );