From: Florian Ragwitz Date: Wed, 29 Apr 2009 10:45:25 +0000 (+0000) Subject: Convert the dispatcher's BUILD method to attribute builders. X-Git-Tag: 5.80003~6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=792d99b4a8fa373e065064b05a5bee63f15e9790 Convert the dispatcher's BUILD method to attribute builders. --- diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index 18aa423..f92b92b 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -15,6 +15,7 @@ use Text::SimpleTable; use Tree::Simple; use Tree::Simple::Visitor::FindByPath; +use namespace::clean -except => 'meta'; # Refactoring note: # do these belong as package vars or should we build these via a builder method? @@ -27,7 +28,7 @@ our @PRELOAD = qw/Index Path Regex/; our @POSTLOAD = qw/Default/; # Note - see back-compat methods at end of file. -has _tree => (is => 'rw'); +has _tree => (is => 'rw', builder => '_build__tree'); has _dispatch_types => (is => 'rw', default => sub { [] }, required => 1, lazy => 1); has _registered_dispatch_types => (is => 'rw', default => sub { {} }, required => 1, lazy => 1); has _method_action_class => (is => 'rw', default => 'Catalyst::Action'); @@ -45,8 +46,6 @@ around qw/preload_dispatch_types postload_dispatch_types/ => sub { return $self->$orig(@_); }; -no Moose; - =head1 NAME Catalyst::Dispatcher - The Catalyst Dispatcher @@ -68,13 +67,13 @@ Construct a new dispatcher. =cut -sub BUILD { - my ($self, $params) = @_; +sub _build__tree { + my ($self) = @_; my $container = Catalyst::ActionContainer->new( { part => '/', actions => {} } ); - $self->_tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) ); + return Tree::Simple->new($container, Tree::Simple->ROOT); } =head2 $self->preload_dispatch_types @@ -718,7 +717,6 @@ foreach my $public_method_name (qw/ } # End 5.70 backwards compatibility hacks. -no Moose; __PACKAGE__->meta->make_immutable; =head2 meta