Refactor somewhat

[catagits/Gitalist.git] / lib / Gitalist / Git / Object.pm

diff --git a/lib/Gitalist/Git/Object.pm b/lib/Gitalist/Git/Object.pm
index 0346365..1ebe1db 100644 (file)
--- a/lib/Gitalist/Git/Object.pm
+++ b/lib/Gitalist/Git/Object.pm
@@ -1,26 +1,29 @@
 use MooseX::Declare;
+use Moose::Autobox;
 
 class Gitalist::Git::Object {
     use MooseX::Types::Moose qw/Str Int/;
+    use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
     use File::Stat::ModeString qw/mode_to_string/;
     # project and sha1 are required initargs
     has project => ( isa => 'Gitalist::Git::Project',
                      required => 1,
                      is => 'ro',
+                     weak_ref => 1,
                      handles => [ 'run_cmd' ],
                  );
-    has sha1 => ( isa => Str,
+    has sha1 => ( isa => NonEmptySimpleStr,
                required => 1,
                is => 'ro' );
 
-    has $_ => ( isa => Str,
+    has $_ => ( isa => NonEmptySimpleStr,
                   required => 1,
                   is => 'ro',
                   lazy_build => 1 )
         for qw/type modestr size/;
 
     # objects can't determine their mode or filename
-    has file => ( isa => Str,
+    has file => ( isa => NonEmptySimpleStr,
                   required => 0,
                   is => 'ro' );
     has mode => ( isa => Int,
@@ -28,25 +31,21 @@ class Gitalist::Git::Object {
                 default => 0,
                 is => 'ro' );
 
-    method BUILD {
-        $self->$_() for qw/type modestr size/; # Ensure to build early.
-    }
+    method BUILD { $self->$_() for qw/type size modestr/ }
 
-    method _build_type {
-        my $output = $self->run_cmd(qw/cat-file -t/, $self->{sha1});
-        chomp($output);
-        return $output;
+    foreach my $key (qw/ type size /) {
+        method "_build_$key" {
+            $self->_cat_file_with_flag(substr($key, 0, 1))->chomp;
+        }
     }
 
     method _build_modestr {
-        my $modestr = mode_to_string($self->{mode});
+        my $modestr = mode_to_string($self->mode);
         return $modestr;
     }
 
-    method _build_size {
-        my $output = $self->run_cmd(qw/cat-file -s/, $self->{sha1});
-        chomp($output);
-        return $output;
+    method _cat_file_with_flag ($flag) {
+        $self->run_cmd('cat-file', '-' . $flag, $self->{sha1})
     }
 
 =head2 contents
@@ -55,15 +54,13 @@ Return the contents of a given file.
 
 =cut
 
+    # FIXME - Should be an attribute so it gets cached?
     method contents {
         if ( $self->type ne 'blob' ) {
             die "object $self->sha1 is not a file\n"
         }
 
-        my $output = $self->run_cmd(qw/cat-file -p/, $self->sha1);
-        return unless $output;
-
-        return $output;
+        $self->_cat_file_with_flag('p');
     }
 
 } # end class