Bye bye MX::MultiMethods

diff --git a/Changes b/Changes
index d3757b1..00263b1 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
 This file documents the revision history for Perl extension Gitalist.
 
-   - Add a requires_external_bin for the git command.
+   - Add a requires_external_bin for the git command so we won't try running
+     tests unless it's present.
+   - Remove MooseX::MultiMethods as it has been broken by a recent Moose
+     change. The new code is smaller and will be faster.
 
 0.001007 2010-05-15
     - Set the use_request_uri_for_path configuration variable to be compatible

diff --git a/Makefile.PL b/Makefile.PL
index 4b7354d..3cdcbcd 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -70,7 +70,6 @@ requires 'Config::General';
 
 requires 'Moose';
 requires 'Moose::Autobox';
-requires 'MooseX::MultiMethods' => '0.10';
 requires 'MooseX::Declare' => '0.33';
 requires 'MooseX::Types::Common';
 requires 'MooseX::Types::Path::Class';

diff --git a/lib/Gitalist/Git/Repository.pm b/lib/Gitalist/Git/Repository.pm
index 0d0c884..5e4768e 100644 (file)
--- a/lib/Gitalist/Git/Repository.pm
+++ b/lib/Gitalist/Git/Repository.pm
@@ -6,7 +6,6 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils {
     use MooseX::Types::Path::Class qw/Dir/;
     use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/;
     use Gitalist::Git::Types qw/SHA1/;
-    use MooseX::MultiMethods;
     use Moose::Autobox;
     use List::MoreUtils qw/any zip/;
     use DateTime;
@@ -76,14 +75,11 @@ class Gitalist::Git::Repository with Gitalist::Git::HasUtils {
 
     ## Public methods
 
-    multi method get_object_or_head (SHA1 $sha1) {
+    method get_object_or_head (NonEmptySimpleStr $ref) {
+        my $sha1 = is_SHA1($ref) ? $ref : $self->head_hash($ref);
         $self->get_object($sha1);
     }
-    multi method get_object_or_head (NonEmptySimpleStr $ref) {
-        my $sha1 = $self->head_hash($ref);
-        $self->get_object($sha1);
-    }    
-    
+
     method head_hash (Str $head?) {
         my $output = $self->run_cmd(qw/rev-parse --verify/, $head || 'HEAD' );
         confess("No such head: " . $head) unless defined $output;