use strict;
use warnings FATAL => 'all';
-our $VERSION = '1.001005'; # 1.1.5
+our $VERSION = '1.003002'; # 1.3.2
$VERSION = eval $VERSION;
our %INFO;
my $me = shift;
strict->import;
warnings->import(FATAL => 'all');
- return if $INFO{$target}; # already exported into this package
+ return if $me->is_role($target); # already exported into this package
+ $INFO{$target}{is_role} = 1;
# get symbol table reference
- my $stash = do { no strict 'refs'; \%{"${target}::"} };
+ my $stash = _getstash($target);
# install before/after/around subs
foreach my $type (qw(before after around)) {
*{_getglob "${target}::${type}"} = sub {
};
# grab all *non-constant* (stash slot is not a scalarref) subs present
# in the symbol table and store their refaddrs (no need to forcibly
- # inflate constant subs into real subs) - also add '' to here (this
- # is used later) with a map to the coderefs in case of copying or re-use
- my @not_methods = ('', map { *$_{CODE}||() } grep !ref($_), values %$stash);
+ # inflate constant subs into real subs) with a map to the coderefs in
+ # case of copying or re-use
+ my @not_methods = (map { *$_{CODE}||() } grep !ref($_), values %$stash);
@{$INFO{$target}{not_methods}={}}{@not_methods} = @not_methods;
# a role does itself
$APPLIED_TO{$target} = { $target => undef };
}
+sub role_application_steps {
+ qw(_install_methods _check_requires _install_modifiers _copy_applied_list);
+}
+
sub apply_single_role_to_package {
my ($me, $to, $role) = @_;
_load_module($role);
die "This is apply_role_to_package" if ref($to);
- die "${role} is not a Role::Tiny" unless my $info = $INFO{$role};
-
- $me->_check_requires($to, $role, @{$info->{requires}||[]});
-
- $me->_install_methods($to, $role);
+ die "${role} is not a Role::Tiny" unless $me->is_role($role);
- $me->_install_modifiers($to, $info->{modifiers});
-
- # only add does() method to classes and only if they don't have one
- if (not $INFO{$to} and not $to->can('does')) {
- *{_getglob "${to}::does"} = \&does_role;
+ foreach my $step ($me->role_application_steps) {
+ $me->$step($to, $role);
}
+}
+sub _copy_applied_list {
+ my ($me, $to, $role) = @_;
# copy our role list into the target's
@{$APPLIED_TO{$to}||={}}{keys %{$APPLIED_TO{$role}}} = ();
}
$object;
}
+my $role_suffix = 'A000';
+sub _composite_name {
+ my ($me, $superclass, @roles) = @_;
+
+ my $new_name = join(
+ '__WITH__', $superclass, my $compose_name = join '__AND__', @roles
+ );
+
+ if (length($new_name) > 252) {
+ $new_name = $COMPOSED{abbrev}{$new_name}
+ ||= substr($new_name, 0, 250 - length $role_suffix).'__'.$role_suffix++;
+ }
+ return wantarray ? ($new_name, $compose_name) : $new_name;
+}
+
sub create_class_with_roles {
my ($me, $superclass, @roles) = @_;
die "No roles supplied!" unless @roles;
+ _load_module($superclass);
{
my %seen;
$seen{$_}++ for @roles;
}
}
- my $new_name = join(
- '__WITH__', $superclass, my $compose_name = join '__AND__', @roles
- );
+ my ($new_name, $compose_name) = $me->_composite_name($superclass, @roles);
return $new_name if $COMPOSED{class}{$new_name};
foreach my $role (@roles) {
_load_module($role);
- die "${role} is not a Role::Tiny" unless $INFO{$role};
+ die "${role} is not a Role::Tiny" unless $me->is_role($role);
}
if ($] >= 5.010) {
require MRO::Compat;
}
- my %conflicts = %{$me->_composite_info_for(@roles)->{conflicts}};
+ my $composite_info = $me->_composite_info_for(@roles);
+ my %conflicts = %{$composite_info->{conflicts}};
if (keys %conflicts) {
my $fail =
join "\n",
my @composable = map $me->_composable_package_for($_), reverse @roles;
- *{_getglob("${new_name}::ISA")} = [ @composable, $superclass ];
-
- my @info = map $INFO{$_}, @roles;
+ # some methods may not exist in the role, but get generated by
+ # _composable_package_for (Moose accessors via Moo). filter out anything
+ # provided by the composable packages, excluding the subs we generated to
+ # make modifiers work.
+ my @requires = grep {
+ my $method = $_;
+ !grep $_->can($method) && !$COMPOSED{role}{$_}{modifiers_only}{$method},
+ @composable
+ } @{$composite_info->{requires}};
$me->_check_requires(
- $new_name, $compose_name,
- do { my %h; @h{map @{$_->{requires}||[]}, @info} = (); keys %h }
+ $superclass, $compose_name, \@requires
);
- *{_getglob "${new_name}::does"} = \&does_role unless $new_name->can('does');
+ *{_getglob("${new_name}::ISA")} = [ @composable, $superclass ];
@{$APPLIED_TO{$new_name}||={}}{
map keys %{$APPLIED_TO{$_}}, @roles
return $me->apply_role_to_package($to, $roles[0]) if @roles == 1;
my %conflicts = %{$me->_composite_info_for(@roles)->{conflicts}};
- delete $conflicts{$_} for $me->_concrete_methods_of($to);
+ my @have = grep $to->can($_), keys %conflicts;
+ delete @conflicts{@have};
+
if (keys %conflicts) {
my $fail =
join "\n",
die $fail;
}
+ # conflicting methods are supposed to be treated as required by the
+ # composed role. we don't have an actual composed role, but because
+ # we know the target class already provides them, we can instead
+ # pretend that the roles don't do for the duration of application.
+ my @role_methods = map $me->_concrete_methods_of($_), @roles;
+ # separate loops, since local ..., delete ... for ...; creates a scope
+ local @{$_}{@have} for @role_methods;
+ delete @{$_}{@have} for @role_methods;
+
# the if guard here is essential since otherwise we accidentally create
# a $INFO for something that isn't a Role::Tiny (or Moo::Role) because
# autovivification hates us and wants us to die()
delete $INFO{$to}{methods}; # reset since we're about to add methods
}
- $me->apply_role_to_package($to, $_) for @roles;
+ # backcompat: allow subclasses to use apply_single_role_to_package
+ # to apply changes. set a local var so ours does nothing.
+ our %BACKCOMPAT_HACK;
+ if($me ne __PACKAGE__
+ and exists $BACKCOMPAT_HACK{$me} ? $BACKCOMPAT_HACK{$me} :
+ $BACKCOMPAT_HACK{$me} =
+ $me->can('role_application_steps')
+ == \&role_application_steps
+ && $me->can('apply_single_role_to_package')
+ != \&apply_single_role_to_package
+ ) {
+ foreach my $role (@roles) {
+ $me->apply_single_role_to_package($to, $role);
+ }
+ }
+ else {
+ foreach my $step ($me->role_application_steps) {
+ foreach my $role (@roles) {
+ $me->$step($to, $role);
+ }
+ }
+ }
$APPLIED_TO{$to}{join('|',@roles)} = 1;
}
sub _composite_info_for {
my ($me, @roles) = @_;
$COMPOSITE_INFO{join('|', sort @roles)} ||= do {
- _load_module($_) for @roles;
+ foreach my $role (@roles) {
+ _load_module($role);
+ }
my %methods;
foreach my $role (@roles) {
my $this_methods = $me->_concrete_methods_of($role);
$methods{$_}{$this_methods->{$_}} = $role for keys %$this_methods;
}
+ my %requires;
+ @requires{map @{$INFO{$_}{requires}||[]}, @roles} = ();
+ delete $requires{$_} for keys %methods;
delete $methods{$_} for grep keys(%{$methods{$_}}) == 1, keys %methods;
- +{ conflicts => \%methods }
+ +{ conflicts => \%methods, requires => [keys %requires] }
};
}
return $composed_name if $COMPOSED{role}{$composed_name};
$me->_install_methods($composed_name, $role);
my $base_name = $composed_name.'::_BASE';
- *{_getglob("${composed_name}::ISA")} = [ $base_name ];
+ # force stash to exist so ->can doesn't complain
+ _getstash($base_name);
+ # Not using _getglob, since setting @ISA via the typeglob breaks
+ # inheritance on 5.10.0 if the stash has previously been accessed an
+ # then a method called on the class (in that order!), which
+ # ->_install_methods (with the help of ->_install_does) ends up doing.
+ { no strict 'refs'; @{"${composed_name}::ISA"} = ( $base_name ); }
my $modifiers = $INFO{$role}{modifiers}||[];
my @mod_base;
- foreach my $modified (
- do { my %h; @h{map $_->[1], @$modifiers} = (); keys %h }
- ) {
+ my @modifiers = grep !$composed_name->can($_),
+ do { my %h; @h{map @{$_}[1..$#$_-1], @$modifiers} = (); keys %h };
+ foreach my $modified (@modifiers) {
push @mod_base, "sub ${modified} { shift->next::method(\@_) }";
}
my $e;
$e = "Evaling failed: $@\nTrying to eval:\n${code}" if $@;
}
die $e if $e;
- $me->_install_modifiers($composed_name, $modifiers);
- $COMPOSED{role}{$composed_name} = 1;
+ $me->_install_modifiers($composed_name, $role);
+ $COMPOSED{role}{$composed_name} = {
+ modifiers_only => { map { $_ => 1 } @modifiers },
+ };
return $composed_name;
}
sub _check_requires {
- my ($me, $to, $name, @requires) = @_;
+ my ($me, $to, $name, $requires) = @_;
+ return unless my @requires = @{$requires||$INFO{$name}{requires}||[]};
if (my @requires_fail = grep !$to->can($_), @requires) {
# role -> role, add to requires, role -> class, error out
if (my $to_info = $INFO{$to}) {
my ($me, $role) = @_;
my $info = $INFO{$role};
# grab role symbol table
- my $stash = do { no strict 'refs'; \%{"${role}::"}};
+ my $stash = _getstash($role);
# reverse so our keys become the values (captured coderefs) in case
# they got copied or re-used since
my $not_methods = { reverse %{$info->{not_methods}||{}} };
# grab all code entries that aren't in the not_methods list
map {
my $code = *{$stash->{$_}}{CODE};
- # rely on the '' key we added in import for "no code here"
- exists $not_methods->{$code||''} ? () : ($_ => $code)
+ ( ! $code or exists $not_methods->{$code} ) ? () : ($_ => $code)
} grep !ref($stash->{$_}), keys %$stash
};
}
sub methods_provided_by {
my ($me, $role) = @_;
- die "${role} is not a Role::Tiny" unless my $info = $INFO{$role};
- (keys %{$me->_concrete_methods_of($role)}, @{$info->{requires}||[]});
+ die "${role} is not a Role::Tiny" unless $me->is_role($role);
+ (keys %{$me->_concrete_methods_of($role)}, @{$INFO{$role}->{requires}||[]});
}
sub _install_methods {
my $methods = $me->_concrete_methods_of($role);
# grab target symbol table
- my $stash = do { no strict 'refs'; \%{"${to}::"}};
+ my $stash = _getstash($to);
# determine already extant methods of target
my %has_methods;
no warnings 'once';
*{_getglob "${to}::${i}"} = $methods->{$i};
}
+
+ $me->_install_does($to);
}
sub _install_modifiers {
- my ($me, $to, $modifiers) = @_;
+ my ($me, $to, $name) = @_;
+ return unless my $modifiers = $INFO{$name}{modifiers};
if (my $info = $INFO{$to}) {
push @{$info->{modifiers}}, @{$modifiers||[]};
} else {
}
}
+my $vcheck_error;
+
sub _install_single_modifier {
my ($me, @args) = @_;
+ defined($vcheck_error) or $vcheck_error = do {
+ local $@;
+ eval { Class::Method::Modifiers->VERSION(1.05); 1 }
+ ? 0
+ : $@
+ };
+ $vcheck_error and die $vcheck_error;
Class::Method::Modifiers::install_modifier(@args);
}
+my $FALLBACK = sub { 0 };
+sub _install_does {
+ my ($me, $to) = @_;
+
+ # only add does() method to classes
+ return if $me->is_role($to);
+
+ # add does() only if they don't have one
+ *{_getglob "${to}::does"} = \&does_role unless $to->can('does');
+
+ return
+ if $to->can('DOES') and $to->can('DOES') != (UNIVERSAL->can('DOES') || 0);
+
+ my $existing = $to->can('DOES') || $to->can('isa') || $FALLBACK;
+ my $new_sub = sub {
+ my ($proto, $role) = @_;
+ Role::Tiny::does_role($proto, $role) or $proto->$existing($role);
+ };
+ no warnings 'redefine';
+ *{_getglob "${to}::DOES"} = $new_sub;
+}
+
sub does_role {
my ($proto, $role) = @_;
if ($] >= 5.010) {
return 0;
}
+sub is_role {
+ my ($me, $role) = @_;
+ return !!($INFO{$role} && $INFO{$role}{is_role});
+}
+
1;
+=encoding utf-8
+
=head1 NAME
Role::Tiny - Roles. Like a nouvelle cuisine portion size slice of Moose.
...
}
-will work for classes but to test a role, one must use ::does_role directly
+will work for classes but to test a role, one must use ::does_role directly.
+
+Additionally, Role::Tiny will override the standard Perl C<DOES> method
+for your class. However, if C<any> class in your class' inheritance
+hierarchy provides C<DOES>, then Role::Tiny will not override it.
=head1 METHODS
Creates a new class based on base, with the roles composed into it in order.
New class is returned.
+=head2 is_role
+
+ Role::Tiny->is_role('Some::Role1')
+
+Returns true if the given package is a role.
+
=head1 SEE ALSO
L<Role::Tiny> is the attribute-less subset of L<Moo::Role>; L<Moo::Role> is
ilmari - Dagfinn Ilmari Mannsåker (cpan:ILMARI) <ilmari@ilmari.org>
+tobyink - Toby Inkster (cpan:TOBYINK) <tobyink@cpan.org>
+
=head1 COPYRIGHT
Copyright (c) 2010-2012 the Role::Tiny L</AUTHOR> and L</CONTRIBUTORS>