use Scalar::Util 'blessed';
use Mouse::Meta::Role;
+use Mouse::Util;
our @EXPORT = qw(before after around super override inner augment has extends with requires excludes confess blessed);
+our %is_removable = map{ $_ => undef } @EXPORT;
+delete $is_removable{confess};
+delete $is_removable{blessed};
sub before {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $code = pop;
for (@_) {
}
sub after {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $code = pop;
for (@_) {
}
sub around {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $code = pop;
for (@_) {
}
sub has {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $name = shift;
my %opts = @_;
sub extends { confess "Roles do not currently support 'extends'" }
sub with {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $role = shift;
my $args = shift || {};
confess "Mouse::Role only supports 'with' on individual roles at a time" if @_ || !ref $args;
}
sub requires {
- my $meta = Mouse::Meta::Role->initialize(caller);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
Carp::croak "Must specify at least one method" unless @_;
$meta->add_required_methods(@_);
}
return;
}
- my $meta = Mouse::Meta::Role->initialize(caller);
-
- no strict 'refs';
- no warnings 'redefine';
- *{$caller.'::meta'} = sub { $meta };
+ Mouse::Meta::Role->initialize($caller)->add_method(meta => sub {
+ return Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]);
+ });
Mouse::Role->export_to_level(1, @_);
}
sub unimport {
my $caller = caller;
- no strict 'refs';
+ my $stash = do{
+ no strict 'refs';
+ \%{$caller . '::'}
+ };
+
for my $keyword (@EXPORT) {
- delete ${ $caller . '::' }{$keyword};
+ my $code;
+ if(exists $is_removable{$keyword}
+ && ($code = $caller->can($keyword))
+ && (Mouse::Util::get_code_info($code))[0] eq __PACKAGE__){
+
+ delete $stash->{$keyword};
+ }
}
+ return;
}
1;