X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=987239763cee603e176c84cb664ed77faebc79bd;hp=14ba27aa275cede749c979611e648d1af38144a8;hb=6d28c5cf89bfd4c00e675e95aff6c31b61aeb805;hpb=84e9b28560b15545a21b389885b0c9514fa93165

diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm
index 14ba27a..9872397 100644
--- a/lib/Mouse/Role.pm
+++ b/lib/Mouse/Role.pm
@@ -1,106 +1,150 @@
-#!/usr/bin/env perl
 package Mouse::Role;
 use strict;
 use warnings;
+use base 'Exporter';
 
-use Sub::Exporter;
 use Carp 'confess';
-use Scalar::Util;
-
-use Mouse::Meta::Role;
-
-do {
-    my $CALLER;
-
-    my %exports = (
-        meta => sub {
-            my $meta = Mouse::Meta::Role->initialize($CALLER);
-            return sub { $meta };
-        },
-        extends => sub {
-            return sub {
-                confess "Role does not currently support 'extends'";
-            }
-        },
-        before => sub {
-            my $caller = $CALLER;
-            return sub {
-                my $code = pop;
-                for (@_) {
-                    $caller->meta->add_before_method_modifier($_ => $code);
-                }
-            }
-        },
-        after => sub {
-            my $caller = $CALLER;
-            return sub {
-                my $code = pop;
-                for (@_) {
-                    $caller->meta->add_after_method_modifier($_ => $code);
-                }
-            }
-        },
-        around => sub {
-            my $caller = $CALLER;
-            return sub {
-                my $code = pop;
-                for (@_) {
-                    $caller->meta->add_around_method_modifier($_ => $code);
-                }
-            }
-        },
-        has => sub {
-            my $caller = $CALLER;
-            return sub {
-                my $name = shift;
-                my %opts = @_;
-
-                $caller->meta->add_attribute($name => \%opts);
-            }
-        },
-        with => sub {
-            return sub {
-                confess "Role does not currently support 'with'";
-            }
-        },
-        requires => sub {
-            return sub { }
-        },
-        excludes => sub {
-            return sub { }
-        },
-        blessed => sub {
-            return \&Scalar::Util::blessed;
-        },
-        confess => sub {
-            return \&Carp::confess;
-        },
-    );
-
-    my $exporter = Sub::Exporter::build_exporter({
-        exports => \%exports,
-        groups  => { default => [':all'] },
+use Scalar::Util 'blessed';
+
+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 %is_removable = map{ $_ => undef } @EXPORT;
+delete $is_removable{confess};
+delete $is_removable{blessed};
+
+sub before {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+
+    my $code = pop;
+    for (@_) {
+        $meta->add_before_method_modifier($_ => $code);
+    }
+}
+
+sub after {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+
+    my $code = pop;
+    for (@_) {
+        $meta->add_after_method_modifier($_ => $code);
+    }
+}
+
+sub around {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+
+    my $code = pop;
+    for (@_) {
+        $meta->add_around_method_modifier($_ => $code);
+    }
+}
+
+
+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
+        && $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;
+        local $Mouse::SUPER_BODY = shift;
+        local @Mouse::SUPER_ARGS = @_;
+
+        $code->(@_);
     });
+}
+
+# We keep the same errors messages as Moose::Role emits, here.
+sub inner {
+    Carp::croak "Roles cannot support 'inner'";
+}
+
+sub augment {
+    Carp::croak "Roles cannot support 'augment'";
+}
+
+sub has {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+
+    my $name = shift;
+    my %opts = @_;
 
-    sub import {
-        $CALLER = caller;
+    $meta->add_attribute($name => \%opts);
+}
 
-        strict->import;
-        warnings->import;
+sub extends  {
+    Carp::croak "Roles do not support 'extends'"
+}
 
-        goto $exporter;
+sub with     {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+    Mouse::Util::apply_all_roles($meta->name, @_);
+}
+
+sub requires {
+    my $meta = Mouse::Meta::Role->initialize(scalar caller);
+    $meta->throw_error("Must specify at least one method") unless @_;
+    $meta->add_required_methods(@_);
+}
+
+sub excludes {
+    not_supported;
+}
+
+sub import {
+    my $class = shift;
+
+    strict->import;
+    warnings->import;
+
+    my $caller = caller;
+
+    # we should never export to main
+    if ($caller eq 'main') {
+        warn qq{$class does not export its sugar to the 'main' package.\n};
+        return;
     }
 
-    sub unimport {
-        my $caller = caller;
+    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;
 
+    my $stash = do{
         no strict 'refs';
-        for my $keyword (keys %exports) {
-            next if $keyword eq 'meta'; # we don't delete this one
-            delete ${ $caller . '::' }{$keyword};
+        \%{$caller . '::'}
+    };
+
+    for my $keyword (@EXPORT) {
+        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;
 
@@ -108,7 +152,7 @@ __END__
 
 =head1 NAME
 
-Mouse::Role
+Mouse::Role - define a role in Mouse
 
 =head1 KEYWORDS
 
@@ -131,6 +175,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