use Sub::Exporter;
use Scalar::Util 'blessed';
-use Carp 'confess';
-use Class::MOP 0.56;
+use Class::MOP 0.60;
-our $VERSION = '0.50';
+our $VERSION = '0.63';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
my @exports = qw[
resolve_metatrait_alias
resolve_metaclass_alias
add_method_modifier
+ english_list
];
Sub::Exporter::setup_exporter({
sub apply_all_roles {
my $applicant = shift;
-
- confess "Must specify at least one role to apply to $applicant" unless @_;
-
- my $roles = Data::OptList::mkopt([ @_ ]);
-
- #use Data::Dumper;
- #warn Dumper $roles;
-
- my $meta = (blessed $applicant ? $applicant : find_meta($applicant));
-
+
+ Moose->throw_error("Must specify at least one role to apply to $applicant") unless @_;
+
+ my $roles = Data::OptList::mkopt( [@_] );
+
+ my $meta = ( blessed $applicant ? $applicant : find_meta($applicant) );
+
foreach my $role_spec (@$roles) {
- Class::MOP::load_class($role_spec->[0]);
+ Class::MOP::load_class( $role_spec->[0] );
}
-
- ($_->[0]->can('meta') && $_->[0]->meta->isa('Moose::Meta::Role'))
- || confess "You can only consume roles, " . $_->[0] . " is not a Moose role"
- foreach @$roles;
- if (scalar @$roles == 1) {
- my ($role, $params) = @{$roles->[0]};
- $role->meta->apply($meta, (defined $params ? %$params : ()));
+ ( $_->[0]->can('meta') && $_->[0]->meta->isa('Moose::Meta::Role') )
+ || Moose->throw_error("You can only consume roles, "
+ . $_->[0]
+ . " is not a Moose role")
+ foreach @$roles;
+
+ if ( scalar @$roles == 1 ) {
+ my ( $role, $params ) = @{ $roles->[0] };
+ $role->meta->apply( $meta, ( defined $params ? %$params : () ) );
}
else {
- Moose::Meta::Role->combine(
- @$roles
- )->apply($meta);
- }
+ Moose::Meta::Role->combine( @$roles )->apply($meta);
+ }
}
# instance deconstruction ...
}
sub resolve_metatrait_alias {
- resolve_metaclass_alias( @_, trait => 1 );
+ return resolve_metaclass_alias( @_, trait => 1 );
}
-sub resolve_metaclass_alias {
- my ( $type, $metaclass_name, %options ) = @_;
+{
+ my %cache;
+
+ sub resolve_metaclass_alias {
+ my ( $type, $metaclass_name, %options ) = @_;
+
+ my $cache_key = $type . q{ } . ( $options{trait} ? '-Trait' : '' );
+ return $cache{$cache_key}{$metaclass_name}
+ if $cache{$cache_key}{$metaclass_name};
- if ( my $resolved = eval {
- my $possible_full_name = 'Moose::Meta::' . $type . '::Custom::' . ( $options{trait} ? "Trait::" : "" ) . $metaclass_name;
+ my $possible_full_name
+ = 'Moose::Meta::'
+ . $type
+ . '::Custom::'
+ . ( $options{trait} ? "Trait::" : "" )
+ . $metaclass_name;
- Class::MOP::load_class($possible_full_name);
+ my $loaded_class = Class::MOP::load_first_existing_class(
+ $possible_full_name,
+ $metaclass_name
+ );
- $possible_full_name->can('register_implementation')
- ? $possible_full_name->register_implementation
- : $possible_full_name;
- } ) {
- return $resolved;
- } else {
- Class::MOP::load_class($metaclass_name);
- return $metaclass_name;
+ return $cache{$cache_key}{$metaclass_name}
+ = $loaded_class->can('register_implementation')
+ ? $loaded_class->register_implementation
+ : $loaded_class;
}
}
my $add_modifier_method = 'add_' . $modifier_name . '_method_modifier';
if ( my $method_modifier_type = ref( @{$args}[0] ) ) {
if ( $method_modifier_type eq 'Regexp' ) {
- my @all_methods = $meta->compute_all_applicable_methods;
+ my @all_methods = $meta->get_all_methods;
my @matched_methods
- = grep { $_->{name} =~ @{$args}[0] } @all_methods;
- $meta->$add_modifier_method( $_->{name}, $code )
+ = grep { $_->name =~ @{$args}[0] } @all_methods;
+ $meta->$add_modifier_method( $_->name, $code )
for @matched_methods;
}
}
}
}
+sub english_list {
+ my @items = sort @_;
+
+ return $items[0] if @items == 1;
+ return "$items[0] and $items[1]" if @items == 2;
+
+ my $tail = pop @items;
+ my $list = join ', ', @items;
+ $list .= ', and ' . $tail;
+
+ return $list;
+}
+
1;
__END__
=item B<add_method_modifier ($class_or_obj, $modifier_name, $args)>
+=item B<english_list(@items)>
+
+Given a list of scalars, turns them into a proper list in English
+("one and two", "one, two, three, and four"). This is used to help us
+make nicer error messages.
+
=back
=head1 TODO