X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=56cde3acd063a1cc81a7e66f92a3efaba30de3be;hb=8c0a77aa50dc0fef958845e65f2b5b87a9239024;hp=e60776001d9fa37410f4577b9e7e59fdbe52faa4;hpb=07d18a6b15d6d937a78ecd2dd24f5375f0096766;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index e607760..56cde3a 100644
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -3,15 +3,19 @@ use strict;
 use warnings;
 use base 'Exporter';
 
-use Carp 'confess';
+use Carp 'confess', 'croak';
 use Scalar::Util 'blessed';
 
 use Mouse::Meta::Role;
+use Mouse::Util;
 
-our @EXPORT = qw(before after around has extends with requires excludes confess blessed);
+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 (@_) {
@@ -20,7 +24,7 @@ sub before {
 }
 
 sub after {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $code = pop;
     for (@_) {
@@ -29,7 +33,7 @@ sub after {
 }
 
 sub around {
-    my $meta = Mouse::Meta::Role->initialize(caller);
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
 
     my $code = pop;
     for (@_) {
@@ -37,8 +41,44 @@ sub around {
     }
 }
 
+
+sub super {
+    return unless $Mouse::SUPER_BODY; 
+    $Mouse::SUPER_BODY->(@Mouse::SUPER_ARGS);
+}
+
+sub override {
+    my $classname = caller;
+    my $meta = Mouse::Meta::Role->initialize($classname);
+
+    my $name = shift;
+    my $code = shift;
+    my $fullname = "${classname}::${name}";
+
+    defined &$fullname
+        && confess "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;
+        local $Mouse::SUPER_BODY = shift;
+        local @Mouse::SUPER_ARGS = @_;
+
+        $code->(@_);
+    });
+}
+
+# We keep the same errors messages as Moose::Role emits, here.
+sub inner {
+    croak "Moose::Role cannot support 'inner'";
+}
+
+sub augment {
+    croak "Moose::Role 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 = @_;
@@ -46,10 +86,10 @@ sub has {
     $meta->add_attribute($name => \%opts);
 }
 
-sub extends  { confess "Roles do not support 'extends'" }
+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;
@@ -59,7 +99,7 @@ sub with     {
 }
 
 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(@_);
 }
@@ -67,15 +107,22 @@ sub requires {
 sub excludes { confess "Mouse::Role does not currently support 'excludes'" }
 
 sub import {
+    my $class = shift;
+
     strict->import;
     warnings->import;
 
     my $caller = caller;
-    my $meta = Mouse::Meta::Role->initialize(caller);
 
-    no strict 'refs';
-    no warnings 'redefine';
-    *{$caller.'::meta'} = sub { $meta };
+    # we should never export to main
+    if ($caller eq 'main') {
+        warn qq{$class does not export its sugar to the 'main' package.\n};
+        return;
+    }
+
+    Mouse::Meta::Role->initialize($caller)->add_method(meta => sub {
+        return Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]);
+    });
 
     Mouse::Role->export_to_level(1, @_);
 }
@@ -83,10 +130,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;
@@ -95,7 +153,7 @@ __END__
 
 =head1 NAME
 
-Mouse::Role
+Mouse::Role - define a role in Mouse
 
 =head1 KEYWORDS
 
@@ -118,6 +176,26 @@ L<Class::Method::Modifiers/after>.
 Sets up an "around" method modifier. See L<Moose/around> or
 L<Class::Method::Modifiers/around>.
 
+=over 4
+
+=item B<super>
+
+Sets up the "super" keyword. See L<Moose/super>.
+
+=item B<override ($name, &sub)>
+
+Sets up an "override" method modifier. See L<Moose/Role/override>.
+
+=item B<inner>
+
+This is not supported and emits an error. See L<Moose/Role>.
+
+=item B<augment ($name, &sub)>
+
+This is not supported and emits an error. See L<Moose/Role>.
+
+=back
+
 =head2 has (name|names) => parameters
 
 Sets up an attribute (or if passed an arrayref of names, multiple attributes) to