X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FDelegation.pm;h=32436d6844c2d513b5e6ec56056ec8a48da05e6b;hb=d1ef0daf972b8d8a599b4e37b724702025647543;hp=f2bd2ecec423eef2bc00babe8332ac79339ed0f4;hpb=2351f08e7d635babd893a7951af6ef553ef23cec;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Delegation.pm b/lib/Moose/Meta/Method/Delegation.pm
index f2bd2ec..32436d6 100644
--- a/lib/Moose/Meta/Method/Delegation.pm
+++ b/lib/Moose/Meta/Method/Delegation.pm
@@ -7,10 +7,6 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'weaken';
 
-our $VERSION   = '0.59';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::Method',
          'Class::MOP::Method::Generated';
 
@@ -36,6 +32,13 @@ sub new {
         || confess
         'You must supply a delegate_to_method which is a method name or a CODE reference';
 
+    exists $options{curried_arguments}
+        || ( $options{curried_arguments} = [] );
+
+    ( $options{curried_arguments} &&
+        ( 'ARRAY' eq ref $options{curried_arguments} ) )
+        || confess 'You must supply a curried_arguments which is an ARRAY reference';
+
     my $self = $class->_new( \%options );
 
     weaken( $self->{'attribute'} );
@@ -52,6 +55,8 @@ sub _new {
     return bless $options, $class;
 }
 
+sub curried_arguments { (shift)->{'curried_arguments'} }
+
 sub associated_attribute { (shift)->{'attribute'} }
 
 sub delegate_to_method { (shift)->{'delegate_to_method'} }
@@ -70,44 +75,66 @@ sub _initialize_body {
     # NOTE: we used to do a goto here, but the goto didn't handle
     # failure correctly (it just returned nothing), so I took that
     # out. However, the more I thought about it, the less I liked it
-    # doing the goto, and I prefered the act of delegation being
+    # doing the goto, and I preferred the act of delegation being
     # actually represented in the stack trace.  - SL
+    # not inlining this, since it won't really speed things up at
+    # all... the only thing that would end up different would be
+    # interpolating in $method_to_call, and a bunch of things in the
+    # error handling that mostly never gets called - doy
     $self->{body} = sub {
         my $instance = shift;
         my $proxy    = $instance->$accessor();
-        ( defined $proxy )
-            || $self->throw_error(
-            "Cannot delegate $handle_name to $method_to_call because "
-                . "the value of "
-                . $self->name
-                . " is not defined",
-            method_name => $method_to_call,
-            object      => $instance
+
+        my $error
+            = !defined $proxy                 ? ' is not defined'
+            : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}
+            : undef;
+
+        if ($error) {
+            $self->throw_error(
+                "Cannot delegate $handle_name to $method_to_call because "
+                    . "the value of "
+                    . $self->associated_attribute->name
+                    . $error,
+                method_name => $method_to_call,
+                object      => $instance
             );
+        }
+        unshift @_, @{ $self->curried_arguments };
         $proxy->$method_to_call(@_);
     };
 }
 
 sub _get_delegate_accessor {
     my $self = shift;
-
-    my $accessor = $self->associated_attribute->get_read_method_ref;
-
-    $accessor = $accessor->body if blessed $accessor;
+    my $attr = $self->associated_attribute;
+
+    # NOTE:
+    # always use a named method when
+    # possible, if you use the method
+    # ref and there are modifiers on
+    # the accessors then it will not
+    # pick up the modifiers too. Only
+    # the named method will assure that
+    # we also have any modifiers run.
+    # - SL
+    my $accessor = $attr->has_read_method
+        ? $attr->get_read_method
+        : $attr->get_read_method_ref;
+
+    $accessor = $accessor->body if Scalar::Util::blessed $accessor;
 
     return $accessor;
 }
 
 1;
 
+# ABSTRACT: A Moose Method metaclass for delegation methods
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Meta::Method::Delegation - A Moose Method metaclass for delegation methods
-
 =head1 DESCRIPTION
 
 This is a subclass of L<Moose::Meta::Method> for delegation
@@ -117,52 +144,46 @@ methods.
 
 =over 4
 
-=item B<new (%options)>
+=item B<< Moose::Meta::Method::Delegation->new(%options) >>
 
-This creates the method based on the criteria in C<%options>,
-these options are:
+This creates the delegation methods based on the provided C<%options>.
 
 =over 4
 
 =item I<attribute>
 
 This must be an instance of C<Moose::Meta::Attribute> which this
-accessor is being generated for. This paramter is B<required>.
+accessor is being generated for. This options is B<required>.
 
 =item I<delegate_to_method>
 
 The method in the associated attribute's value to which we
 delegate. This can be either a method name or a code reference.
 
-=back
-
-=item B<associated_attribute>
-
-Returns the attribute associated with this method.
-
-=item B<delegate_to_method>
+=item I<curried_arguments>
 
-Returns the method to which this method delegates.
+An array reference of arguments that will be prepended to the argument list for
+any call to the delegating method.
 
 =back
 
-=head1 BUGS
+=item B<< $metamethod->associated_attribute >>
 
-All complex software has bugs lurking in it, and this module is no 
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+Returns the attribute associated with this method.
 
-=head1 AUTHOR
+=item B<< $metamethod->curried_arguments >>
 
-Dave Rolsky E<lt>autarch@urth.orgE<gt>
+Return any curried arguments that will be passed to the delegated method.
 
-=head1 COPYRIGHT AND LICENSE
+=item B<< $metamethod->delegate_to_method >>
 
-Copyright 2008 by Infinity Interactive, Inc.
+Returns the method to which this method delegates, as passed to the
+constructor.
 
-L<http://www.iinteractive.com>
+=back
+
+=head1 BUGS
 
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =cut