X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist.pm;h=9cf637de4dc6d669a31c1bf0fe4058b71cf002f2;hb=793277c4fd583088d0be4c247e160a8a9b67a2a4;hp=5213ef7aba65b916bc033ffc0c5c91cd6d08dd93;hpb=deb6344b79370d2dda7dc41ce1aa11ac03c6c3e2;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist.pm b/lib/Gitalist.pm
index 5213ef7..9cf637d 100644
--- a/lib/Gitalist.pm
+++ b/lib/Gitalist.pm
@@ -1,75 +1,104 @@
 package Gitalist;
 use Moose;
-use namespace::autoclean;
-
+BEGIN { require 5.008006; }
 use Catalyst::Runtime 5.80;
+use namespace::autoclean;
 
 extends 'Catalyst';
 
-use Catalyst qw/-Debug
+use Catalyst qw/
                 ConfigLoader
+                Unicode::Encoding
                 Static::Simple
-                StackTrace/;
-
-use Class::C3::Adopt::NEXT -no_warn;
-
-our $VERSION = '0.01';
+                StackTrace
+/;
 
-# Bring in the libified gitweb.cgi.
-use gitweb;
+our $VERSION = '0.000000_02';
+$VERSION = eval $VERSION;
 
 __PACKAGE__->config(
     name => 'Gitalist',
     default_view => 'Default',
+    default_model => 'GitRepos',
 );
 
-# Start the application
 __PACKAGE__->setup();
 
-sub uri_for {
-    my $p = ref $_[-1] eq 'HASH'
-          ? $_[-1]
-          : push(@_, {}) && $_[-1];
-    $p->{p} = $_[0]->model('Git')->project;
+around uri_for => sub {
+  my ($orig, $c) = (shift, shift);
+  my $project_name = $c->stash->{'Project'} && $c->stash->{'Project'}->name;
+  my $hash = ref($_[-1]) eq 'HASH' ? pop @_ : {};
+  my $params = Catalyst::Utils::merge_hashes(
+    { p => $hash->{p} || $project_name },
+    $hash,
+  );
+  delete $params->{p} unless defined $params->{p} && length $params->{p};
+  (my $uri = $c->$orig(@_, $params))
+    =~ tr[&][;];
+  return $uri;
+};
 
-    (my $uri = $_[0]->NEXT::uri_for(@_[1 .. $#_]))
-      # Ampersand! What is this, the 90s?
-      =~ s/&/;/g;
-    return $uri;
-}
+1;
+
+__END__
 
 =head1 NAME
 
-Gitalist - Catalyst based application
+Gitalist - A modern git web viewer
 
 =head1 SYNOPSIS
 
     script/gitalist_server.pl
 
+=head1 INSTALL
+
+As Gitalist follows the usual Perl module format the usual approach
+for installation should work e.g
+
+  perl Makefile.PL
+  make
+  make test
+  make install
+
+If you're running a git checkout of Gitalist then you'll additionally
+need the author modules.
+
 =head1 DESCRIPTION
 
-[enter your description here]
+Gitalist is a web frontend for git repositories based on gitweb.cgi
+and backed by Catalyst.
+
+=head2 History
+
+This project started off as an attempt to port gitweb.cgi to a
+Catalyst app in a piecemeal fashion. As it turns out, thanks largely
+to Florian Ragwitz's earlier effort, it was easier to use gitweb.cgi
+as a template for building a new Catalyst application.
 
 =head1 SEE ALSO
 
-L<Gitalist::Controller::Root>, L<Catalyst>
+L<Gitalist::Controller::Root>
+
+L<Gitalist::Git::Project>
+
+L<Catalyst>
 
 =head1 AUTHORS AND COPYRIGHT
 
   Catalyst application:
-    (C) 2009 Venda Ltd and Dan Brook <dbrook@venda.com>
+    (C) 2009 Venda Ltd and Dan Brook <broq@cpan.org>
+    (C) 2009, Tom Doran <bobtfish@bobtfish.net>
+    (C) 2009, Zac Stevens <zts@cryptocracy.com>
 
   Original gitweb.cgi from which this was derived:
     (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>
     (C) 2005, Christian Gierke
 
-=head1 LICENSE
+  Model based on http://github.com/rafl/gitweb
+    (C) 2008, Florian Ragwitz
 
-FIXME - Is this going to be GPLv2 as per gitweb? If so this is broken..
+=head1 LICENSE
 
-This library is free software. You can redistribute it and/or modify
-it under the same terms as Perl itself.
+Licensed under GNU GPL v2
 
 =cut
-
-1;