Mouse::Util::does_role() respects $thing->does() method

[gitmo/Mouse.git] / lib / Mouse / Meta / Attribute.pm

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index d38af3b..54fc2b5 100644 (file)
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -34,6 +34,7 @@ my %valid_options = map { $_ => undef } (
   # internally used
   'associated_class',
   'associated_methods',
+  '__METACLASS__',
 
   # Moose defines, but Mouse doesn't
   #'definition_context',
@@ -93,13 +94,13 @@ sub get_write_method  { $_[0]->writer || $_[0]->accessor }
 
 sub get_read_method_ref{
     my($self) = @_;
-    return $self->{_read_method_ref}
+    return $self->{_mouse_cache_read_method_ref}
         ||= $self->_get_accessor_method_ref('get_read_method', '_generate_reader');
 }
 
 sub get_write_method_ref{
     my($self) = @_;
-    return $self->{_write_method_ref}
+    return $self->{_mouse_cache_write_method_ref}
         ||= $self->_get_accessor_method_ref('get_write_method', '_generate_writer');
 }
 
@@ -182,7 +183,7 @@ sub clone_and_inherit_options{
 
     # remove temporary caches
     foreach my $attr(keys %{$args}){
-        if($attr =~ /\A _/xms){
+        if($attr =~ /\A _mouse_cache_/xms){
             delete $args->{$attr};
         }
     }
@@ -223,7 +224,7 @@ sub get_value {
 
 sub has_value {
     my($self, $object) = @_;
-    my $accessor_ref = $self->{_predicate_ref}
+    my $accessor_ref = $self->{_mouse_cache_predicate_ref}
         ||= $self->_get_accessor_method_ref('predicate', '_generate_predicate');
 
     return $accessor_ref->($object);
@@ -231,7 +232,7 @@ sub has_value {
 
 sub clear_value {
     my($self, $object) = @_;
-    my $accessor_ref = $self->{_crealer_ref}
+    my $accessor_ref = $self->{_mouse_cache_crealer_ref}
         ||= $self->_get_accessor_method_ref('clearer', '_generate_clearer');
 
     return $accessor_ref->($object);
@@ -254,16 +255,24 @@ sub install_accessors{
         if(exists $attribute->{$type}){
             my $generator = '_generate_' . $type;
             my $code      = $accessor_class->$generator($attribute, $metaclass);
-            $metaclass->add_method($attribute->{$type} => $code);
-            $attribute->associate_method($attribute->{$type});
+            my $name      = $attribute->{$type};
+# TODO: do something for compatibility
+#            if( $metaclass->name->can($name) ) {
+#                my $t = $metaclass->has_method($name) ? 'method' : 'function';
+#                Carp::cluck("You are overwriting a locally defined $t"
+#                    . " ($name) with an accessor");
+#            }
+            $metaclass->add_method($name => $code);
+            $attribute->associate_method($name);
         }
     }
 
     # install delegation
     if(exists $attribute->{handles}){
         my %handles = $attribute->_canonicalize_handles();
-
         while(my($handle, $method_to_call) = each %handles){
+            next if Mouse::Object->can($handle);
+
             if($metaclass->has_method($handle)) {
                 $attribute->throw_error("You cannot overwrite a locally defined method ($handle) with a delegation");
             }
@@ -297,7 +306,7 @@ sub _canonicalize_handles {
     elsif ($handle_type eq 'Regexp') {
         my $meta = $self->_find_delegate_metaclass();
         return map  { $_ => $_ }
-               grep { !Mouse::Object->can($_) && $_ =~ $handles }
+               grep { /$handles/ }
                    Mouse::Util::is_a_metarole($meta)
                         ? $meta->get_method_list
                         : $meta->get_all_method_names;
@@ -340,7 +349,7 @@ Mouse::Meta::Attribute - The Mouse attribute metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.74
+This document describes Mouse version 0.95
 
 =head1 DESCRIPTION