use warnings;
use base 'Exporter';
-use Carp 'confess', 'croak';
+use Carp 'confess';
use Scalar::Util 'blessed';
-use Mouse::Meta::Role;
+use Mouse::Util qw(load_class not_supported);
+use Mouse ();
-our @EXPORT = qw(before after around super override inner augment has extends with requires excludes confess blessed);
+our @EXPORT = qw(
+ extends with
+ has
+ before after around
+ override super
+ augment inner
+
+ requires excludes
+
+ blessed confess
+);
+
+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 (@_) {
my $fullname = "${classname}::${name}";
defined &$fullname
- && confess "Cannot add an override of method '$fullname' " .
- "because there is a local version of '$fullname'";
+ && $meta->throw_error("Cannot add an override of method '$fullname' "
+ . "because there is a local version of '$fullname'");
$meta->add_override_method_modifier($name => sub {
local $Mouse::SUPER_PACKAGE = shift;
# We keep the same errors messages as Moose::Role emits, here.
sub inner {
- croak "Moose::Role cannot support 'inner'";
+ Carp::croak "Roles cannot support 'inner'";
}
sub augment {
- croak "Moose::Role cannot support 'augment'";
+ Carp::croak "Roles cannot support 'augment'";
}
sub has {
- my $meta = Mouse::Meta::Role->initialize(caller);
-
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
my $name = shift;
- my %opts = @_;
- $meta->add_attribute($name => \%opts);
+ $meta->add_attribute($_ => @_) for ref($name) ? @{$name} : $name;
}
-sub extends { confess "Roles do not currently support 'extends'" }
+sub extends {
+ Carp::croak "Roles do not support 'extends'"
+}
sub with {
- my $meta = Mouse::Meta::Role->initialize(caller);
- my $role = shift;
- my $args = shift || {};
- confess "Mouse::Role only supports 'with' on individual roles at a time" if @_ || !ref $args;
-
- Mouse::load_class($role);
- $role->meta->apply($meta, %$args);
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
+ Mouse::Util::apply_all_roles($meta->name, @_);
}
sub requires {
- my $meta = Mouse::Meta::Role->initialize(caller);
- Carp::croak "Must specify at least one method" unless @_;
+ my $meta = Mouse::Meta::Role->initialize(scalar caller);
+ $meta->throw_error("Must specify at least one method") unless @_;
$meta->add_required_methods(@_);
}
-sub excludes { confess "Mouse::Role does not currently support 'excludes'" }
+sub excludes {
+ not_supported;
+}
sub import {
my $class = shift;
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;