X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FRole.pm;h=4f224b49a8b56a1a3f1cd1f38efb217434e682d0;hp=0059eb63286a0d1936cdf5c74f44f21c4263e713;hb=e9148d131f7c3d6a1e3fc9e7c491f80fb5dde90b;hpb=1820fffecb0bd1da64edc16ecde534178b841d14 diff --git a/lib/Mouse/Role.pm b/lib/Mouse/Role.pm index 0059eb6..4f224b4 100644 --- a/lib/Mouse/Role.pm +++ b/lib/Mouse/Role.pm @@ -1,29 +1,58 @@ package Mouse::Role; -use strict; -use warnings; -use base 'Exporter'; +use Mouse::Exporter; # enables strict and warnings -use Carp 'confess'; -use Scalar::Util 'blessed'; +our $VERSION = '0.50'; -use Mouse::Util qw(load_class not_supported); +use Carp qw(confess); +use Scalar::Util qw(blessed); + +use Mouse::Util qw(not_supported); +use Mouse::Meta::Role; use Mouse (); -our @EXPORT = qw( - extends with - has - before after around - override super - augment inner +Mouse::Exporter->setup_import_methods( + as_is => [qw( + extends with + has + before after around + override super + augment inner + + requires excludes + ), + \&Scalar::Util::blessed, + \&Carp::confess, + ], +); - requires excludes - blessed confess -); +sub extends { + Carp::croak "Roles do not support 'extends'"; +} + +sub with { + my $meta = Mouse::Meta::Role->initialize(scalar caller); + Mouse::Util::apply_all_roles($meta->name, @_); + return; +} + +sub has { + my $meta = Mouse::Meta::Role->initialize(scalar caller); + my $name = shift; + + $meta->throw_error(q{Usage: has 'name' => ( key => value, ... )}) + if @_ % 2; # odd number of arguments -our %is_removable = map{ $_ => undef } @EXPORT; -delete $is_removable{confess}; -delete $is_removable{blessed}; + if(ref $name){ # has [qw(foo bar)] => (...) + for (@{$name}){ + $meta->add_attribute($_ => @_); + } + } + else{ # has foo => (...) + $meta->add_attribute($name => @_); + } + return; +} sub before { my $meta = Mouse::Meta::Role->initialize(scalar caller); @@ -32,6 +61,7 @@ sub before { for (@_) { $meta->add_before_method_modifier($_ => $code); } + return; } sub after { @@ -41,6 +71,7 @@ sub after { for (@_) { $meta->add_after_method_modifier($_ => $code); } + return; } sub around { @@ -50,33 +81,19 @@ sub around { for (@_) { $meta->add_around_method_modifier($_ => $code); } + return; } sub super { - return unless $Mouse::SUPER_BODY; + return if !defined $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->(@_); - }); + # my($name, $code) = @_; + Mouse::Meta::Role->initialize(scalar caller)->add_override_method_modifier(@_); + return; } # We keep the same errors messages as Moose::Role emits, here. @@ -88,71 +105,37 @@ sub augment { Carp::croak "Roles cannot support 'augment'"; } -sub has { - my $meta = Mouse::Meta::Role->initialize(scalar caller); - my $name = shift; - - $meta->add_attribute($_ => @_) for ref($name) ? @{$name} : $name; -} - -sub extends { - Carp::croak "Roles do not support 'extends'" -} - -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(@_); + return; } sub excludes { not_supported; } -sub import { - my $class = shift; +sub init_meta{ + shift; + my %args = @_; - strict->import; - warnings->import; + my $class = $args{for_class} + or Carp::confess("Cannot call init_meta without specifying a for_class"); - my $caller = caller; + my $metaclass = $args{metaclass} || 'Mouse::Meta::Role'; - # we should never export to main - if ($caller eq 'main') { - warn qq{$class does not export its sugar to the 'main' package.\n}; - return; - } + my $meta = $metaclass->initialize($class); - Mouse::Meta::Role->initialize($caller)->add_method(meta => sub { - return Mouse::Meta::Role->initialize(ref($_[0]) || $_[0]); + $meta->add_method(meta => sub{ + $metaclass->initialize(ref($_[0]) || $_[0]); }); - Mouse::Role->export_to_level(1, @_); -} - -sub unimport { - my $caller = caller; + # make a role type for each Mouse role + Mouse::Util::TypeConstraints::role_type($class) + unless Mouse::Util::TypeConstraints::find_type_constraint($class); - my $stash = do{ - no strict 'refs'; - \%{$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; + return $meta; } 1; @@ -163,6 +146,10 @@ __END__ Mouse::Role - The Mouse Role +=head1 VERSION + +This document describes Mouse version 0.50 + =head1 SYNOPSIS package MyRole; @@ -176,18 +163,15 @@ Returns this role's metaclass instance. =head2 C<< before (method|methods) -> CodeRef >> -Sets up a B method modifier. See L or -L. +Sets up a B method modifier. See L. =head2 C<< after (method|methods) => CodeRef >> -Sets up an B method modifier. See L or -L. +Sets up an B method modifier. See L. =head2 C<< around (method|methods) => CodeRef >> -Sets up an B method modifier. See L or -L. +Sets up an B method modifier. See L. =head2 C