ovidsbug

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

diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm
index 265f037..3dd0bb4 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.20';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose::Meta::Method::Overriden;
@@ -80,12 +80,11 @@ sub new_object {
     my ($class, %params) = @_;
     my $self = $class->SUPER::new_object(%params);
     foreach my $attr ($class->compute_all_applicable_attributes()) {
-        # FIXME:
-        # this does not accept undefined
-        # values, nor does it accept false
-        # values to be passed into the init-arg
-        next unless $params{$attr->init_arg} && $attr->can('has_trigger') && $attr->has_trigger;
-        $attr->trigger->($self, $params{$attr->init_arg}, $attr);
+        if ( defined( my $init_arg = $attr->init_arg ) ) {
+            if ( exists($params{$init_arg}) && $attr->can('has_trigger') && $attr->has_trigger ) {
+                $attr->trigger->($self, $params{$init_arg}, $attr);
+            }
+        }
     }
     return $self;
 }
@@ -158,7 +157,11 @@ sub get_method_map {
 
 sub add_attribute {
     my $self = shift;
-    $self->SUPER::add_attribute($self->_process_attribute(@_));
+    $self->SUPER::add_attribute(
+        (blessed $_[0] && $_[0]->isa('Class::MOP::Attribute')
+            ? $_[0] 
+            : $self->_process_attribute(@_))    
+    );
 }
 
 sub add_override_method_modifier {
@@ -271,7 +274,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 +321,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;