use List::MoreUtils qw( any all uniq );
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '0.57';
+our $VERSION = '0.67';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
# something like Super::Class|Super::Class::2=Role|Role::1
my $cache_key = join '=' => (
- join('|', sort @{$options{superclasses} || []}),
- join('|', sort @{$options{roles} || []}),
+ join('|', @{$options{superclasses} || []}),
+ join('|', sort @{$options{roles} || []}),
);
if ($cache_ok && defined $ANON_CLASSES{$cache_key}) {
}
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 {
my ($self, $attr_name, %options) = @_;
my $inherited_attr = $self->find_attribute_by_name($attr_name);
(defined $inherited_attr)
- || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from", data => $attr_name);
+ || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from in ${\$self->name}", data => $attr_name);
if ($inherited_attr->isa('Moose::Meta::Attribute')) {
return $inherited_attr->clone_and_inherit_options(%options);
}
=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>
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Moose.git / blobdiff