From: André Walker <andre@andrewalker.net>
Date: Thu, 28 Jul 2011 17:41:27 +0000 (-0300)
Subject: renamed 'name' container attribute to 'application_name'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6c743f0296bbed0b2a7b70252e8255ae40adaac8

renamed 'name' container attribute to 'application_name'
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8115b42..ad7b4cd 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2290,7 +2290,7 @@ 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" );
     $class->container($container);
 
     my $config = $container->resolve(service => 'config');
diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm
index 8c8a1bd..852e28a 100644
--- a/lib/Catalyst/IOC/Container.pm
+++ b/lib/Catalyst/IOC/Container.pm
@@ -38,7 +38,7 @@ has substitutions => (
     default => sub { +{} },
 );
 
-has name => (
+has application_name => (
     is      => 'ro',
     isa     => 'Str',
     default => 'MyApp',
@@ -63,7 +63,7 @@ sub BUILD {
         substitutions
         file
         driver
-        name
+        application_name
         prefix
         extensions
         path
@@ -126,7 +126,7 @@ sub build_controller_subcontainer {
 sub build_name_service {
     my $self = shift;
 
-    return Bread::Board::Literal->new( name => 'name', value => $self->name );
+    return Bread::Board::Literal->new( name => 'application_name', value => $self->application_name );
 }
 
 sub build_driver_service {
@@ -183,9 +183,9 @@ sub build_path_service {
 
             return Catalyst::Utils::env_value( $s->param('name'), 'CONFIG' )
             || $s->param('file')
-            || $s->param('name')->path_to( $s->param('prefix') );
+            || $s->param('application_name')->path_to( $s->param('prefix') );
         },
-        dependencies => [ depends_on('file'), depends_on('name'), depends_on('prefix') ],
+        dependencies => [ depends_on('file'), depends_on('application_name'), depends_on('prefix') ],
     );
 }
 
@@ -201,13 +201,13 @@ sub build_config_service {
             my $v = Data::Visitor::Callback->new(
                 plain_value => sub {
                     return unless defined $_;
-                    return $self->_config_substitutions( $s->param('name'), $s->param('substitutions'), $_ );
+                    return $self->_config_substitutions( $s->param('application_name'), $s->param('substitutions'), $_ );
                 }
 
             );
             $v->visit( $s->param('raw_config') );
         },
-        dependencies => [ depends_on('name'), depends_on('raw_config'), depends_on('substitutions') ],
+        dependencies => [ depends_on('application_name'), depends_on('raw_config'), depends_on('substitutions') ],
     );
 }
 
@@ -362,11 +362,11 @@ sub build_config_local_suffix_service {
         name => 'config_local_suffix',
         block => sub {
             my $s = shift;
-            my $suffix = Catalyst::Utils::env_value( $s->param('name'), 'CONFIG_LOCAL_SUFFIX' ) || $self->config_local_suffix;
+            my $suffix = Catalyst::Utils::env_value( $s->param('application_name'), 'CONFIG_LOCAL_SUFFIX' ) || $self->config_local_suffix;
 
             return $suffix;
         },
-        dependencies => [ depends_on('name') ],
+        dependencies => [ depends_on('application_name') ],
     );
 }