From: André Walker <andre@andrewalker.net>
Date: Wed, 6 Jul 2011 22:47:57 +0000 (-0300)
Subject: returne instead of add_service/add_sub_container
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=292277c117abd3364000df3b7b00b218d239ca5c

returne instead of add_service/add_sub_container
---

diff --git a/lib/Catalyst/Container.pm b/lib/Catalyst/Container.pm
index 74f0d6b..d2f0800 100644
--- a/lib/Catalyst/Container.pm
+++ b/lib/Catalyst/Container.pm
@@ -49,7 +49,9 @@ has sub_container_class => (
 sub BUILD {
     my $self = shift;
 
-    $self->${\"build_${_}_service"} for qw/
+    $self->add_service(
+        $self->${\"build_${_}_service"}
+    ) for qw/
         substitutions
         file
         driver
@@ -67,283 +69,262 @@ sub BUILD {
         config_path
     /;
 
-    $self->build_model_subcontainer;
-    $self->build_view_subcontainer;
-    $self->build_controller_subcontainer;
+    $self->add_sub_container(
+        $self->${ \"build_${_}_subcontainer" }
+    ) for qw/ model view controller /;
 }
 
 sub build_model_subcontainer {
     my $self = shift;
 
-    $self->add_sub_container(
-        $self->sub_container_class->new( name => 'model' )
-    );
+    return $self->sub_container_class->new( name => 'model' );
 }
 
 sub build_view_subcontainer {
     my $self = shift;
 
-    $self->add_sub_container(
-        $self->sub_container_class->new( name => 'view' )
-    );
+    return $self->sub_container_class->new( name => 'view' );
 }
 
 sub build_controller_subcontainer {
     my $self = shift;
 
-    $self->add_sub_container(
-        $self->sub_container_class->new( name => 'controller' )
-    );
+    return $self->sub_container_class->new( name => 'controller' );
 }
 
 sub build_name_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::Literal->new( name => 'name', value => $self->name )
-    );
+
+    return Bread::Board::Literal->new( name => 'name', value => $self->name );
 }
 
 sub build_driver_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::Literal->new( name => 'driver', value => $self->driver )
-    );
+
+    return Bread::Board::Literal->new( name => 'driver', value => $self->driver );
 }
 
 sub build_file_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::Literal->new( name => 'file', value => $self->file )
-    );
+
+    return Bread::Board::Literal->new( name => 'file', value => $self->file );
 }
 
 sub build_substitutions_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::Literal->new( name => 'substitutions', value => $self->substitutions )
-    );
+
+    return Bread::Board::Literal->new( name => 'substitutions', value => $self->substitutions );
 }
 
 sub build_extensions_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'extensions',
-            block => sub {
-                return \@{Config::Any->extensions};
-            },
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'extensions',
+        block => sub {
+            return \@{Config::Any->extensions};
+        },
     );
 }
 
 sub build_prefix_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'prefix',
-            block => sub {
-                return Catalyst::Utils::appprefix( shift->param('name') );
-            },
-            dependencies => [ depends_on('name') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'prefix',
+        block => sub {
+            return Catalyst::Utils::appprefix( shift->param('name') );
+        },
+        dependencies => [ depends_on('name') ],
     );
 }
 
 sub build_path_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'path',
-            block => sub {
-                my $s = shift;
-
-                return Catalyst::Utils::env_value( $s->param('name'), 'CONFIG' )
-                || $s->param('file')
-                || $s->param('name')->path_to( $s->param('prefix') );
-            },
-            dependencies => [ depends_on('file'), depends_on('name'), depends_on('prefix') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'path',
+        block => sub {
+            my $s = shift;
+
+            return Catalyst::Utils::env_value( $s->param('name'), 'CONFIG' )
+            || $s->param('file')
+            || $s->param('name')->path_to( $s->param('prefix') );
+        },
+        dependencies => [ depends_on('file'), depends_on('name'), depends_on('prefix') ],
     );
 }
 
 sub build_config_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'config',
-            block => sub {
-                my $s = shift;
-
-                my $v = Data::Visitor::Callback->new(
-                    plain_value => sub {
-                        return unless defined $_;
-                        return $self->_config_substitutions( $s->param('name'), $s->param('substitutions'), $_ );
-                    }
-
-                );
-                $v->visit( $s->param('raw_config') );
-            },
-            dependencies => [ depends_on('name'), depends_on('raw_config'), depends_on('substitutions') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'config',
+        block => sub {
+            my $s = shift;
+
+            my $v = Data::Visitor::Callback->new(
+                plain_value => sub {
+                    return unless defined $_;
+                    return $self->_config_substitutions( $s->param('name'), $s->param('substitutions'), $_ );
+                }
+
+            );
+            $v->visit( $s->param('raw_config') );
+        },
+        dependencies => [ depends_on('name'), depends_on('raw_config'), depends_on('substitutions') ],
     );
 }
 
 sub build_raw_config_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'raw_config',
-            block => sub {
-                my $s = shift;
-
-                my @global = @{$s->param('global_config')};
-                my @locals = @{$s->param('local_config')};
-
-                my $config = {};
-                for my $cfg (@global, @locals) {
-                    for (keys %$cfg) {
-                        $config = Catalyst::Utils::merge_hashes( $config, $cfg->{$_} );
-                    }
+
+    return Bread::Board::BlockInjection->new(
+        name => 'raw_config',
+        block => sub {
+            my $s = shift;
+
+            my @global = @{$s->param('global_config')};
+            my @locals = @{$s->param('local_config')};
+
+            my $config = {};
+            for my $cfg (@global, @locals) {
+                for (keys %$cfg) {
+                    $config = Catalyst::Utils::merge_hashes( $config, $cfg->{$_} );
                 }
-                return $config;
-            },
-            dependencies => [ depends_on('global_config'), depends_on('local_config') ],
-        )
+            }
+            return $config;
+        },
+        dependencies => [ depends_on('global_config'), depends_on('local_config') ],
     );
 }
 
 sub build_global_files_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'global_files',
-            block => sub {
-                my $s = shift;
 
-                my ( $path, $extension ) = @{$s->param('config_path')};
+    return Bread::Board::BlockInjection->new(
+        name => 'global_files',
+        block => sub {
+            my $s = shift;
 
-                my @extensions = @{$s->param('extensions')};
+            my ( $path, $extension ) = @{$s->param('config_path')};
 
-                my @files;
-                if ( $extension ) {
-                    die "Unable to handle files with the extension '${extension}'" unless grep { $_ eq $extension } @extensions;
-                    push @files, $path;
-                } else {
-                    @files = map { "$path.$_" } @extensions;
-                }
-                return \@files;
-            },
-            dependencies => [ depends_on('extensions'), depends_on('config_path') ],
-        )
+            my @extensions = @{$s->param('extensions')};
+
+            my @files;
+            if ( $extension ) {
+                die "Unable to handle files with the extension '${extension}'" unless grep { $_ eq $extension } @extensions;
+                push @files, $path;
+            } else {
+                @files = map { "$path.$_" } @extensions;
+            }
+            return \@files;
+        },
+        dependencies => [ depends_on('extensions'), depends_on('config_path') ],
     );
 }
 
 sub build_local_files_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'local_files',
-            block => sub {
-                my $s = shift;
-
-                my ( $path, $extension ) = @{$s->param('config_path')};
-                my $suffix = $s->param('config_local_suffix');
-
-                my @extensions = @{$s->param('extensions')};
-
-                my @files;
-                if ( $extension ) {
-                    die "Unable to handle files with the extension '${extension}'" unless grep { $_ eq $extension } @extensions;
-                    $path =~ s{\.$extension}{_$suffix.$extension};
-                    push @files, $path;
-                } else {
-                    @files = map { "${path}_${suffix}.$_" } @extensions;
-                }
-                return \@files;
-            },
-            dependencies => [ depends_on('extensions'), depends_on('config_path'), depends_on('config_local_suffix') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'local_files',
+        block => sub {
+            my $s = shift;
+
+            my ( $path, $extension ) = @{$s->param('config_path')};
+            my $suffix = $s->param('config_local_suffix');
+
+            my @extensions = @{$s->param('extensions')};
+
+            my @files;
+            if ( $extension ) {
+                die "Unable to handle files with the extension '${extension}'" unless grep { $_ eq $extension } @extensions;
+                $path =~ s{\.$extension}{_$suffix.$extension};
+                push @files, $path;
+            } else {
+                @files = map { "${path}_${suffix}.$_" } @extensions;
+            }
+            return \@files;
+        },
+        dependencies => [ depends_on('extensions'), depends_on('config_path'), depends_on('config_local_suffix') ],
     );
 }
 
 sub build_global_config_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'global_config',
-            block => sub {
-                my $s = shift;
-
-                return Config::Any->load_files({
-                    files       => $s->param('global_files'),
-                    filter      => \&_fix_syntax,
-                    use_ext     => 1,
-                    driver_args => $s->param('driver'),
-                });
-            },
-            dependencies => [ depends_on('global_files') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'global_config',
+        block => sub {
+            my $s = shift;
+
+            return Config::Any->load_files({
+                files       => $s->param('global_files'),
+                filter      => \&_fix_syntax,
+                use_ext     => 1,
+                driver_args => $s->param('driver'),
+            });
+        },
+        dependencies => [ depends_on('global_files') ],
     );
 }
 
 sub build_local_config_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'local_config',
-            block => sub {
-                my $s = shift;
-
-                return Config::Any->load_files({
-                    files       => $s->param('local_files'),
-                    filter      => \&_fix_syntax,
-                    use_ext     => 1,
-                    driver_args => $s->param('driver'),
-                });
-            },
-            dependencies => [ depends_on('local_files') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        name => 'local_config',
+        block => sub {
+            my $s = shift;
+
+            return Config::Any->load_files({
+                files       => $s->param('local_files'),
+                filter      => \&_fix_syntax,
+                use_ext     => 1,
+                driver_args => $s->param('driver'),
+            });
+        },
+        dependencies => [ depends_on('local_files') ],
     );
 }
 
 sub build_config_path_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            name => 'config_path',
-            block => sub {
-                my $s = shift;
 
-                my $path = $s->param('path');
-                my $prefix = $s->param('prefix');
+    return Bread::Board::BlockInjection->new(
+        name => 'config_path',
+        block => sub {
+            my $s = shift;
 
-                my ( $extension ) = ( $path =~ m{\.(.{1,4})$} );
+            my $path = $s->param('path');
+            my $prefix = $s->param('prefix');
 
-                if ( -d $path ) {
-                    $path =~ s{[\/\\]$}{};
-                    $path .= "/$prefix";
-                }
+            my ( $extension ) = ( $path =~ m{\.(.{1,4})$} );
 
-                return [ $path, $extension ];
-            },
-            dependencies => [ depends_on('prefix'), depends_on('path') ],
-        )
+            if ( -d $path ) {
+                $path =~ s{[\/\\]$}{};
+                $path .= "/$prefix";
+            }
+
+            return [ $path, $extension ];
+        },
+        dependencies => [ depends_on('prefix'), depends_on('path') ],
     );
 }
 
 sub build_config_local_suffix_service {
     my $self = shift;
-    $self->add_service(
-        Bread::Board::BlockInjection->new(
-            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;
-
-                return $suffix;
-            },
-            dependencies => [ depends_on('name') ],
-        )
+
+    return Bread::Board::BlockInjection->new(
+        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;
+
+            return $suffix;
+        },
+        dependencies => [ depends_on('name') ],
     );
 }