X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FActionContainer.pm;h=f3cb7e06669bc8f79130bb50fa31d3b25b344e7c;hp=bb21c0916cbde52017406047f7e1b45d9a03ee33;hb=4090e3bb3fea1a73ac369250e31584d61428b808;hpb=a13e21ab238a2752262dda5773d5be7a6273d875

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index bb21c09..f3cb7e0 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,13 +13,19 @@ 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 get_action($name)
+use Moose;
 
-Returns an action from this container based on the action name, or undef
+has part => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+has actions => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
 
-=cut
+around new => sub {
+  my ($orig, $self, $params) = @_;
+  $orig->($self, (ref($params) ? $params :  { part => $params } ));
+};
+
+no Moose;
 
 sub get_action {
     my ( $self, $name ) = @_;
@@ -47,18 +33,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 ) = @_;
-    my $name ||= $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.
@@ -68,6 +70,10 @@ 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.
 
+=head2 meta
+
+Provided by Moose
+
 =head1 AUTHOR
 
 Matt S. Trout