moving classes/roles to Catalyst::IOC::* namespace

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4d04c97..8723e5d 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1523,7 +1523,7 @@ around components => sub {
         my ($type, $name) = _get_component_type_name($component);
 
 # FIXME: shouldn't the service name be $name?
-        $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
+        $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
     }
 
     return $class->$orig($components);
@@ -2360,7 +2360,7 @@ sub setup_config {
 
     my %args = %{ $class->config || {} };
 
-    my @container_classes = ( "${class}::Container", 'Catalyst::Container');
+    my @container_classes = ( "${class}::Container", 'Catalyst::IOC::Container');
     unshift @container_classes, delete $args{container_class} if exists $args{container_class};
 
     my $container_class = Class::MOP::load_first_existing_class(@container_classes);
@@ -2422,7 +2422,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) ) {
-            $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $instance } ));
+            $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $instance } ));
         }
         my @expanded_components = $instance->can('expand_modules')
             ? $instance->expand_modules( $component, $config )
@@ -2436,7 +2436,7 @@ sub setup_components {
             ) if $deprecatedcatalyst_component_names;
 
             if (my ($type, $name) = _get_component_type_name($component)) {
-                $containers->{$type}->add_service(Catalyst::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
+                $containers->{$type}->add_service(Catalyst::IOC::BlockInjection->new( name => $name, block => sub { return $class->setup_component($component) } ));
             }
 
             $class->components->{ $component } = $class->setup_component($component);

diff --git a/lib/Catalyst/BlockInjection.pm b/lib/Catalyst/IOC/BlockInjection.pm
similarity index 73%
rename from lib/Catalyst/BlockInjection.pm
rename to lib/Catalyst/IOC/BlockInjection.pm
index afa9caa..2b56fb6 100644 (file)
--- a/lib/Catalyst/BlockInjection.pm
+++ b/lib/Catalyst/IOC/BlockInjection.pm
@@ -1,9 +1,9 @@
-package Catalyst::BlockInjection;
+package Catalyst::IOC::BlockInjection;
 use Moose;
 
 extends 'Bread::Board::BlockInjection';
 
-with 'Catalyst::Service::WithContext';
+with 'Catalyst::IOC::Service::WithAcceptContext';
 
 __PACKAGE__->meta->make_immutable;
 
@@ -16,7 +16,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::BlockInjection
+Catalyst::IOC::BlockInjection
 
 =head1 AUTHORS
 

diff --git a/lib/Catalyst/Container.pm b/lib/Catalyst/IOC/Container.pm
similarity index 98%
rename from lib/Catalyst/Container.pm
rename to lib/Catalyst/IOC/Container.pm
index b2d39c6..9c684f1 100644 (file)
--- a/lib/Catalyst/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -1,11 +1,11 @@
-package Catalyst::Container;
+package Catalyst::IOC::Container;
 use Bread::Board;
 use Moose;
 use Config::Any;
 use Data::Visitor::Callback;
 use Catalyst::Utils ();
 use MooseX::Types::LoadableClass qw/ LoadableClass /;
-use Catalyst::BlockInjection;
+use Catalyst::IOC::BlockInjection;
 use namespace::autoclean;
 
 extends 'Bread::Board::Container';
@@ -45,7 +45,7 @@ has sub_container_class => (
     isa     => LoadableClass,
     is      => 'ro',
     coerce  => 1,
-    default => 'Catalyst::SubContainer',
+    default => 'Catalyst::IOC::SubContainer',
     handles => {
         new_sub_container => 'new',
     }

diff --git a/lib/Catalyst/Service/WithContext.pm b/lib/Catalyst/IOC/Service/WithAcceptContext.pm
similarity index 94%
rename from lib/Catalyst/Service/WithContext.pm
rename to lib/Catalyst/IOC/Service/WithAcceptContext.pm
index 6f18300..d4e18c1 100644 (file)
--- a/lib/Catalyst/Service/WithContext.pm
+++ b/lib/Catalyst/IOC/Service/WithAcceptContext.pm
@@ -1,4 +1,4 @@
-package Catalyst::Service::WithContext;
+package Catalyst::IOC::Service::WithAcceptContext;
 use Moose::Role;
 
 with 'Bread::Board::Service';

diff --git a/lib/Catalyst/SubContainer.pm b/lib/Catalyst/IOC/SubContainer.pm
similarity index 90%
rename from lib/Catalyst/SubContainer.pm
rename to lib/Catalyst/IOC/SubContainer.pm
index 6d58be9..95bb8d3 100644 (file)
--- a/lib/Catalyst/SubContainer.pm
+++ b/lib/Catalyst/IOC/SubContainer.pm
@@ -1,7 +1,7 @@
-package Catalyst::SubContainer;
+package Catalyst::IOC::SubContainer;
 use Bread::Board;
 use Moose;
-use Catalyst::BlockInjection;
+use Catalyst::IOC::BlockInjection;
 
 extends 'Bread::Board::Container';
 
@@ -49,7 +49,7 @@ __END__
 
 =head1 NAME
 
-Catalyst::SubContainer - Container for models, controllers and views
+Catalyst::IOC::SubContainer - Container for models, controllers and views
 
 =head1 METHODS
 

diff --git a/t/aggregate/unit_core_container_custom_container.t b/t/aggregate/unit_core_container_custom_container.t
index 0695c81..f86ac5e 100644 (file)
--- a/t/aggregate/unit_core_container_custom_container.t
+++ b/t/aggregate/unit_core_container_custom_container.t
@@ -17,13 +17,13 @@ my $container = ContainerTestApp->container;
 
 # 'is' instead of 'isa_ok', because I want it to be only Catalyst::Container
 # and not some subclass
-is( ref $container, 'Catalyst::Container', 'The container is Catalyst::Container, not a subclass');
+is( ref $container, 'Catalyst::IOC::Container', 'The container is Catalyst::IOC::Container, not a subclass');
 
 # now, check if it loads the subclass when it exists
 {
     package CustomContainerTestApp::Container;
     use Moose;
-    extends 'Catalyst::Container';
+    extends 'Catalyst::IOC::Container';
 
     sub my_custom_method { 1 }
 }
@@ -39,9 +39,8 @@ is( ref $container, 'Catalyst::Container', 'The container is Catalyst::Container
 $container = CustomContainerTestApp->container;
 
 isa_ok($container, 'CustomContainerTestApp::Container');
-isa_ok($container, 'Catalyst::Container');
+isa_ok($container, 'Catalyst::IOC::Container');
 can_ok($container, 'my_custom_method');
 ok( eval { $container->my_custom_method }, 'executes the method correctly');
 
 done_testing;
-