some minor tweaks

[gitmo/Moose.git] / lib / Moose / Meta / Class.pm

diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm
index 265f037..3f927f5 100644 (file)
--- a/lib/Moose/Meta/Class.pm
+++ b/lib/Moose/Meta/Class.pm
@@ -9,7 +9,7 @@ use Class::MOP;
 use Carp         'confess';
 use Scalar::Util 'weaken', 'blessed', 'reftype';
 
-our $VERSION   = '0.17';
+our $VERSION   = '0.18';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose::Meta::Method::Overriden;
@@ -271,7 +271,9 @@ sub _fix_metaclass_incompatability {
 # this was crap anyway, see
 # Moose::Util::apply_all_roles
 # instead
-sub _apply_all_roles { die "DEPRECATED" }
+sub _apply_all_roles { 
+    die 'DEPRECATED: use Moose::Util::apply_all_roles($meta, @roles) instead' 
+}
 
 my %ANON_CLASSES;
 
@@ -316,7 +318,22 @@ sub _process_attribute {
                     superclasses => [ $attr_metaclass_name ]
                 );
                 $ANON_CLASSES{$anon_role_key} = $class;
-                Moose::Util::apply_all_roles($class, @{$options{traits}});
+                
+                my @traits;
+                foreach my $trait (@{$options{traits}}) {
+                    eval {
+                        my $possible_full_name = 'Moose::Meta::Attribute::Custom::Trait::' . $trait;
+                        Class::MOP::load_class($possible_full_name);
+                        push @traits => $possible_full_name->can('register_implementation')
+                            ? $possible_full_name->register_implementation
+                            : $possible_full_name;
+                    };
+                    if ($@) {
+                        push @traits => $trait;
+                    }
+                }
+                
+                Moose::Util::apply_all_roles($class, @traits);
             }
             
             $attr_metaclass_name = $class->name;