X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=2950f4458af9b3a0b1ec7c9ebd7c0cf9501c5c9a;hb=ce50990ee94a229c4814be98afc17f2b6a065a43;hp=d4cf7e59f768e96d70bc1a1619a1bc602c1c6da4;hpb=358e159286ecfb8089814e4dfe069d8b7b6b95dd;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index d4cf7e5..2950f44 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,11 +1,15 @@
 package Catalyst::Component;
 
-use strict;
-use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
-use NEXT;
+use Moose;
+use Class::MOP;
+use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
+use MRO::Compat;
+use mro 'c3';
+
+with 'MooseX::Emulate::Class::Accessor::Fast';
+with 'Catalyst::ClassData';
 
-__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
 =head1 NAME
 
@@ -42,92 +46,83 @@ Catalyst::Component - Catalyst Component Base Class
 
 =head1 DESCRIPTION
 
-This is the universal base class for Catalyst components
+This is the universal base class for Catalyst components 
 (Model/View/Controller).
 
 It provides you with a generic new() for instantiation through Catalyst's
 component loader with config() support and a process() method placeholder.
 
-=head1 METHODS
-
-=head2 new($c, $arguments)
-
-Called by COMPONENT to instantiate the component; should return an object
-to be stored in the application's component hash.
-
 =cut
 
-sub new {
-    my ( $self, $c ) = @_;
+__PACKAGE__->mk_classdata('_plugins');
+
+around new => sub {
+    my ( $orig, $self) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
-    return $self->NEXT::new( $self->merge_config_hashes( $self->config, $arguments ) );
-}
-
-=head2 COMPONENT($c, $arguments)
-
-If this method is present (as it is on all Catalyst::Component subclasses,
-it is called by Catalyst during setup_components with the application class
-as $c and any config entry on the application for this component (for example,
-in the case of MyApp::Controller::Foo this would be
-MyApp->config->{'Controller::Foo'}). The arguments are expected to be a hashref
-and are merged with the __PACKAGE__->config hashref before calling ->new to
-instantiate the component.
+    my $args =  $self->merge_config_hashes( $self->config, $arguments );
+    $self->$orig( $args );
+};
 
-=cut
+no Moose;
 
 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->merge_config_hashes( $self->config, $arguments );
-            return bless $new, $class;
-        }
+    if( my $next = $self->next::can ){
+      my $class = blessed $self || $self;
+      my ($next_package) = Class::MOP::get_code_info($next);
+      warn "There is a COMPONENT method resolving after Catalyst::Component in ${next_package}. This behavior is deprecated and will stop working in future releases.";
+      return $next->($self, $arguments);
     }
+    return $self->new($c, $arguments);
 }
 
-# remember to leave blank lines between the consecutive =head2's
-# otherwise the pod tools don't recognize the subsequent =head2s
-
-=head2 $c->config
+sub config {
+  my $self = shift;
+  my $class = blessed $self || $self;
+
+  my $config;
+  my $meta = $class->meta;
+  if( $meta->has_package_symbol('$config') ){
+      $config = ${ $meta->get_package_symbol('$config') };
+  } else {
+    foreach my $super ( $meta->linearized_isa ) {
+      my $super_meta = Moose::Meta::Class->initialize($super);
+      if( $super_meta->has_package_symbol('$config') ){
+        $config = ${ $super_meta->get_package_symbol('$config') };
+        unless( @_ ){ #don't copy and write it twice
+          $config = $class->merge_config_hashes( $config, {} );
+          $meta->add_package_symbol('$config', \ $config);
+        }
+        last;
+      }
+    }
+  }
 
-=head2 $c->config($hashref)
+  unless( defined $config ){
+    $config = {};
+    $meta->add_package_symbol('$config', \ $config) unless @_;
+  }
 
-=head2 $c->config($key, $value, ...)
+  if (@_) {
+    my $from_args = { %{@_ > 1 ? {@_} : $_[0]} };
+    my $new_config = $class->merge_config_hashes( $config, $from_args);
+    $meta->add_package_symbol('$config', \ $new_config);
+  }
 
-=cut
-
-sub config {
-    my $self = shift;
-    my $config = $self->_config;
-    unless ($config) {
-        $self->_config( $config = {} );
-    }
-    if (@_) {
-        my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
-        $self->_config(
-            $self->merge_config_hashes( $config, $newconfig )
-        );
-    }
-    return $config;
+  return $config;
 }
 
-=head2 $c->process()
+sub merge_config_hashes {
+    my ( $self, $lefthash, $righthash ) = @_;
 
-=cut
+    return Catalyst::Utils::merge_hashes( $lefthash, $righthash );
+}
 
 sub process {
 
@@ -135,17 +130,50 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
-=head2 $c->merge_config_hashes( $hashref, $hashref )
 
-Merges two hashes together recursively, giving right-hand precedence.
+__PACKAGE__->meta->make_immutable;
+1;
 
-=cut
+__END__
 
-sub merge_config_hashes {
-    my ( $self, $lefthash, $righthash ) = @_;
+=head1 METHODS
 
-    return Catalyst::Utils::merge_hashes( $lefthash, $righthash );
-}
+=head2 new($c, $arguments)
+
+Called by COMPONENT to instantiate the component; should return an object
+to be stored in the application's component hash.
+
+=head2 COMPONENT($c, $arguments)
+
+If this method is present (as it is on all Catalyst::Component subclasses,
+it is called by Catalyst during setup_components with the application class
+as $c and any config entry on the application for this component (for example,
+in the case of MyApp::Controller::Foo this would be
+MyApp->config->{'Controller::Foo'}). The arguments are expected to be a 
+hashref and are merged with the __PACKAGE__->config hashref before calling 
+->new to instantiate the component.
+
+=head2 $c->config
+
+=head2 $c->config($hashref)
+
+=head2 $c->config($key, $value, ...)
+
+Accessor for this component's config hash. Config values can be set as 
+key value pair, or you can specify a hashref. In either case the keys
+will be merged with any existing config settings. Each component in 
+a Catalyst application has it's own config hash.
+
+=head2 $c->process()
+
+This is the default method called on a Catalyst component in the dispatcher.
+For instance, Views implement this action to render the response body 
+when you forward to them. The default is an abstract method.
+
+=head2 $c->merge_config_hashes( $hashref, $hashref )
+
+Merges two hashes together recursively, giving right-hand precedence.
+Alias for the method in L<Catalyst::Utils>.
 
 =head1 OPTIONAL METHODS
 
@@ -177,5 +205,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;