use Carp ();
use List::Util qw( first );
-use List::MoreUtils qw( any all );
+use List::MoreUtils qw( any all uniq );
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '0.57';
+our $VERSION = '0.61';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
__PACKAGE__->meta->add_attribute('constructor_class' => (
accessor => 'constructor_class',
- default => sub { 'Moose::Meta::Method::Constructor' }
+ default => 'Moose::Meta::Method::Constructor',
));
__PACKAGE__->meta->add_attribute('destructor_class' => (
accessor => 'destructor_class',
- default => sub { 'Moose::Meta::Method::Destructor' }
+ default => 'Moose::Meta::Method::Destructor',
));
__PACKAGE__->meta->add_attribute('error_class' => (
(ref $options{roles} eq 'ARRAY')
|| $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles})
if exists $options{roles};
+ my $roles = delete $options{roles};
my $class = $self->SUPER::create($package_name, %options);
- if (exists $options{roles}) {
- Moose::Util::apply_all_roles($class, @{$options{roles}});
+ if ($roles) {
+ Moose::Util::apply_all_roles( $class, @$roles );
}
return $class;
}
sub new_object {
- my $class = shift;
+ my $class = shift;
my $params = @_ == 1 ? $_[0] : {@_};
- my $self = $class->SUPER::new_object($params);
- foreach my $attr ($class->compute_all_applicable_attributes()) {
- # if we have a trigger, then ...
- if ($attr->can('has_trigger') && $attr->has_trigger) {
- # make sure we have an init-arg ...
- if (defined(my $init_arg = $attr->init_arg)) {
- # now make sure an init-arg was passes ...
- if (exists $params->{$init_arg}) {
- # and if get here, fire the trigger
- $attr->trigger->(
- $self,
- # check if there is a coercion
- ($attr->should_coerce
- # and if so, we need to grab the
- # value that is actually been stored
- ? $attr->get_read_method_ref->($self)
- # otherwise, just get the value from
- # the constructor params
- : $params->{$init_arg}),
- $attr
- );
- }
- }
- }
+ my $self = $class->SUPER::new_object($params);
+
+ foreach my $attr ( $class->compute_all_applicable_attributes() ) {
+
+ next unless $attr->can('has_trigger') && $attr->has_trigger;
+
+ my $init_arg = $attr->init_arg;
+
+ next unless defined $init_arg;
+
+ next unless exists $params->{$init_arg};
+
+ $attr->trigger->(
+ $self,
+ (
+ $attr->should_coerce
+ ? $attr->get_read_method_ref->($self)
+ : $params->{$init_arg}
+ ),
+ $attr
+ );
}
+
return $self;
}
return $instance;
}
-# FIXME:
-# This is ugly
-sub get_method_map {
- my $self = shift;
-
- my $current = Class::MOP::check_package_cache_flag($self->name);
-
- if (defined $self->{'_package_cache_flag'} && $self->{'_package_cache_flag'} == $current) {
- return $self->{'methods'};
- }
-
- $self->{_package_cache_flag} = $current;
-
- my $map = $self->{'methods'};
-
- my $class_name = $self->name;
- my $method_metaclass = $self->method_metaclass;
-
- my %all_code = $self->get_all_package_symbols('CODE');
-
- foreach my $symbol (keys %all_code) {
- my $code = $all_code{$symbol};
-
- next if exists $map->{$symbol} &&
- defined $map->{$symbol} &&
- $map->{$symbol}->body == $code;
-
- my ($pkg, $name) = Class::MOP::get_code_info($code);
-
- if ($pkg->can('meta')
- # NOTE:
- # we don't know what ->meta we are calling
- # here, so we need to be careful cause it
- # just might blow up at us, or just complain
- # loudly (in the case of Curses.pm) so we
- # just be a little overly cautious here.
- # - SL
- && eval { no warnings; blessed($pkg->meta) }
- && $pkg->meta->isa('Moose::Meta::Role')) {
- #my $role = $pkg->meta->name;
- #next unless $self->does_role($role);
- }
- else {
-
- # NOTE:
- # in 5.10 constant.pm the constants show up
- # as being in the right package, but in pre-5.10
- # they show up as constant::__ANON__ so we
- # make an exception here to be sure that things
- # work as expected in both.
- # - SL
- unless ($pkg eq 'constant' && $name eq '__ANON__') {
- next if ($pkg || '') ne $class_name ||
- (($name || '') ne '__ANON__' && ($pkg || '') ne $class_name);
- }
-
- }
-
- $map->{$symbol} = $method_metaclass->wrap(
- $code,
- package_name => $class_name,
- name => $symbol
- );
- }
-
- return $map;
-}
-
### ---------------------------------------------
sub add_attribute {
# I don't want to have to type this >1 time
my @MetaClassTypes =
- qw( attribute_metaclass method_metaclass instance_metaclass constructor_class destructor_class );
+ qw( attribute_metaclass method_metaclass instance_metaclass
+ constructor_class destructor_class error_class );
sub _reconcile_with_superclass_meta {
my ($self, $super) = @_;
instance_metaclass => $new_meta->instance_metaclass,
);
- $new_self->$_( $new_meta->$_ ) for qw( constructor_class destructor_class );
+ $new_self->$_( $new_meta->$_ )
+ for qw( constructor_class destructor_class error_class );
%$self = %$new_self;
push @roles, $meta->calculate_all_roles;
}
- return @roles;
+ return uniq @roles;
}
sub _reconcile_role_differences {
@args = %{$args[0]} if scalar @args == 1 && ref($args[0]) eq 'HASH';
- if ($name =~ /^\+(.*)/) {
+ if (($name || '') =~ /^\+(.*)/) {
return $self->_process_inherited_attribute($1, @args);
}
else {
my $class = ref $self ? $self->error_class : "Moose::Error::Default";
+ Class::MOP::load_class($class);
+
$class->new(
Carp::caller_info($args{depth}),
%args
L<Moose::Meta::Method::Destructor> respectively. These accessors are
read-write, so you can use them to change the class name.
+=item B<error_class ($class_name)>
+
+The name of the class used to throw errors. This default to
+L<Moose::Error::Default>, which generates an error with a stacktrace
+just like C<Carp::confess>.
+
=item B<check_metaclass_compatibility>
Moose overrides this method from C<Class::MOP::Class> and attempts to
=item B<error_class $class_name>
-Get or set the error class. Has no default.
+Get or set the error class. This defaults to L<Moose::Error::Default>.
=item B<create_error_confess %args>
projects / gitmo/Moose.git / blobdiff