X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=dec1a54e89b8d426a5f69000316ea480762d4f66;hp=97cd5c0462e5544a82dbd2ae14806a6e3e7c179d;hb=2efc0af104c1926c066f50e1785236254bda12a2;hpb=0ecefe82d9a12633e2934938ee630b952bd9359a

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index 97cd5c0..dec1a54 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -1,351 +1,278 @@
-#!/usr/bin/env perl
 package Mouse::Meta::Attribute;
 use strict;
 use warnings;
-require overload;
 
-use Carp 'confess';
-require Mouse::Util;
+use Carp ();
+use Scalar::Util qw(weaken);
+
+use Mouse::Util;
+
+use Mouse::Meta::TypeConstraint;
+use Mouse::Meta::Method::Accessor;
+
+#my %valid_attrs = map{ $_ => undef } qw(
+#    name
+#    reader writer accessor clearer predicate
+#    builder init_arg default initializer definition_context
+#
+#    is
+#    isa does
+#    required
+#    lazy
+#    lazy_build
+#    coerce
+#    weak_ref
+#    auto_deref
+#    type_constraint
+#    trigger
+#    handles
+#    documentation
+#    traits
+#);
 
 sub new {
-    my $class = shift;
-    my %args  = @_;
-
-    my $name = $args{name};
+    my ($class, $name, %options) = @_;
 
-    $args{init_arg} = $name
-        unless exists $args{init_arg};
+    # taken from Class::MOP::Attribute::new
 
-    $args{is} ||= '';
+    defined($name)
+        or $class->throw_error('You must provide a name for the attribute');
+    $options{name} = $name;
 
-    bless \%args, $class;
-}
-
-sub name              { $_[0]->{name}             }
-sub associated_class  { $_[0]->{associated_class} }
-sub _is_metadata      { $_[0]->{is}               }
-sub is_required       { $_[0]->{required}         }
-sub default           { $_[0]->{default}          }
-sub is_lazy           { $_[0]->{lazy}             }
-sub is_lazy_build     { $_[0]->{lazy_build}       }
-sub predicate         { $_[0]->{predicate}        }
-sub clearer           { $_[0]->{clearer}          }
-sub handles           { $_[0]->{handles}          }
-sub is_weak_ref       { $_[0]->{weak_ref}         }
-sub init_arg          { $_[0]->{init_arg}         }
-sub type_constraint   { $_[0]->{type_constraint}  }
-sub trigger           { $_[0]->{trigger}          }
-sub builder           { $_[0]->{builder}          }
-sub should_auto_deref { $_[0]->{auto_deref}       }
-sub should_coerce     { $_[0]->{should_coerce}    }
-
-sub has_default         { exists $_[0]->{default}         }
-sub has_predicate       { exists $_[0]->{predicate}       }
-sub has_clearer         { exists $_[0]->{clearer}         }
-sub has_handles         { exists $_[0]->{handles}         }
-sub has_type_constraint { exists $_[0]->{type_constraint} }
-sub has_trigger         { exists $_[0]->{trigger}         }
-sub has_builder         { exists $_[0]->{builder}         }
-
-sub find_type_constraint      { $_[0]->{find_type_constraint}  }
+    if(!exists $options{init_arg}){
+        $options{init_arg} = $name;
+    }
 
-sub _create_args {
-    $_[0]->{_create_args} = $_[1] if @_ > 1;
-    $_[0]->{_create_args}
-}
+    # 'required' requires eigher 'init_arg', 'builder', or 'default'
+    my $can_be_required = defined( $options{init_arg} );
 
-sub inlined_name {
-    my $self = shift;
-    my $name = $self->name;
-    my $key   = "'" . $name . "'";
-    return $key;
-}
+    if(exists $options{builder}){
+        $class->throw_error('builder must be a defined scalar value which is a method name')
+            if ref $options{builder} || !(defined $options{builder});
 
-sub generate_accessor {
-    my $attribute = shift;
-
-    my $name          = $attribute->name;
-    my $default       = $attribute->default;
-    my $constraint    = $attribute->find_type_constraint;
-    my $builder       = $attribute->builder;
-    my $trigger       = $attribute->trigger;
-    my $is_weak       = $attribute->is_weak_ref;
-    my $should_deref  = $attribute->should_auto_deref;
-    my $should_coerce = $attribute->should_coerce;
-
-    my $self  = '$_[0]';
-    my $key   = $attribute->inlined_name;
-
-    my $accessor = "sub {\n";
-    if ($attribute->_is_metadata eq 'rw') {
-        $accessor .= 'if (scalar(@_) >= 2) {' . "\n";
-
-        my $value = '$_[1]';
-
-        if ($constraint) {
-            $accessor .= 'my $val = ';
-            if ($should_coerce) {
-                $accessor  .= 'Mouse::TypeRegistry->typecast_constraints("'.$attribute->associated_class->name.'", $attribute->{find_type_constraint}, $attribute->{type_constraint}, '.$value.');';
-            } else {
-                $accessor .= $value.';';
-            }
-            $accessor .= 'local $_ = $val;';
-            $accessor .= '
-                unless ($constraint->()) {
-                    $attribute->verify_type_constraint_error($name, $_, $attribute->type_constraint);
-                }' . "\n";
-            $value = '$val';
+        $can_be_required++;
+    }
+    elsif(exists $options{default}){
+        if(ref $options{default} && ref($options{default}) ne 'CODE'){
+            $class->throw_error("References are not allowed as default values, you must "
+                              . "wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])");
         }
+        $can_be_required++;
+    }
 
-        # if there's nothing left to do for the attribute we can return during
-        # this setter
-        $accessor .= 'return ' if !$is_weak && !$trigger && !$should_deref;
+    if( $options{required} && !$can_be_required ) {
+        $class->throw_error("You cannot have a required attribute ($name) without a default, builder, or an init_arg");
+    }
 
-        $accessor .= $self.'->{'.$key.'} = '.$value.';' . "\n";
+    # taken from Mouse::Meta::Attribute->new and _process_options
 
-        if ($is_weak) {
-            $accessor .= 'Mouse::Util::weaken('.$self.'->{'.$key.'}) if ref('.$self.'->{'.$key.'});' . "\n";
-        }
+    if(exists $options{is}){
+        my $is = $options{is};
 
-        if ($trigger) {
-            $accessor .= '$trigger->('.$self.', '.$value.', $attribute);' . "\n";
+        if($is eq 'ro'){
+            $options{reader} ||= $name;
         }
+        elsif($is eq 'rw'){
+            if(exists $options{writer}){
+                $options{reader} ||= $name;
+             }
+             else{
+                $options{accessor} ||= $name;
+             }
+        }
+        elsif($is eq 'bare'){
+            # do nothing, but don't complain (later) about missing methods
+        }
+        else{
+            $is = 'undef' if !defined $is;
+            $class->throw_error("I do not understand this option (is => $is) on attribute ($name)");
+        }
+    }
 
-        $accessor .= "}\n";
+    my $tc;
+    if(exists $options{isa}){
+        $options{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($options{isa});
     }
-    else {
-        $accessor .= 'confess "Cannot assign a value to a read-only accessor" if scalar(@_) >= 2;' . "\n";
+    elsif(exists $options{does}){
+        $options{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_does_type_constraint($options{does});
     }
+    $tc = $options{type_constraint};
 
-    if ($attribute->is_lazy) {
-        $accessor .= $self.'->{'.$key.'} = ';
+    if($options{coerce}){
+        defined($tc)
+            || $class->throw_error("You cannot have coercion without specifying a type constraint on attribute ($name)");
 
-        $accessor .= $attribute->has_builder
-                ? $self.'->$builder'
-                    : ref($default) eq 'CODE'
-                    ? '$default->('.$self.')'
-                    : '$default';
-        $accessor .= ' if !exists '.$self.'->{'.$key.'};' . "\n";
+        $options{weak_ref}
+            && $class->throw_error("You cannot have a weak reference to a coerced value on attribute ($name)");
     }
 
-    if ($should_deref) {
-        my $type_constraint = $attribute->type_constraint;
-        if (!ref($type_constraint) && $type_constraint eq 'ArrayRef') {
-            $accessor .= 'if (wantarray) {
-                return @{ '.$self.'->{'.$key.'} || [] };
-            }';
-        }
-        else {
-            $accessor .= 'if (wantarray) {
-                return %{ '.$self.'->{'.$key.'} || {} };
-            }';
-        }
+    if ($options{lazy_build}) {
+        exists($options{default})
+            && $class->throw_error("You can not use lazy_build and default for the same attribute ($name)");
+
+        $options{lazy}      = 1;
+        $options{builder} ||= "_build_${name}";
+        if ($name =~ /^_/) {
+            $options{clearer}   ||= "_clear${name}";
+            $options{predicate} ||= "_has${name}";
+        }
+        else {
+            $options{clearer}   ||= "clear_${name}";
+            $options{predicate} ||= "has_${name}";
+        }
     }
 
-    $accessor .= 'return '.$self.'->{'.$key.'};
-    }';
-
-    my $sub = eval $accessor;
-    confess $@ if $@;
-    return $sub;
-}
-
-sub generate_predicate {
-    my $attribute = shift;
-    my $key = $attribute->inlined_name;
-
-    my $predicate = 'sub { exists($_[0]->{'.$key.'}) }';
-
-    my $sub = eval $predicate;
-    confess $@ if $@;
-    return $sub;
-}
-
-sub generate_clearer {
-    my $attribute = shift;
-    my $key = $attribute->inlined_name;
-
-    my $clearer = 'sub { delete($_[0]->{'.$key.'}) }';
+    if ($options{auto_deref}) {
+        defined($tc)
+            || $class->throw_error("You cannot auto-dereference without specifying a type constraint on attribute ($name)");
 
-    my $sub = eval $clearer;
-    confess $@ if $@;
-    return $sub;
-}
-
-sub generate_handles {
-    my $attribute = shift;
-    my $reader = $attribute->name;
-    my %handles = $attribute->_canonicalize_handles($attribute->handles);
-
-    my %method_map;
-
-    for my $local_method (keys %handles) {
-        my $remote_method = $handles{$local_method};
-
-        my $method = 'sub {
-            my $self = shift;
-            $self->'.$reader.'->'.$remote_method.'(@_)
-        }';
-
-        $method_map{$local_method} = eval $method;
-        confess $@ if $@;
+        ( $tc->is_a_type_of('ArrayRef') || $tc->is_a_type_of('HashRef') )
+            || $class->throw_error("You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)");
     }
 
-    return \%method_map;
-}
-
-sub create {
-    my ($self, $class, $name, %args) = @_;
-
-    $args{name} = $name;
-    $args{associated_class} = $class;
-
-    %args = $self->canonicalize_args($name, %args);
-    $self->validate_args($name, \%args);
-
-    $args{should_coerce} = delete $args{coerce}
-        if exists $args{coerce};
-
-    if (exists $args{isa}) {
-        my $type_constraint = delete $args{isa};
-        $type_constraint =~ s/\s//g;
-        my @type_constraints = split /\|/, $type_constraint;
-
-        my $code;
-        my $optimized_constraints = Mouse::TypeRegistry->optimized_constraints;
-        if (@type_constraints == 1) {
-            $code = $optimized_constraints->{$type_constraints[0]} ||
-                sub { Mouse::Util::blessed($_) && Mouse::Util::blessed($_) eq $type_constraints[0] };
-            $args{type_constraint} = $type_constraints[0];
-        } else {
-            my @code_list = map {
-                my $type = $_;
-                $optimized_constraints->{$type} ||
-                    sub { Mouse::Util::blessed($_) && Mouse::Util::blessed($_) eq $type }
-            } @type_constraints;
-            $code = sub {
-                for my $code (@code_list) {
-                    return 1 if $code->();
-                }
-                return 0;
-            };
-            $args{type_constraint} = \@type_constraints;
-        }
-        $args{find_type_constraint} = $code;
+    if (exists $options{trigger}) {
+        ('CODE' eq ref $options{trigger})
+            || $class->throw_error("Trigger must be a CODE ref on attribute ($name)");
     }
 
-    my $attribute = $self->new(%args);
-
-    $attribute->_create_args(\%args);
-
-    $class->add_attribute($attribute);
+    if ($options{lazy}) {
+        (exists $options{default} || defined $options{builder})
+            || $class->throw_error("You cannot have lazy attribute ($name) without specifying a default value for it");
+    }
 
-    # install an accessor
-    if ($attribute->_is_metadata eq 'rw' || $attribute->_is_metadata eq 'ro') {
-        my $accessor = $attribute->generate_accessor;
-        $class->add_method($name => $accessor);
+    if(my $metaclass = delete $options{metaclass}){
+        $class = Mouse::Util::resolve_metaclass_alias( Attribute => $metaclass );
     }
 
-    for my $method (qw/predicate clearer/) {
-        my $predicate = "has_$method";
-        if ($attribute->$predicate) {
-            my $generator = "generate_$method";
-            my $coderef = $attribute->$generator;
-            $class->add_method($attribute->$method => $coderef);
+    if(my $traits_ref = delete $options{traits}){
+        my @traits;
+        for (my $i = 9; $i < @{$traits_ref}; $i++) {
+            my $trait = Mouse::Util::resolve_metaclass_alias(Attribute => $traits_ref->[$i], trait => 1);
+
+            next if $class->does($trait);
+
+            push @traits, $trait;
+
+            # are there options?
+            push @traits, $traits_ref->[++$i]
+                if ref($traits_ref->[$i+1]);
         }
-    }
 
-    if ($attribute->has_handles) {
-        my $method_map = $attribute->generate_handles;
-        for my $method_name (keys %$method_map) {
-            $class->add_method($method_name => $method_map->{$method_name});
+        if (@traits) {
+            $class = Mouse::Meta::Class->create_anon_class(
+                superclasses => [ $class ],
+                roles        => [ @traits ],
+                cache        => 1,
+            )->name;
         }
     }
 
-    return $attribute;
+# XXX: there is no fast way to check attribute validity
+#    my @bad = grep{ !exists $valid_attrs{$_} } keys %options;
+#    if(@bad){
+#        @bad = sort @bad;
+#        Carp::cluck("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad");
+#    }
+
+    return bless \%options, $class;
 }
 
-sub canonicalize_args {
-    my $self = shift;
-    my $name = shift;
-    my %args = @_;
-
-    if ($args{lazy_build}) {
-        $args{lazy}      = 1;
-        $args{required}  = 1;
-        $args{builder}   = "_build_${name}"
-            if !exists($args{builder});
-        if ($name =~ /^_/) {
-            $args{clearer}   = "_clear${name}" if !exists($args{clearer});
-            $args{predicate} = "_has${name}" if !exists($args{predicate});
-        }
-        else {
-            $args{clearer}   = "clear_${name}" if !exists($args{clearer});
-            $args{predicate} = "has_${name}" if !exists($args{predicate});
-        }
-    }
+# readers
+
+sub name                 { $_[0]->{name}                   }
+sub associated_class     { $_[0]->{associated_class}       }
+
+sub accessor             { $_[0]->{accessor}               }
+sub reader               { $_[0]->{reader}                 }
+sub writer               { $_[0]->{writer}                 }
+sub predicate            { $_[0]->{predicate}              }
+sub clearer              { $_[0]->{clearer}                }
+sub handles              { $_[0]->{handles}                }
+
+sub _is_metadata         { $_[0]->{is}                     }
+sub is_required          { $_[0]->{required}               }
+sub default              { $_[0]->{default}                }
+sub is_lazy              { $_[0]->{lazy}                   }
+sub is_lazy_build        { $_[0]->{lazy_build}             }
+sub is_weak_ref          { $_[0]->{weak_ref}               }
+sub init_arg             { $_[0]->{init_arg}               }
+sub type_constraint      { $_[0]->{type_constraint}        }
+
+sub trigger              { $_[0]->{trigger}                }
+sub builder              { $_[0]->{builder}                }
+sub should_auto_deref    { $_[0]->{auto_deref}             }
+sub should_coerce        { $_[0]->{coerce}                 }
+
+# predicates
+
+sub has_accessor         { exists $_[0]->{accessor}        }
+sub has_reader           { exists $_[0]->{reader}          }
+sub has_writer           { exists $_[0]->{writer}          }
+sub has_predicate        { exists $_[0]->{predicate}       }
+sub has_clearer          { exists $_[0]->{clearer}         }
+sub has_handles          { exists $_[0]->{handles}         }
+
+sub has_default          { exists $_[0]->{default}         }
+sub has_type_constraint  { exists $_[0]->{type_constraint} }
+sub has_trigger          { exists $_[0]->{trigger}         }
+sub has_builder          { exists $_[0]->{builder}         }
 
-    return %args;
+sub _create_args {
+    $_[0]->{_create_args} = $_[1] if @_ > 1;
+    $_[0]->{_create_args}
 }
 
-sub validate_args {
-    my $self = shift;
-    my $name = shift;
-    my $args = shift;
+sub accessor_metaclass { 'Mouse::Meta::Method::Accessor' }
 
-    confess "You can not use lazy_build and default for the same attribute ($name)"
-        if $args->{lazy_build} && exists $args->{default};
+sub create {
+    my ($self, $class, $name, %args) = @_;
 
-    confess "You cannot have lazy attribute ($name) without specifying a default value for it"
-        if $args->{lazy}
-        && !exists($args->{default})
-        && !exists($args->{builder});
+    my $attribute = $self->new($name, %args);
 
-    confess "References are not allowed as default values, you must wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])"
-        if ref($args->{default})
-        && ref($args->{default}) ne 'CODE';
+    $attribute->_create_args(\%args);
 
-    confess "You cannot auto-dereference without specifying a type constraint on attribute ($name)"
-        if $args->{auto_deref} && !exists($args->{isa});
+    $class->add_attribute($attribute);
+    weaken($attribute->{associated_class} = $class);
 
-    confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)"
-        if $args->{auto_deref}
-        && $args->{isa} ne 'ArrayRef'
-        && $args->{isa} ne 'HashRef';
+    my $associated_methods = 0;
 
-    if ($args->{trigger}) {
-        if (ref($args->{trigger}) eq 'HASH') {
-            Carp::carp "HASH-based form of trigger has been removed. Only the coderef form of triggers are now supported.";
+    my $generator_class = $self->accessor_metaclass;
+    foreach my $type(qw(accessor reader writer predicate clearer handles)){
+        if(exists $attribute->{$type}){
+            my $installer    = '_install_' . $type;
+            $generator_class->$installer($attribute, $attribute->{$type}, $class);
+            $associated_methods++;
         }
+    }
+
+    if($associated_methods == 0 && ($attribute->_is_metadata || '') ne 'bare'){
+        Carp::cluck(qq{Attribute ($name) of class }.$class->name.qq{ has no associated methods (did you mean to provide an "is" argument?)});
 
-        confess "Trigger must be a CODE ref on attribute ($name)"
-            if ref($args->{trigger}) ne 'CODE';
     }
 
-    return 1;
+    return $attribute;
 }
 
-sub verify_type_constraint {
-    return 1 unless $_[0]->{type_constraint};
+sub verify_against_type_constraint {
+    my ($self, $value) = @_;
+    my $tc = $self->type_constraint;
+    return 1 unless $tc;
 
-    local $_ = $_[1];
-    return 1 if $_[0]->{find_type_constraint}->($_);
+    local $_ = $value;
+    return 1 if $tc->check($value);
 
-    my $self = shift;
-    $self->verify_type_constraint_error($self->name, $_, $self->type_constraint);
+    $self->verify_type_constraint_error($self->name, $value, $tc);
 }
 
 sub verify_type_constraint_error {
     my($self, $name, $value, $type) = @_;
-    $type = ref($type) eq 'ARRAY' ? join '|', @{ $type } : $type;
-    my $display = defined($_) ? overload::StrVal($_) : 'undef';
-    Carp::confess("Attribute ($name) does not pass the type constraint because: Validation failed for \'$type\' failed with value $display");
+    $self->throw_error("Attribute ($name) does not pass the type constraint because: " . $type->get_message($value));
 }
 
 sub coerce_constraint { ## my($self, $value) = @_;
     my $type = $_[0]->{type_constraint}
         or return $_[1];
-    return Mouse::TypeRegistry->typecast_constraints($_[0]->associated_class->name, $_[0]->find_type_constraint, $type, $_[1]);
+    return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $_[0]->type_constraint, $_[1]);
 }
 
 sub _canonicalize_handles {
@@ -359,7 +286,7 @@ sub _canonicalize_handles {
         return map { $_ => $_ } @$handles;
     }
     else {
-        confess "Unable to canonicalize the 'handles' option with $handles";
+        $self->throw_error("Unable to canonicalize the 'handles' option with $handles");
     }
 }
 
@@ -383,7 +310,14 @@ sub get_parent_args {
         return %{ $super_attr->_create_args };
     }
 
-    confess "Could not find an attribute by the name of '$name' to inherit from";
+    $self->throw_error("Could not find an attribute by the name of '$name' to inherit from");
+}
+
+sub throw_error{
+    my $self = shift;
+
+    my $metaclass = (ref $self && $self->associated_class) || 'Mouse::Meta::Class';
+    $metaclass->throw_error(@_, depth => 1);
 }
 
 1;
@@ -451,28 +385,7 @@ installed. Some error checking is done.
 
 Informational methods.
 
-=head2 generate_accessor -> CODE
-
-Creates a new code reference for the attribute's accessor.
-
-=head2 generate_predicate -> CODE
-
-Creates a new code reference for the attribute's predicate.
-
-=head2 generate_clearer -> CODE
-
-Creates a new code reference for the attribute's clearer.
-
-=head2 generate_handles -> { MethodName => CODE }
-
-Creates a new code reference for each of the attribute's handles methods.
-
-=head2 find_type_constraint -> CODE
-
-Returns a code reference which can be used to check that a given value passes
-this attribute's type constraint;
-
-=head2 verify_type_constraint Item -> 1 | ERROR
+=head2 verify_against_type_constraint Item -> 1 | ERROR
 
 Checks that the given value passes this attribute's type constraint. Returns 1
 on success, otherwise C<confess>es.
@@ -499,3 +412,4 @@ C<AttributeName>.
 
 =cut
 
+
\ No newline at end of file