bump version to 0.79

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

diff --git a/lib/Moose/Util.pm b/lib/Moose/Util.pm
index c011e88..e051a91 100644 (file)
--- a/lib/Moose/Util.pm
+++ b/lib/Moose/Util.pm
@@ -3,18 +3,19 @@ package Moose::Util;
 use strict;
 use warnings;
 
+use Data::OptList;
 use Sub::Exporter;
 use Scalar::Util 'blessed';
 use Class::MOP   0.60;
 
-our $VERSION   = '0.75';
+our $VERSION   = '0.79';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 my @exports = qw[
-    find_meta 
+    find_meta
     does_role
-    search_class_by_role   
+    search_class_by_role
     ensure_all_roles
     apply_all_roles
     get_all_init_args
@@ -40,7 +41,7 @@ sub does_role {
     my ($class_or_obj, $role) = @_;
 
     my $meta = find_meta($class_or_obj);
-    
+
     return unless defined $meta;
     return unless $meta->can('does_role');
     return 1 if $meta->does_role($role);
@@ -49,14 +50,14 @@ sub does_role {
 
 sub search_class_by_role {
     my ($class_or_obj, $role_name) = @_;
-    
+
     my $meta = find_meta($class_or_obj);
 
     return unless defined $meta;
 
     foreach my $class ($meta->class_precedence_list) {
-        
-        my $_meta = find_meta($class);        
+
+        my $_meta = find_meta($class);
 
         next unless defined $_meta;
 
@@ -93,9 +94,10 @@ sub _apply_all_roles {
     my $roles = Data::OptList::mkopt( [@_] );
 
     foreach my $role (@$roles) {
-        my $meta = Class::MOP::load_class( $role->[0] );
+        Class::MOP::load_class( $role->[0] );
+        my $meta = Class::MOP::class_of( $role->[0] );
 
-        unless ($meta->isa('Moose::Meta::Role') ) {
+        unless ($meta && $meta->isa('Moose::Meta::Role') ) {
             require Moose;
             Moose->throw_error( "You can only consume roles, "
                     . $role->[0]
@@ -135,7 +137,7 @@ sub get_all_init_args {
     return +{
         map { $_->init_arg => $_->get_value($instance) }
             grep { $_->has_value($instance) }
-                grep { defined($_->init_arg) } 
+                grep { defined($_->init_arg) }
                     $class->get_all_attributes
     };
 }
@@ -155,7 +157,7 @@ sub resolve_metatrait_alias {
             if $cache{$cache_key}{$metaclass_name};
 
         my $possible_full_name
-            = 'Moose::Meta::' 
+            = 'Moose::Meta::'
             . $type
             . '::Custom::'
             . ( $options{trait} ? "Trait::" : "" )
@@ -323,7 +325,7 @@ Here is a list of possible functions to write
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no 
+All complex software has bugs lurking in it, and this module is no
 exception. If you find a bug please either email me, or add the bug
 to cpan-RT.