X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FMethod%2FDelegation.pm;h=413f6da740dc687264f984f5ed4d8b10c3bb9945;hp=022cb9819667062225661775ff112e90b6594d76;hb=21ee5bbbc20a3366955be77a589206295b5c0f9e;hpb=1e5823974a557bd35b4aa4a5c1d1aecf1e5483d2

diff --git a/lib/Mouse/Meta/Method/Delegation.pm b/lib/Mouse/Meta/Method/Delegation.pm
index 022cb98..413f6da 100644
--- a/lib/Mouse/Meta/Method/Delegation.pm
+++ b/lib/Mouse/Meta/Method/Delegation.pm
@@ -1,27 +1,54 @@
 package Mouse::Meta::Method::Delegation;
-use Mouse::Util; # enables strict and warnings
-use Scalar::Util qw(blessed);
+use Mouse::Util qw(:meta); # enables strict and warnings
+use Scalar::Util;
 
 sub _generate_delegation{
-    my (undef, $attribute, $metaclass, $reader, $handle_name, $method_to_call) = @_;
-
-    return sub {
-        my $instance = shift;
-        my $proxy    = $instance->$reader();
-
-        my $error = !defined($proxy)                ? ' is not defined'
-                  : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}
-                                                    : undef;
-        if ($error) {
-            $instance->meta->throw_error(
-                "Cannot delegate $handle_name to $method_to_call because "
-                    . "the value of "
-                    . $attribute->name
-                    . $error
-             );
-        }
-        $proxy->$method_to_call(@_);
-    };
+    my (undef, $attr, $handle_name, $method_to_call) = @_;
+
+    my @curried_args;
+    if(ref($method_to_call) eq 'ARRAY'){
+        ($method_to_call, @curried_args) = @{$method_to_call};
+    }
+
+    my $reader = $attr->get_read_method_ref();
+
+    my $can_be_optimized = $attr->{_method_delegation_can_be_optimized};
+
+    if(!defined $can_be_optimized){
+        my $tc     = $attr->type_constraint;
+
+        $attr->{_method_delegation_can_be_optimized} =
+            (defined($tc) && $tc->is_a_type_of('Object'))
+            && ($attr->is_required || $attr->has_default || $attr->has_builder)
+            && ($attr->is_lazy || !$attr->has_clearer);
+    }
+
+    if($can_be_optimized){
+        # need not check the attribute value
+        return sub {
+            return shift()->$reader()->$method_to_call(@curried_args, @_);
+        };
+    }
+    else {
+        # need to check the attribute value
+        return sub {
+            my $instance = shift;
+            my $proxy    = $instance->$reader();
+
+            my $error = !defined($proxy)                              ? ' is not defined'
+                      : ref($proxy) && !Scalar::Util::blessed($proxy) ? qq{ is not an object (got '$proxy')}
+                                                                      : undef;
+            if ($error) {
+                $instance->meta->throw_error(
+                    "Cannot delegate $handle_name to $method_to_call because "
+                        . "the value of "
+                        . $attr->name
+                        . $error
+                 );
+            }
+            $proxy->$method_to_call(@curried_args, @_);
+        };
+    }
 }
 
 
@@ -34,7 +61,7 @@ Mouse::Meta::Method::Delegation - A Mouse method generator for delegation method
 
 =head1 VERSION
 
-This document describes Mouse version 0.40_06
+This document describes Mouse version 0.50_02
 
 =head1 SEE ALSO