0.18 ... pretty much ready to go

[gitmo/Moose.git] / lib / Moose / Role.pm

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index c4b90c0..19c66b0 100644 (file)
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -10,7 +10,8 @@ use Sub::Name    'subname';
 
 use Sub::Exporter;
 
-our $VERSION = '0.05';
+our $VERSION   = '0.07';
+our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose ();
 
@@ -29,17 +30,18 @@ use Moose::Util::TypeConstraints;
         subtype $role
             => as 'Role'
             => where { $_->does($role) }
+            => optimize_as { blessed($_[0]) && $_[0]->can('does') && $_[0]->does($role) }              
         unless find_type_constraint($role);        
 
        my $meta;
        if ($role->can('meta')) {
                $meta = $role->meta();
                (blessed($meta) && $meta->isa('Moose::Meta::Role'))
-                       || confess "Whoops, not møøsey enough";
+                || confess "You already have a &meta function, but it does not return a Moose::Meta::Role";
        }
        else {
-               $meta = Moose::Meta::Role->new(role_name => $role);
-               $meta->_role_meta->add_method('meta' => sub { $meta })          
+               $meta = Moose::Meta::Role->initialize($role);
+               $meta->Moose::Meta::Class::add_method('meta' => sub { $meta })          
        }
 
         return $METAS{$role} = $meta;
@@ -58,7 +60,7 @@ use Moose::Util::TypeConstraints;
                return subname 'Moose::Role::with' => sub (@) { 
                 my (@roles) = @_;
                 confess "Must specify at least one role" unless @roles;
-                Moose::_load_all_classes(@roles);
+                Class::MOP::load_class($_) for @roles;
                 ($_->can('meta') && $_->meta->isa('Moose::Meta::Role'))
                     || confess "You can only consume roles, $_ is not a Moose role"
                         foreach @roles;
@@ -96,15 +98,13 @@ use Moose::Util::TypeConstraints;
         before => sub {
             my $meta = _find_meta();
             return subname 'Moose::Role::before' => sub (@&) { 
-                confess "Moose::Role does not currently support 'before'";
-                       my $code = pop @_;
-                       $meta->add_before_method_modifier($_, $code) for @_;
+                my $code = pop @_;
+                $meta->add_before_method_modifier($_, $code) for @_;
                };
            },
         after => sub {
             my $meta = _find_meta();
             return subname 'Moose::Role::after' => sub (@&) { 
-                confess "Moose::Role does not currently support 'after'";
                        my $code = pop @_;
                        $meta->add_after_method_modifier($_, $code) for @_;
                };
@@ -112,27 +112,25 @@ use Moose::Util::TypeConstraints;
         around => sub {
             my $meta = _find_meta();
             return subname 'Moose::Role::around' => sub (@&) { 
-                confess "Moose::Role does not currently support 'around'";
                        my $code = pop @_;
                        $meta->add_around_method_modifier($_, $code) for @_;
                };
            },
            super => sub {
             my $meta = _find_meta();
-            return subname 'Moose::Role::super' => sub {
-                confess "Moose::Role cannot support 'super'";
-            };
+            return subname 'Moose::Role::super' => sub {};
         },
         override => sub {
             my $meta = _find_meta();
             return subname 'Moose::Role::override' => sub ($&) {
-                confess "Moose::Role cannot support 'override'";
+                my ($name, $code) = @_;
+                $meta->add_override_method_modifier($name, $code);
                };
            },          
         inner => sub {
             my $meta = _find_meta();
             return subname 'Moose::Role::inner' => sub {
-                confess "Moose::Role cannot support 'inner'";      
+                confess "Moose::Role cannot support 'inner'";
                };
            },
         augment => sub {
@@ -210,12 +208,13 @@ Moose::Role - The Moose Role
 
 =head1 DESCRIPTION
 
-Role support in Moose is coming along quite well. It's best documentation 
-is still the the test suite, but it is fairly safe to assume Perl 6 style 
-behavior, and then either refer to the test suite, or ask questions on 
-#moose if something doesn't quite do what you expect. More complete 
-documentation is planned and will be included with the next official 
-(non-developer) release.
+Role support in Moose is pretty solid at this point. However, the best 
+documentation is still the the test suite. It is fairly safe to assume 
+Perl 6 style behavior and then either refer to the test suite, or ask 
+questions on #moose if something doesn't quite do what you expect.
+
+We are planning writing some more documentation in the near future, but
+nothing is ready yet, sorry.
 
 =head1 EXPORTED FUNCTIONS
 
@@ -292,7 +291,7 @@ Christian Hansen E<lt>chansen@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006, 2007 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>