From: gfx <gfuji@cpan.org>
Date: Sun, 20 Sep 2009 06:35:56 +0000 (+0900)
Subject: Refactoring
X-Git-Tag: 0.32~48
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a63a2e7ef8fbac5f61eab04baecbf5d19374b83;p=gitmo%2FMouse.git

Refactoring

* Make unimport() compatible with Moose (resolve TODOs in t/006-unimport.t)
* Add a new module Mouse::Meta::Module, which provides common methods for Class and Role
* Reactor Mouse::Meta::Role
---

diff --git a/lib/Mouse.pm b/lib/Mouse.pm
index 7ca9997..98d19e5 100644
--- a/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@ -17,6 +17,10 @@ use Mouse::Util::TypeConstraints;
 
 our @EXPORT = qw(extends has before after around override super blessed confess with);
 
+our %is_removable = map{ $_ => undef } @EXPORT;
+delete $is_removable{blessed};
+delete $is_removable{confess};
+
 sub extends { Mouse::Meta::Class->initialize(caller)->superclasses(@_) }
 
 sub has {
@@ -119,13 +123,10 @@ sub init_meta {
     $meta->superclasses($base_class)
         unless $meta->superclasses;
 
-    {
-        no strict 'refs';
-        no warnings 'redefine';
-        *{$class.'::meta'} = sub {
-            return Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]);
-        };
-    }
+    $meta->add_method(meta => sub{
+        return Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]);
+    });
+
 
     return $meta;
 }
@@ -171,9 +172,19 @@ sub import {
 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};
+        }
     }
 }
 
@@ -227,9 +238,7 @@ sub is_class_loaded {
 }
 
 sub class_of {
-    return unless defined $_[0];
-    my $class = blessed($_[0]) || $_[0];
-    return Mouse::Meta::Class::get_metaclass_by_name($class);
+    return Mouse::Meta::Class::class_of($_[0]);
 }
 
 1;
diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index 7ba5692..d1bffe3 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -5,9 +5,11 @@ use warnings;
 use Mouse::Meta::Method::Constructor;
 use Mouse::Meta::Method::Destructor;
 use Scalar::Util qw/blessed weaken/;
-use Mouse::Util qw/get_linear_isa version authority identifier/;
+use Mouse::Util qw/get_linear_isa version authority identifier get_code_info/;
 use Carp 'confess';
 
+use base qw(Mouse::Meta::Module);
+
 do {
     my %METACLASS_CACHE;
 
@@ -29,6 +31,12 @@ do {
             ||= $class->_construct_class_instance(package => $package_name, @args);
     }
 
+    sub class_of{
+        my($class_or_instance) = @_;
+        return undef unless defined $class_or_instance;
+        return $METACLASS_CACHE{ blessed($class_or_instance) || $class_or_instance };
+    }
+
     # Means of accessing all the metaclasses that have
     # been initialized thus far
     sub get_all_metaclasses         {        %METACLASS_CACHE         }
@@ -49,12 +57,20 @@ sub _construct_class_instance {
         no strict 'refs';
         \@{ $args{package} . '::ISA' };
     };
-    $args{roles} ||= [];
+    $args{roles}   ||= [];
+    $args{methods} ||= {};
 
     bless \%args, $class;
 }
 
 sub name { $_[0]->{package} }
+sub _method_map{ $_[0]->{methods} }
+
+sub namespace{
+    my $name = $_[0]->{package};
+    no strict 'refs';
+    return \%{ $name . '::' };
+}
 
 sub superclasses {
     my $self = shift;
@@ -67,50 +83,11 @@ sub superclasses {
     @{ $self->{superclasses} };
 }
 
-sub add_method {
-    my $self = shift;
-    my $name = shift;
-    my $code = shift;
-
-    my $pkg = $self->name;
-
-    no strict 'refs';
-    no warnings 'redefine';
-    $self->{'methods'}->{$name}++; # Moose stores meta object here.
-    *{ $pkg . '::' . $name } = $code;
-}
-
-sub has_method {
-    my $self = shift;
-    my $name = shift;
-    $self->name->can($name);
-}
-
-# copied from Class::Inspector
-my $get_methods_for_class = sub {
-    my $self = shift;
-    my $name = shift;
-
-    no strict 'refs';
-    # Get all the CODE symbol table entries
-    my @functions =
-      grep !/^(?:has|with|around|before|after|augment|inner|blessed|extends|confess|override|super)$/,
-      grep { defined &{"${name}::$_"} }
-      keys %{"${name}::"};
-    push @functions, keys %{$self->{'methods'}->{$name}} if $self;
-    wantarray ? @functions : \@functions;
-};
-
-sub get_method_list {
-    my $self = shift;
-    $get_methods_for_class->($self, $self->name);
-}
-
 sub get_all_method_names {
     my $self = shift;
     my %uniq;
     return grep { $uniq{$_}++ == 0 }
-            map { $get_methods_for_class->(undef, $_) }
+            map { Mouse::Meta::Class->initialize($_)->get_method_list() }
             $self->linearized_isa;
 }
 
@@ -309,9 +286,11 @@ sub does_role {
         || confess "You must supply a role name to look for";
 
     for my $class ($self->linearized_isa) {
-        next unless $class->can('meta') and $class->meta->can('roles');
-        for my $role (@{ $class->meta->roles }) {
-            return 1 if $role->name eq $role_name;
+        my $meta = class_of($class);
+        next unless $meta && $meta->can('roles');
+
+        for my $role (@{ $meta->roles }) {
+            return 1 if $role->does_role($role_name);
         }
     }
 
diff --git a/lib/Mouse/Meta/Module.pm b/lib/Mouse/Meta/Module.pm
new file mode 100755
index 0000000..01d42c1
--- /dev/null
+++ b/lib/Mouse/Meta/Module.pm
@@ -0,0 +1,79 @@
+package Mouse::Meta::Module;
+use strict;
+use warnings;
+
+use Scalar::Util qw/blessed weaken/;
+use Mouse::Util qw/version authority identifier get_code_info/;
+use Carp 'confess';
+
+sub name { $_[0]->{package} }
+sub _method_map{ $_[0]->{methods} }
+
+sub namespace{
+    my $name = $_[0]->{package};
+    no strict 'refs';
+    return \%{ $name . '::' };
+}
+
+sub add_method {
+    my($self, $name, $code) = @_;
+
+    if(!defined $name){
+        confess "You must pass a defined name";
+    }
+    if(ref($code) ne 'CODE'){
+        confess "You must pass a CODE reference";
+    }
+
+    $self->_method_map->{$name}++; # Moose stores meta object here.
+
+    my $pkg = $self->name;
+    no strict 'refs';
+    no warnings 'redefine';
+    *{ $pkg . '::' . $name } = $code;
+}
+
+sub _code_is_mine { # taken from Class::MOP::Class
+    my ( $self, $code ) = @_;
+
+    my ( $code_package, $code_name ) = get_code_info($code);
+
+    return $code_package && $code_package eq $self->name
+        || ( $code_package eq 'constant' && $code_name eq '__ANON__' );
+}
+
+sub has_method {
+    my($self, $method_name) = @_;
+
+    return 1 if $self->_method_map->{$method_name};
+    my $code = $self->name->can($method_name);
+
+    return $code && $self->_code_is_mine($code);
+}
+
+
+
+sub get_method_list {
+    my($self) = @_;
+
+    return grep { $self->has_method($_) } keys %{ $self->namespace };
+}
+
+sub get_attribute_map { $_[0]->{attributes} }
+sub has_attribute     { exists $_[0]->{attributes}->{$_[1]} }
+sub get_attribute     { $_[0]->{attributes}->{$_[1]} }
+sub get_attribute_list {
+    my $self = shift;
+    keys %{$self->get_attribute_map};
+}
+
+
+1;
+
+__END__
+
+=head1 NAME
+
+Mouse::Meta::Module - Common base class for Mouse::Meta::Class and Mouse::Meta::Role
+
+=cut
diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 4910f72..ff0c439 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Carp 'confess';
 
-use Mouse::Util qw(version authority identifier);
+use base qw(Mouse::Meta::Module);
 
 do {
     my %METACLASS_CACHE;
@@ -17,18 +17,21 @@ do {
     }
 
     sub initialize {
-        my $class = shift;
-        my $name  = shift;
-        $METACLASS_CACHE{$name} = $class->new(name => $name)
-            if !exists($METACLASS_CACHE{$name});
-        return $METACLASS_CACHE{$name};
+        my($class, $package_name, @args) = @_;
+
+        ($package_name && !ref($package_name))
+            || confess("You must pass a package name and it cannot be blessed");
+
+        return $METACLASS_CACHE{$package_name}
+            ||= $class->_new(package => $package_name, @args);
     }
 };
 
-sub new {
+sub _new {
     my $class = shift;
     my %args  = @_;
 
+    $args{methods}          ||= {};
     $args{attributes}       ||= {};
     $args{required_methods} ||= [];
     $args{roles}            ||= [];
@@ -36,16 +39,12 @@ sub new {
     bless \%args, $class;
 }
 
-sub name { $_[0]->{name} }
-
 sub add_required_methods {
     my $self = shift;
     my @methods = @_;
     push @{$self->{required_methods}}, @methods;
 }
 
-
-
 sub add_attribute {
     my $self = shift;
     my $name = shift;
@@ -57,234 +56,180 @@ sub has_attribute { exists $_[0]->{attributes}->{$_[1]}  }
 sub get_attribute_list { keys %{ $_[0]->{attributes} } }
 sub get_attribute { $_[0]->{attributes}->{$_[1]} }
 
-# copied from Class::Inspector
-sub get_method_list {
-    my $self = shift;
-    my $name = $self->name;
+sub _check_required_methods{
+    my($role, $class, $args, @other_roles) = @_;
+
+    if($class->isa('Mouse::Meta::Class')){
+        my $class_name = $class->name;
+        foreach my $method_name(@{$role->{required_methods}}){
+            unless($class_name->can($method_name)){
+                my $role_name       = $role->name;
+                my $has_method      = 0;
+
+                foreach my $another_role_spec(@other_roles){
+                    my $another_role_name = $another_role_spec->[0];
+                    if($role_name ne $another_role_name && $another_role_name->can($method_name)){
+                        $has_method = 1;
+                        last;
+                    }
+                }
+                
+                confess "'$role_name' requires the method '$method_name' to be implemented by '$class_name'"
+                    unless $has_method;
+            }
+        }
+    }
 
-    no strict 'refs';
-    # Get all the CODE symbol table entries
-    my @functions =
-      grep !/^(?:has|with|around|before|after|augment|inner|override|super|blessed|extends|confess|excludes|requires)$/,
-      grep { defined &{"${name}::$_"} }
-      keys %{"${name}::"};
-    wantarray ? @functions : \@functions;
+    return;
 }
 
-# Moose uses Application::ToInstance, Application::ToClass, Application::ToRole
-sub apply {
-    my $self  = shift;
-    my $selfname = $self->name;
-    my $class = shift;
-    my $classname = $class->name;
-    my %args  = @_;
+sub _apply_methods{
+    my($role, $class, $args) = @_;
 
-    if ($class->isa('Mouse::Object')) {
-        Carp::croak('Mouse does not support Application::ToInstance yet');
-    }
+    my $role_name  = $role->name;
+    my $class_name = $class->name;
+    my $alias      = $args->{alias};
 
-    if ($class->isa('Mouse::Meta::Class')) {
-        for my $name (@{$self->{required_methods}}) {
-            unless ($classname->can($name)) {
-                confess "'$selfname' requires the method '$name' to be implemented by '$classname'";
-            }
+    foreach my $method_name($role->get_method_list){
+        next if $method_name eq 'meta';
+
+        my $code = $role_name->can($method_name);
+        if(do{ no strict 'refs'; defined &{$class_name . '::' . $method_name} }){
+            # XXX what's Moose's behavior?
+        }
+        else{
+            $class->add_method($method_name => $code);
         }
-    }
 
-    {
-        no strict 'refs';
-        for my $name ($self->get_method_list) {
-            next if $name eq 'meta';
-
-            my $class_function = "${classname}::${name}";
-            my $role_function = "${selfname}::${name}";
-            if (defined &$class_function) {
-                # XXX what's Moose's behavior?
-                #next;
-            } else {
-                *{$class_function} = \&{$role_function};
+        if($alias && $alias->{$method_name}){
+            my $dstname = $alias->{$method_name};
+            if(do{ no strict 'refs'; defined &{$class_name . '::' . $dstname} }){
+                # XXX wat's Moose's behavior?
             }
-            if ($args{alias} && $args{alias}->{$name}) {
-                my $dstname = $args{alias}->{$name};
-                unless ($classname->can($dstname)) {
-                    *{"${classname}::${dstname}"} = \&$role_function;
-                }
+            else{
+                $class->add_method($dstname => $code);
             }
         }
     }
 
+    return;
+}
+
+sub _apply_attributes{
+    my($role, $class, $args) = @_;
+
     if ($class->isa('Mouse::Meta::Class')) {
         # apply role to class
-        for my $name ($self->get_attribute_list) {
-            next if $class->has_attribute($name);
-            my $spec = $self->get_attribute($name);
+        for my $attr_name ($role->get_attribute_list) {
+            next if $class->has_attribute($attr_name);
+
+            my $spec = $role->get_attribute($attr_name);
 
-            my $metaclass = 'Mouse::Meta::Attribute';
+            my $attr_metaclass = 'Mouse::Meta::Attribute';
             if ( my $metaclass_name = $spec->{metaclass} ) {
-                my $new_class = Mouse::Util::resolve_metaclass_alias(
+                $attr_metaclass = Mouse::Util::resolve_metaclass_alias(
                     'Attribute',
                     $metaclass_name
                 );
-                if ( $metaclass ne $new_class ) {
-                    $metaclass = $new_class;
-                }
             }
 
-            $metaclass->create($class, $name, %$spec);
+            $attr_metaclass->create($class, $attr_name => %$spec);
         }
     } else {
         # apply role to role
-        # XXX Room for speed improvement
-        for my $name ($self->get_attribute_list) {
-            next if $class->has_attribute($name);
-            my $spec = $self->get_attribute($name);
-            $class->add_attribute($name, $spec);
+        for my $attr_name ($role->get_attribute_list) {
+            next if $class->has_attribute($attr_name);
+
+            my $spec = $role->get_attribute($attr_name);
+            $class->add_attribute($attr_name => $spec);
         }
     }
 
-    # XXX Room for speed improvement in role to role
+    return;
+}
+
+sub _apply_modifiers{
+    my($role, $class, $args) = @_;
+
     for my $modifier_type (qw/before after around override/) {
-        my $add_method = "add_${modifier_type}_method_modifier";
-        my $modified = $self->{"${modifier_type}_method_modifiers"};
+        my $add_modifier = "add_${modifier_type}_method_modifier";
+        my $modifiers    = $role->{"${modifier_type}_method_modifiers"};
 
-        for my $method_name (keys %$modified) {
-            for my $code (@{ $modified->{$method_name} }) {
-                $class->$add_method($method_name => $code);
+        while(my($method_name, $modifier_codes) = each %{$modifiers}){
+            foreach my $code(@{$modifier_codes}){
+                $class->$add_modifier($method_name => $code);
             }
         }
     }
-
-    # append roles
-    push @{ $class->roles }, $self, @{ $self->roles };
+    return;
 }
 
-sub combine_apply {
-    my(undef, $class, @roles) = @_;
-    my $classname = $class->name;
+sub _append_roles{
+    my($role, $class, $args) = @_;
 
-    if ($class->isa('Mouse::Meta::Class')) {
-        for my $role_spec (@roles) {
-            my $self = $role_spec->[0]->meta;
-            for my $name (@{$self->{required_methods}}) {
-                unless ($classname->can($name)) {
-                    my $method_required = 0;
-                    for my $role (@roles) {
-                        $method_required = 1 if $self->name ne $role->[0] && $role->[0]->can($name);
-                    }
-                    confess "'".$self->name."' requires the method '$name' to be implemented by '$classname'"
-                        unless $method_required;
-                }
-            }
+    my $roles = $class->isa('Mouse::Meta::Class') ? $class->roles : $class->get_roles;
+
+    foreach my $r($role, @{$role->get_roles}){
+        if(!$class->does_role($r->name)){
+            push @{$roles}, $r;
         }
     }
+    return;
+}
 
-    {
-        no strict 'refs';
-        for my $role_spec (@roles) {
-            my $self = $role_spec->[0]->meta;
-            my $selfname = $self->name;
-            my %args = %{ $role_spec->[1] };
-            for my $name ($self->get_method_list) {
-                next if $name eq 'meta';
-
-                my $class_function = "${classname}::${name}";
-                my $role_function = "${selfname}::${name}";
-                if (defined &$class_function) {
-                    # XXX what's Moose's behavior?
-                    #next;
-                } else {
-                    *$class_function = *$role_function;
-                }
-                if ($args{alias} && $args{alias}->{$name}) {
-                    my $dstname = $args{alias}->{$name};
-                    unless ($classname->can($dstname)) {
-                        *{"${classname}::${dstname}"} = \&$role_function;
-                    }
-                }
-            }
-        }
+# Moose uses Application::ToInstance, Application::ToClass, Application::ToRole
+sub apply {
+    my($self, $class, %args) = @_;
+
+    if ($class->isa('Mouse::Object')) {
+        Carp::croak('Mouse does not support Application::ToInstance yet');
     }
 
+    $self->_check_required_methods($class, \%args);
+    $self->_apply_methods($class, \%args);
+    $self->_apply_attributes($class, \%args);
+    $self->_apply_modifiers($class, \%args);
+    $self->_append_roles($class, \%args);
+    return;
+}
 
-    if ($class->isa('Mouse::Meta::Class')) {
-        # apply role to class
-        for my $role_spec (@roles) {
-            my $self = $role_spec->[0]->meta;
-            for my $name ($self->get_attribute_list) {
-                next if $class->has_attribute($name);
-                my $spec = $self->get_attribute($name);
-
-                my $metaclass = 'Mouse::Meta::Attribute';
-                if ( my $metaclass_name = $spec->{metaclass} ) {
-                    my $new_class = Mouse::Util::resolve_metaclass_alias(
-                        'Attribute',
-                        $metaclass_name
-                    );
-                    if ( $metaclass ne $new_class ) {
-                        $metaclass = $new_class;
-                    }
-                }
+sub combine_apply {
+    my(undef, $class, @roles) = @_;
 
-                $metaclass->create($class, $name, %$spec);
-            }
-        }
-    } else {
-        # apply role to role
-        # XXX Room for speed improvement
-        for my $role_spec (@roles) {
-            my $self = $role_spec->[0]->meta;
-            for my $name ($self->get_attribute_list) {
-                next if $class->has_attribute($name);
-                my $spec = $self->get_attribute($name);
-                $class->add_attribute($name, $spec);
-            }
-        }
-    }
+    foreach my $role_spec (@roles) {
+        my($role_name, $args) = @{$role_spec};
 
-    # XXX Room for speed improvement in role to role
-    for my $modifier_type (qw/before after around override/) {
-        my $add_method = "add_${modifier_type}_method_modifier";
-        for my $role_spec (@roles) {
-            my $self = $role_spec->[0]->meta;
-            my $modified = $self->{"${modifier_type}_method_modifiers"};
-
-            for my $method_name (keys %$modified) {
-                for my $code (@{ $modified->{$method_name} }) {
-                    $class->$add_method($method_name => $code);
-                }
-            }
-        }
-    }
+        my $role = $role_name->meta;
 
-    # append roles
-    my %role_apply_cache;
-    my $apply_roles = $class->roles;
-    for my $role_spec (@roles) {
-        my $self = $role_spec->[0]->meta;
-        push @$apply_roles, $self unless $role_apply_cache{$self}++;
-        for my $role (@{ $self->roles }) {
-            push @$apply_roles, $role unless $role_apply_cache{$role}++;
-        }
+        $role->_check_required_methods($class, $args, @roles);
+        $role->_apply_methods($class, $args);
+        $role->_apply_attributes($class, $args);
+        $role->_apply_modifiers($class, $args);
+        $role->_append_roles($class, $args);
     }
+    return;
 }
 
 for my $modifier_type (qw/before after around override/) {
-    no strict 'refs';
-    *{ __PACKAGE__ . '::' . "add_${modifier_type}_method_modifier" } = sub {
+
+    my $modifier = "${modifier_type}_method_modifiers";
+    my $add_method_modifier =  sub {
         my ($self, $method_name, $method) = @_;
 
-        push @{ $self->{"${modifier_type}_method_modifiers"}->{$method_name} },
-            $method;
+        push @{ $self->{$modifier}->{$method_name} ||= [] }, $method;
+        return;
     };
-
-    *{ __PACKAGE__ . '::' . "get_${modifier_type}_method_modifiers" } = sub {
-        my ($self, $method_name, $method) = @_;
-        @{ $self->{"${modifier_type}_method_modifiers"}->{$method_name} || [] }
+    my $get_method_modifiers = sub {
+        my ($self, $method_name) = @_;
+        return @{ $self->{$modifier}->{$method_name} ||= [] }
     };
-}
 
-sub roles { $_[0]->{roles} }
+    no strict 'refs';
+    *{ 'add_' . $modifier_type . '_method_modifier'  } = $add_method_modifier;
+    *{ 'get_' . $modifier_type . '_method_modifiers' } = $get_method_modifiers;
+}
 
+sub get_roles { $_[0]->{roles} }
 
 # This is currently not passing all the Moose tests.
 sub does_role {
@@ -295,8 +240,8 @@ sub does_role {
 
     # if we are it,.. then return true
     return 1 if $role_name eq $self->name;
-
-    for my $role (@{ $self->{roles} }) {
+    # otherwise.. check our children
+    for my $role (@{ $self->get_roles }) {
         return 1 if $role->does_role($role_name);
     }
     return 0;
diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 745d1f2..8871a19 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -92,6 +92,7 @@ sub BUILDALL {
             or next;
         $code->($self, @_);
     }
+    return;
 }
 
 sub DEMOLISHALL {
@@ -103,7 +104,7 @@ sub DEMOLISHALL {
     no strict 'refs';
 
     my @isa;
-    if ( my $meta = Mouse::class_of($self) ) {
+    if ( my $meta = Mouse::Meta::Class::class_of($self) ) {
         @isa = $meta->linearized_isa;
     } else {
         # We cannot count on being able to retrieve a previously made
@@ -120,13 +121,14 @@ sub DEMOLISHALL {
         $self->$demolish
             if defined $demolish;
     }
+    return;
 }
 
 sub dump { 
     my $self = shift;
     require Data::Dumper;
     local $Data::Dumper::Maxdepth = shift if @_;
-    Data::Dumper::Dumper $self;
+    Data::Dumper::Dumper($self);
 }
 
 
@@ -134,13 +136,14 @@ sub does {
     my ($self, $role_name) = @_;
     (defined $role_name)
         || confess "You must supply a role name to does()";
+
     my $meta = $self->meta;
     foreach my $class ($meta->linearized_isa) {
         my $m = ref($meta)->initialize($class);
-        return 1 
-            if $m->can('does_role') && $m->does_role($role_name);            
+        return 1
+            if $m->can('does_role') && $m->does_role($role_name);
     }
-    return 0;   
+    return 0;
 };
 
 1;
diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index c798d6a..43bcdd9 100644
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -7,8 +7,12 @@ use Carp 'confess', 'croak';
 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);
@@ -116,11 +120,13 @@ sub import {
         return;
     }
 
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta_method = sub{
+        Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]);
+    };
 
-    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, @_);
 }
@@ -128,10 +134,21 @@ sub import {
 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;
diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index 2f10181..ff39422 100644
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -2,7 +2,8 @@ package Mouse::Util;
 use strict;
 use warnings;
 use base qw/Exporter/;
-use Carp;
+use Carp qw(confess);
+use B ();
 
 our @EXPORT_OK = qw(
     get_linear_isa
@@ -10,6 +11,7 @@ our @EXPORT_OK = qw(
     version 
     authority
     identifier
+    get_code_info
 );
 our %EXPORT_TAGS = (
     all  => \@EXPORT_OK,
@@ -57,6 +59,21 @@ BEGIN {
     *{ __PACKAGE__ . '::get_linear_isa'} = $impl;
 }
 
+{ # taken from Sub::Identify
+    sub get_code_info($) {
+        my ($coderef) = @_;
+        ref($coderef) or return;
+        my $cv = B::svref_2object($coderef);
+        $cv->isa('B::CV') or return;
+
+        my $gv = $cv->GV;
+        # bail out if GV is undefined
+        $gv->isa('B::SPECIAL') and return;
+
+        return ($gv->STASH->NAME, $gv->NAME);
+    }
+}
+
 { # adapted from Class::MOP::Module
 
     sub version { no strict 'refs'; ${shift->name.'::VERSION'} }
@@ -184,7 +201,7 @@ sub apply_all_roles {
     }
 
     ( $_->[0]->can('meta') && $_->[0]->meta->isa('Mouse::Meta::Role') )
-        || croak("You can only consume roles, "
+        || confess("You can only consume roles, "
         . $_->[0]
         . " is not a Moose role")
         foreach @roles;
diff --git a/t/006-unimport.t b/t/006-unimport.t
index fa7259b..a3c74db 100644
--- a/t/006-unimport.t
+++ b/t/006-unimport.t
@@ -29,9 +29,7 @@ do {
 };
 
 ok(!Foo->can('has'), "has keyword is unimported");
-TODO: {
-    local $TODO = "fixing this may require a Sub::Identify dep";
-    ok(Foo->can('extends'), "extends method is NOT unimported");
-    is(eval { Foo->extends }, "good", "extends method is ours, not the extends keyword");
-};
+
+ok(Foo->can('extends'), "extends method is NOT unimported");
+is(eval { Foo->extends }, "good", "extends method is ours, not the extends keyword");
 
diff --git a/t/800_shikabased/013-compatibility-get_method_list.t b/t/800_shikabased/013-compatibility-get_method_list.t
index 1fd9a2f..b2852c2 100644
--- a/t/800_shikabased/013-compatibility-get_method_list.t
+++ b/t/800_shikabased/013-compatibility-get_method_list.t
@@ -12,12 +12,14 @@ sub test {
     eval <<"...";
 {
     package ${class}Class;
+    use Carp; # import external functions (not our methods)
     use ${class};
     sub foo { }
     no ${class};
 }
 {
     package ${class}ClassImm;
+    use Carp; # import external functions (not our methods)
     use ${class};
     sub foo { }
     no ${class};
@@ -25,8 +27,10 @@ sub test {
 }
 {
     package ${class}Role;
+    use Carp; # import external functions (not our methods)
     use ${class}::Role;
     sub bar { }
+    no ${class}::Role;
 }
 ...
     die $@ if $@;