package Catalyst::Component;
use Moose;
-#use MooseX::ClassAttribute;
+use Class::MOP;
+use Class::MOP::Object;
use Catalyst::Utils;
-use Class::Data::Inheritable;
-use NEXT;
+use Class::C3::Adopt::NEXT;
+use MRO::Compat;
+use mro 'c3';
+use Scalar::Util 'blessed';
+use Storable 'dclone';
+use namespace::clean -except => 'meta';
-{
- 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
=cut
-#to do: are we switching to moose-style key => value constructors from
-# catalyst-style {key => value} constructors ?
-
-around new => sub {
- my $orig = shift;
- my ( $self, $c ) = @_;
+__PACKAGE__->mk_classdata('_plugins');
+__PACKAGE__->mk_classdata('_config');
+
+sub BUILDARGS {
+ my $class = shift;
+ my $args = {};
+
+ if (@_ == 1) {
+ $args = $_[0] if ref($_[0]) eq 'HASH';
+ } elsif (@_ == 2) { # is it ($app, $args) or foo => 'bar' ?
+ if (blessed($_[0])) {
+ $args = $_[1] if ref($_[1]) eq 'HASH';
+ } elsif (Class::MOP::is_class_loaded($_[0]) &&
+ $_[0]->isa('Catalyst') && ref($_[1]) eq 'HASH') {
+ $args = $_[1];
+ } elsif ($_[0] == $_[1]) {
+ $args = $_[1];
+ } else {
+ $args = +{ @_ };
+ }
+ } elsif (@_ % 2 == 0) {
+ $args = +{ @_ };
+ }
- # 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 );
-};
+ return $class->merge_config_hashes( $class->config, $args );
+}
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}.\n";
+ warn "This behavior can no longer be supported, and so your application is probably broken.\n";
+ warn "Your linearized isa hierarchy is: " . join(', ', @{ mro::get_linear_isa($class) }) . "\n";
+ warn "Please see perldoc Catalyst::Upgrading for more information about this issue.\n";
}
+ 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;
+ my $config = $self->_config || {};
if (@_) {
my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
$self->_config(
} 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 );
+ # work in a subclass.
+ # TODO maybe this should be a ClassData option?
+ my $class = blessed($self) || $self;
+ my $meta = Class::MOP::get_metaclass_by_name($class);
+ unless ($meta->has_package_symbol('$_config')) {
+ $self->_config( dclone $config );
}
}
- return $config;
+ return $self->_config;
}
sub merge_config_hashes {
. " did not override Catalyst::Component::process" );
}
+__PACKAGE__->meta->make_immutable;
+
1;
__END__
Called by COMPONENT to instantiate the component; should return an object
to be stored in the application's component hash.
-=head2 COMPONENT($c, $arguments)
+=head2 COMPONENT
+
+C<< my $component_instance = $component->COMPONENT($app, $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
hashref and are merged with the __PACKAGE__->config hashref before calling
->new to instantiate the component.
+You can override it in your components to do custom instantiation, using
+something like this:
+
+ sub COMPONENT {
+ my ($class, $app, $args) = @_;
+ $args = $self->merge_config_hashes($self->config, $args);
+ return $class->new($app, $args);
+ }
+
=head2 $c->config
=head2 $c->config($hashref)
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.
+a Catalyst application has its own config hash.
=head2 $c->process()
=head2 ACCEPT_CONTEXT($c, @args)
-Catalyst components are normally initalized during server startup, either
+Catalyst components are normally initialized during server startup, either
as a Class or a Instance. However, some components require information about
the current request. To do so, they can implement an ACCEPT_CONTEXT method.
L<Catalyst>, L<Catalyst::Model>, L<Catalyst::View>, L<Catalyst::Controller>.
-=head1 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri@cpan.org>
-Marcus Ramberg, C<mramberg@cpan.org>
-Matt S Trout, C<mst@shadowcatsystems.co.uk>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT