use warnings;
use Scalar::Util 'blessed';
-use Carp 'confess', 'croak';
+use Carp 'croak';
use Data::OptList;
use Sub::Exporter;
-our $VERSION = '0.55_01';
+our $VERSION = '0.73_01';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use Moose ();
use Moose::Util ();
+use Moose::Exporter;
use Moose::Meta::Role;
use Moose::Util::TypeConstraints;
my $code = pop @_;
for (@_) {
- croak "Moose::Role do not currently support "
+ croak "Roles do not currently support "
. ref($_)
. " references for before method modifiers"
if ref $_;
my $code = pop @_;
for (@_) {
- croak "Moose::Role do not currently support "
+ croak "Roles do not currently support "
. ref($_)
. " references for after method modifiers"
if ref $_;
my $meta = Moose::Meta::Role->initialize(shift);
my $code = pop @_;
for (@_) {
- croak "Moose::Role do not currently support "
+ croak "Roles do not currently support "
. ref($_)
. " references for around method modifiers"
if ref $_;
}
sub inner {
- croak "Moose::Role cannot support 'inner'";
+ croak "Roles cannot support 'inner'";
}
sub augment {
- croak "Moose::Role cannot support 'augment'";
+ croak "Roles cannot support 'augment'";
}
-my $exporter = Moose::Exporter->setup_import_methods(
+Moose::Exporter->setup_import_methods(
with_caller => [
qw( with requires excludes has before after around override make_immutable )
],
shift;
my %args = @_;
- my $role = $args{for_class}
- or confess
- "Cannot call init_meta without specifying a for_class";
+ my $role = $args{for_class};
+
+ unless ($role) {
+ require Moose;
+ Moose->throw_error("Cannot call init_meta without specifying a for_class");
+ }
my $metaclass = $args{metaclass} || "Moose::Meta::Role";
my $meta;
if ($role->can('meta')) {
$meta = $role->meta();
- (blessed($meta) && $meta->isa('Moose::Meta::Role'))
- || confess "You already have a &meta function, but it does not return a Moose::Meta::Role";
+
+ unless ( blessed($meta) && $meta->isa('Moose::Meta::Role') ) {
+ require Moose;
+ Moose->throw_error("You already have a &meta function, but it does not return a Moose::Meta::Role");
+ }
}
else {
$meta = $metaclass->initialize($role);
- $meta->alias_method('meta' => sub { $meta });
+
+ $meta->add_method(
+ 'meta' => sub {
+ # re-initialize so it inherits properly
+ $metaclass->initialize( ref($_[0]) || $_[0] );
+ }
+ );
}
return $meta;
mind when using method modifiers in a role. You should never assume any
ordering.
-=item *
-
-The C<requires> keyword currently only works with actual methods. A method
-modifier (before/around/after and override) will not count as a fufillment
-of the requirement, and neither will an autogenerated accessor for an attribute.
-
-It is likely that attribute accessors will eventually be allowed to fufill those
-requirements, or we will introduce a C<requires_attr> keyword of some kind
-instead. This decision has not yet been finalized.
-
=back
=head1 BUGS
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>