X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FRole%2FTiny.pm;h=285151c6d55fbae2a84e75e1ae8bb54800a71a41;hb=9531615247b5aec0545a7d2804ef5168cc99c7a5;hp=609f4a6514f35bbb31932b1b058d4e57caffca86;hpb=f52b98215874945b6f2f975a99c530c019bfbdbb;p=gitmo%2FRole-Tiny.git

diff --git a/lib/Role/Tiny.pm b/lib/Role/Tiny.pm
index 609f4a6..285151c 100644
--- a/lib/Role/Tiny.pm
+++ b/lib/Role/Tiny.pm
@@ -6,7 +6,7 @@ sub _getstash { \%{"$_[0]::"} }
 use strict;
 use warnings FATAL => 'all';
 
-our $VERSION = '1.001005'; # 1.1.5
+our $VERSION = '1.002003'; # 1.2.3
 $VERSION = eval $VERSION;
 
 our %INFO;
@@ -45,7 +45,7 @@ sub import {
   warnings->import(FATAL => 'all');
   return if $INFO{$target}; # already exported into this package
   # get symbol table reference
-  my $stash = do { no strict 'refs'; \%{"${target}::"} };
+  my $stash = _getstash($target);
   # install before/after/around subs
   foreach my $type (qw(before after around)) {
     *{_getglob "${target}::${type}"} = sub {
@@ -86,11 +86,6 @@ sub apply_single_role_to_package {
 
   $me->_install_modifiers($to, $info->{modifiers});
 
-  # only add does() method to classes and only if they don't have one
-  if (not $INFO{$to} and not $to->can('does')) {
-    *{_getglob "${to}::does"} = \&does_role;
-  }
-
   # copy our role list into the target's
   @{$APPLIED_TO{$to}||={}}{keys %{$APPLIED_TO{$role}}} = ();
 }
@@ -157,8 +152,6 @@ sub create_class_with_roles {
     do { my %h; @h{map @{$_->{requires}||[]}, @info} = (); keys %h }
   );
 
-  *{_getglob "${new_name}::does"} = \&does_role unless $new_name->can('does');
-
   @{$APPLIED_TO{$new_name}||={}}{
     map keys %{$APPLIED_TO{$_}}, @roles
   } = ();
@@ -221,7 +214,11 @@ sub _composable_package_for {
   return $composed_name if $COMPOSED{role}{$composed_name};
   $me->_install_methods($composed_name, $role);
   my $base_name = $composed_name.'::_BASE';
-  *{_getglob("${composed_name}::ISA")} = [ $base_name ];
+  # Not using _getglob, since setting @ISA via the typeglob breaks
+  # inheritance on 5.10.0 if the stash has previously been accessed an
+  # then a method called on the class (in that order!), which
+  # ->_install_methods (with the help of ->_install_does) ends up doing.
+  { no strict 'refs'; @{"${composed_name}::ISA"} = ( $base_name ); }
   my $modifiers = $INFO{$role}{modifiers}||[];
   my @mod_base;
   foreach my $modified (
@@ -257,7 +254,7 @@ sub _concrete_methods_of {
   my ($me, $role) = @_;
   my $info = $INFO{$role};
   # grab role symbol table
-  my $stash = do { no strict 'refs'; \%{"${role}::"}};
+  my $stash = _getstash($role);
   # reverse so our keys become the values (captured coderefs) in case
   # they got copied or re-used since
   my $not_methods = { reverse %{$info->{not_methods}||{}} };
@@ -285,7 +282,7 @@ sub _install_methods {
   my $methods = $me->_concrete_methods_of($role);
 
   # grab target symbol table
-  my $stash = do { no strict 'refs'; \%{"${to}::"}};
+  my $stash = _getstash($to);
 
   # determine already extant methods of target
   my %has_methods;
@@ -298,6 +295,8 @@ sub _install_methods {
     no warnings 'once';
     *{_getglob "${to}::${i}"} = $methods->{$i};
   }
+  
+  $me->_install_does($to);
 }
 
 sub _install_modifiers {
@@ -316,6 +315,27 @@ sub _install_single_modifier {
   Class::Method::Modifiers::install_modifier(@args);
 }
 
+my $FALLBACK = sub { 0 };
+sub _install_does {
+  my ($me, $to) = @_;
+  
+  # only add does() method to classes
+  return if $INFO{$to};
+  
+  # add does() only if they don't have one
+  *{_getglob "${to}::does"} = \&does_role unless $to->can('does');
+  
+  return if ($to->can('DOES') and $to->can('DOES') != (UNIVERSAL->can('DOES') || 0));
+  
+  my $existing = $to->can('DOES') || $to->can('isa') || $FALLBACK;
+  my $new_sub = sub {
+    my ($proto, $role) = @_;
+    Role::Tiny::does_role($proto, $role) or $proto->$existing($role);
+  };
+  no warnings 'redefine';
+  *{_getglob "${to}::DOES"} = $new_sub;
+}
+
 sub does_role {
   my ($proto, $role) = @_;
   if ($] >= 5.010) {
@@ -474,7 +494,11 @@ composed into unless that class already has an ->does method, so
     ...
   }
 
-will work for classes but to test a role, one must use ::does_role directly
+will work for classes but to test a role, one must use ::does_role directly.
+
+Additionally, Role::Tiny will override the standard Perl C<DOES> method
+for your class. However, if C<any> class in your class' inheritance
+heirarchy provides C<DOES>, then Role::Tiny will not override it.
 
 =head1 METHODS
 
@@ -540,6 +564,8 @@ Mithaldu - Christian Walde (cpan:MITHALDU) <walde.christian@googlemail.com>
 
 ilmari - Dagfinn Ilmari Mannsåker (cpan:ILMARI) <ilmari@ilmari.org>
 
+tobyink - Toby Inkster (cpan:TOBYINK) <tobyink@cpan.org>
+
 =head1 COPYRIGHT
 
 Copyright (c) 2010-2012 the Role::Tiny L</AUTHOR> and L</CONTRIBUTORS>