fix handling of does and DOES

[p5sagit/Safe-Isa.git] / lib / Safe / Isa.pm

diff --git a/lib/Safe/Isa.pm b/lib/Safe/Isa.pm
index e7a1337..fb3c5ab 100644 (file)
--- a/lib/Safe/Isa.pm
+++ b/lib/Safe/Isa.pm
@@ -5,7 +5,7 @@ use warnings FATAL => 'all';
 use Scalar::Util ();
 use Exporter 5.57 qw(import);
 
-our $VERSION = '1.000007';
+our $VERSION = '1.000008';
 
 our @EXPORT = qw($_call_if_object $_isa $_can $_does $_DOES $_call_if_can);
 
@@ -15,18 +15,31 @@ our $_call_if_object = sub {
   # we gratuitously break modules like Scalar::Defer, which would be
   # un-perlish.
   return unless Scalar::Util::blessed($obj);
-  return $obj->isa(@_) if lc($method) eq 'does' and not $obj->can($method);
   return $obj->$method(@_);
 };
 
-our ($_isa, $_can, $_does, $_DOES) = map {
+our ($_isa, $_can) = map {
   my $method = $_;
   sub { my $obj = shift; $obj->$_call_if_object($method => @_) }
-} qw(isa can does DOES);
+} qw(isa can);
 
 our $_call_if_can = sub {
   my ($obj, $method) = (shift, shift);
-  $obj->$_call_if_object(can => $method) && $obj->$method(@_);
+  return unless $obj->$_call_if_object(can => $method);
+  return $obj->$method(@_);
+};
+
+our $_does = sub {
+  my $obj = shift;
+  $obj->$_call_if_can(does => @_);
+};
+
+our $_DOES = sub {
+  my $obj = shift;
+  return unless Scalar::Util::blessed($obj);
+  return $obj->DOES(@_)
+    if $obj->can('DOES');
+  return $obj->isa(@_);
 };
 
 1;
@@ -123,6 +136,9 @@ class names that you might not want to treat as one (like say "Matt") - the
 C<is_module_name> function from L<Module::Runtime> is a good way to check for
 something you might be able to call methods on if you want to do that.
 
+We are careful to make sure that scalar/list context is preserved for the
+method that is eventually called.
+
 =head1 EXPORTS
 
 =head2 $_isa