X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FActionContainer.pm;h=5be7292d2b9fae00c163d1110c46bde6184a9c2a;hb=88eee38e25dd1a991008fb5f61b848fcecb97ad0;hp=258cb15227e4f2c32559aafcc3cd40518685c7c2;hpb=d4c74714e871e16564d5294abdefccd0d0bcd29f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index 258cb15..5be7292 100644
--- a/lib/Catalyst/ActionContainer.pm
+++ b/lib/Catalyst/ActionContainer.pm
@@ -1,25 +1,5 @@
 package Catalyst::ActionContainer;
 
-use strict;
-use base qw/Class::Accessor::Fast/;
-
-__PACKAGE__->mk_accessors(qw/part actions/);
-
-use overload (
-
-    # Stringify to path part for tree search
-    q{""} => sub { shift->{part} },
-
-);
-
-sub new {
-    my ( $class, $fields ) = @_;
-
-    $fields = { part => $fields, actions => {} } unless ref $fields;
-
-    $class->SUPER::new($fields);
-}
-
 =head1 NAME
 
 Catalyst::ActionContainer - Catalyst Action Container
@@ -33,19 +13,24 @@ See L<Catalyst>.
 This is a container for actions. The dispatcher sets up a tree of these
 to represent the various dispatch points in your application.
 
-=head1 METHODS
+=cut
 
-=head2 new(\%data | $part)
+use Moose;
 
-Can be called with { part => $part, actions => \%actions } for full
-construction or with just a part, which will result in an empty actions
-hashref to be populated via add_action later
+has part => (is => 'rw', required => 1);
+has actions => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
 
-=head2 get_action($name)
+around new => sub {
+  my ($orig, $self, $params) = @_;
+  $orig->($self, (ref($params) ? $params :  { part => $params } ));
+};
 
-Returns an action from this container based on the action name, or undef
+no Moose;
 
-=cut
+use overload (
+    # Stringify to path part for tree search
+    q{""} => sub { shift->part },
+);
 
 sub get_action {
     my ( $self, $name ) = @_;
@@ -53,18 +38,34 @@ sub get_action {
     return;
 }
 
-=head2 add_action($action, [ $name ])
-
-Adds an action, optionally providing a name to override $action->name
-
-=cut
-
 sub add_action {
     my ( $self, $action, $name ) = @_;
     $name ||= $action->name;
     $self->actions->{$name} = $action;
 }
 
+__PACKAGE__->meta->make_immutable;
+
+1;
+
+__END__
+
+=head1 METHODS
+
+=head2 new(\%data | $part)
+
+Can be called with { part => $part, actions => \%actions } for full
+construction or with just a part, which will result in an empty actions
+hashref to be populated via add_action later
+
+=head2 get_action($name)
+
+Returns an action from this container based on the action name, or undef
+
+=head2 add_action($action, [ $name ])
+
+Adds an action, optionally providing a name to override $action->name
+
 =head2 actions
 
 Accessor to the actions hashref, containing all actions in this container.
@@ -74,9 +75,13 @@ Accessor to the actions hashref, containing all actions in this container.
 Accessor to the path part this container resolves to. Also what the container
 stringifies to.
 
-=head1 AUTHOR
+=head2 meta
+
+Provided by Moose
+
+=head1 AUTHORS
 
-Matt S. Trout
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT