X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=2950f4458af9b3a0b1ec7c9ebd7c0cf9501c5c9a;hb=46d0346ddafe8e167c679cddef9834946598e689;hp=b5b56e25bb18b1f7ac3d2ab85c6c70623405f6c8;hpb=6323fda2e7ace0fc0aa06305c674957cedc6d025;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index b5b56e2..2950f44 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,27 +1,14 @@
 package Catalyst::Component;
 
 use Moose;
-#use MooseX::ClassAttribute;
+use Class::MOP;
+use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
-use Class::Data::Inheritable;
-use NEXT;
+use MRO::Compat;
+use mro 'c3';
 
-{
-  my $mk_classdata =  Class::Data::Inheritable->can('mk_classdata');
-  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
-}
-
-__PACKAGE__->mk_classdata(_config => {});
-__PACKAGE__->mk_classdata('_plugins');
-
-# class_has _config  => (
-#                  is => 'rw',
-#                  isa => 'HashRef',
-#                  required => 1,
-#                  default => sub { {} }
-#                 );
-
-# class_has _plugins => ( is => 'rw' );
+with 'MooseX::Emulate::Class::Accessor::Fast';
+with 'Catalyst::ClassData';
 
 
 =head1 NAME
@@ -46,7 +33,7 @@ Catalyst::Component - Catalyst Component Base Class
         my ( $self, $c ) = @_;
         $c->response->output( $self->{foo} );
     }
-
+    
     1;
 
     # Methods can be a request step
@@ -59,7 +46,7 @@ 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
@@ -67,75 +54,68 @@ component loader with config() support and a process() method placeholder.
 
 =cut
 
-#to do: are we switching to moose-style key => value constructors from
-#       catalyst-style {key => value} constructors ?
+__PACKAGE__->mk_classdata('_plugins');
 
 around new => sub {
-    my $orig = shift;
-    my ( $self, $c ) = @_;
+    my ( $orig, $self) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-    my $merged = $self->merge_config_hashes( $self->config, $arguments );
-    $orig->( $self, $merged );
+
+    my $args =  $self->merge_config_hashes( $self->config, $arguments );
+    $self->$orig( $args );
 };
 
+no Moose;
+
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-
-    #Moose TODO: I don't think I fully grok NEXT. is this here for MI or something?
-    # how can we have a next here? this -is- the base class....
-    if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
-        return $new;
-    }
-    #new here will always pass because $self ISA Moose::Object
-    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 );
-            #this will break, Moose::Object::new won't act like this
-            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);
 }
 
-#Moose TODO:  I have no fucking clue what's going on here (groditi)
 sub config {
-    my $self = shift;
-    my $config_sub = $self->can('_config');
-    my $config = $self->$config_sub();
-    #my $config = $self->_config;
-    if (@_) {
-        my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
-        $self->_config(
-            $self->merge_config_hashes( $config, $newconfig )
-        );
-    } else {
-        # this is a bit of a kludge, required to make
-        # __PACKAGE__->config->{foo} = 'bar';
-        # work in a subclass. Calling the Class::Data::Inheritable setter
-        # will create a new _config method in the current class if it's
-        # currently inherited from the superclass. So, the can() call will
-        # return a different subref in that case and that means we know to
-        # copy and reset the value stored in the class data.
-
-        $self->_config( $config );
-
-        if ((my $config_sub_now = $self->can('_config')) ne $config_sub) {
-
-            #this is retarded. if we want a new ref we could do:  { %$config }
-            $config = $self->merge_config_hashes( $config, {} );
-            $self->$config_sub_now( $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;
+      }
     }
-    return $config;
+  }
+
+  unless( defined $config ){
+    $config = {};
+    $meta->add_package_symbol('$config', \ $config) unless @_;
+  }
+
+  if (@_) {
+    my $from_args = { %{@_ > 1 ? {@_} : $_[0]} };
+    my $new_config = $class->merge_config_hashes( $config, $from_args);
+    $meta->add_package_symbol('$config', \ $new_config);
+  }
+
+  return $config;
 }
 
 sub merge_config_hashes {
@@ -150,6 +130,8 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+
+__PACKAGE__->meta->make_immutable;
 1;
 
 __END__
@@ -167,8 +149,8 @@ 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
+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
@@ -177,15 +159,15 @@ hashref and are merged with the __PACKAGE__->config hashref before calling
 
 =head2 $c->config($key, $value, ...)
 
-Accessor for this component's config hash. Config values can be set as
+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
+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
+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 )