X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=da40d5cb35fd6cfdb754b6a36253413e459a16fa;hb=28928de92c8bfea34d7e995bc92f1bf5632242d6;hp=097af41fe9a18adaa208589ad0e45abb01eb40f3;hpb=158c88c0db581dcee202cd854c77186590c2992c;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 097af41..da40d5c 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,10 +1,10 @@
 package Catalyst::Component;
 
 use strict;
-use base qw/Class::Data::Inheritable/;
+use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
 use NEXT;
 
-__PACKAGE__->mk_classdata($_) for qw/_config/;
+__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
 =head1 NAME
 
@@ -15,7 +15,7 @@ Catalyst::Component - Catalyst Component Base Class
     # lib/MyApp/Model/Something.pm
     package MyApp::Model::Something;
 
-    use base 'Catalyst::Base';
+    use base 'Catalyst::Component';
 
     __PACKAGE__->config( foo => 'bar' );
 
@@ -49,9 +49,7 @@ component loader with config() support and a process() method placeholder.
 
 =head1 METHODS
 
-=over 4
-
-=item new($c)
+=head2 new($c)
 
 =cut
 
@@ -64,14 +62,39 @@ sub new {
     return $self->NEXT::new( { %{ $self->config }, %{$arguments} } );
 }
 
-# remember to leave blank lines between the consecutive =item's
-# otherwise the pod tools don't recognize the subsequent =items
+=head2 COMPONENT($c)
+
+=cut
+
+sub COMPONENT {
+    my ( $self, $c ) = @_;
+
+    # Temporary fix, some components does not pass context to constructor
+    my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
+
+    if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
+        return $new;
+    }
+    else {
+        if ( my $new = $self->new( $c, $arguments ) ) {
+            return $new;
+        }
+        else {
+            my $class = ref $self || $self;
+            my $new = { %{ $self->config }, %{$arguments} };
+            return bless $new, $class;
+        }
+    }
+}
+
+# remember to leave blank lines between the consecutive =head2's
+# otherwise the pod tools don't recognize the subsequent =head2s
 
-=item $c->config
+=head2 $c->config
 
-=item $c->config($hashref)
+=head2 $c->config($hashref)
 
-=item $c->config($key, $value, ...)
+=head2 $c->config($key, $value, ...)
 
 =cut
 
@@ -87,7 +110,7 @@ sub config {
     return $self->_config;
 }
 
-=item $c->process()
+=head2 $c->process()
 
 =cut
 
@@ -97,11 +120,9 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
-=back
-
 =head1 SEE ALSO
 
-L<Catalyst>.
+L<Catalyst>, L<Catalyst::Model>, L<Catalyst::View>, L<Catalyst::Controller>.
 
 =head1 AUTHOR