X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FGit%2FObject.pm;h=c4e87d4c5b64a9fb81e59146bb2f9a92f7ecdc37;hb=460b079a490cc638ecdd666c63d8edc09b7a8bcc;hp=33a4f75e5c1a4ae36a9379eb783133cd53777fcc;hpb=9f5e7b00735f7144cf6798064889890a5556112f;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Git/Object.pm b/lib/Gitalist/Git/Object.pm
index 33a4f75..c4e87d4 100644
--- a/lib/Gitalist/Git/Object.pm
+++ b/lib/Gitalist/Git/Object.pm
@@ -1,9 +1,13 @@
 use MooseX::Declare;
 use Moose::Autobox;
 
-class Gitalist::Git::Object with Gitalist::Serializeable {
+class Gitalist::Git::Object with Gitalist::Git::Serializable is dirty {
+    use MooseX::Storage::Meta::Attribute::Trait::DoNotSerialize;
+
     use MooseX::Types::Moose qw/Str Int Bool Maybe ArrayRef/;
     use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
+    use Gitalist::Utils qw/mode_string/;
+    use overload '""' => '_to_string', fallback => 1;
 
     # repository and sha1 are required initargs
     has repository => ( isa => 'Gitalist::Git::Repository',
@@ -31,12 +35,12 @@ class Gitalist::Git::Object with Gitalist::Serializeable {
                 lazy_build => 1 )
         for qw/modestr size/;
 
-    has _gpp_obj => ( isa => 'Git::PurePerl::Object',
-                      required => 1,
-                      is => 'ro',
+    has _gpp_obj => ( isa        => 'Git::PurePerl::Object',
+                      required   => 1,
+                      is         => 'ro',
                       lazy_build => 1,
-                      handles => [ 'content',
-                               ],
+                      handles    => [ 'content' ],
+                      traits     => ['DoNotSerialize']
                   );
 
     # objects can't determine their mode or filename
@@ -51,6 +55,9 @@ class Gitalist::Git::Object with Gitalist::Serializeable {
     method BUILD { $self->$_() for qw/_gpp_obj size modestr/ }
 
 ## Private methods
+    method _to_string {
+        return $self->sha1;
+    };
 
 ## Builders
     method _build__gpp_obj {
@@ -68,41 +75,7 @@ class Gitalist::Git::Object with Gitalist::Serializeable {
     }
 
     method _build_modestr {
-        return _mode_str($self->mode);
-    }
-
-    # via gitweb.pm circa line 1305
-    use Fcntl ':mode';
-    use constant {
-        S_IFINVALID => 0030000,
-        S_IFGITLINK => 0160000,
-    };
-
-    # submodule/subrepository, a commit object reference
-    sub S_ISGITLINK($) {
-        return (($_[0] & S_IFMT) == S_IFGITLINK)
-    }
-
-    # convert file mode in octal to symbolic file mode string
-    sub _mode_str {
-        my $mode = shift;
-
-        if (S_ISGITLINK($mode)) {
-            return 'm---------';
-        } elsif (S_ISDIR($mode & S_IFMT)) {
-            return 'drwxr-xr-x';
-        } elsif (S_ISLNK($mode)) {
-            return 'lrwxrwxrwx';
-        } elsif (S_ISREG($mode)) {
-            # git cares only about the executable bit
-            if ($mode & S_IXUSR) {
-                return '-rwxr-xr-x';
-            } else {
-                return '-rw-r--r--';
-            }
-        } else {
-            return '----------';
-        }
+        return mode_string($self->mode);
     }
 
 } # end class