X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FMethod%2FConflicting.pm;h=b3a21f36627353f6a104a3d8d38b7bf2a75daf31;hb=c53c3ec7350a5fc4699ca6053221bc02e60d02d5;hp=4957177dac468f346d6d13ca85f236d9fe074abc;hpb=49f8f3e6c3d79d1c1efaf61fd4b45deb19709895;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Method/Conflicting.pm b/lib/Moose/Meta/Role/Method/Conflicting.pm
index 4957177..b3a21f3 100644
--- a/lib/Moose/Meta/Role/Method/Conflicting.pm
+++ b/lib/Moose/Meta/Role/Method/Conflicting.pm
@@ -4,9 +4,11 @@ package Moose::Meta::Role::Method::Conflicting;
 use strict;
 use warnings;
 
+use Moose::Util;
+
 use base qw(Moose::Meta::Role::Method::Required);
 
-our $VERSION   = '0.79';
+our $VERSION   = '1.05';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -15,7 +17,10 @@ __PACKAGE__->meta->add_attribute('roles' => (
     required => 1,
 ));
 
-sub is_conflict { 1 }
+sub roles_as_english_list {
+    my $self = shift;
+    Moose::Util::english_list( map { q{'} . $_ . q{'} } @{ $self->roles } );
+}
 
 1;
 
@@ -63,18 +68,15 @@ Returns the conflicting method's name, as provided to the constructor.
 Returns the roles that generated this conflicting method, as provided to the
 constructor.
 
-=item B<< $method->is_conflict >>
+=item B<< $method->roles_as_english_list >>
 
-Returns whether the method requirement is due to a conflict. By default for
-this class, it's true.
+Returns the roles that generated this conflicting method as an English list.
 
 =back
 
 =head1 BUGS
 
-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.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -82,7 +84,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>