X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist%2FController%2FRoot.pm;h=7b921f89281b3f141c6b161b78396d771b39c1d8;hb=e1a23af1e0fa1ee2aa13ba3055c258e559ee4f93;hp=f67e4b57a36cb151192661dc7833ff23d541b4f2;hpb=75813ed3840460d238df28a8709f2fd9c6ae18d7;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist/Controller/Root.pm b/lib/Gitalist/Controller/Root.pm
index f67e4b5..7b921f8 100644
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@ -1,658 +1,39 @@
 package Gitalist::Controller::Root;
-use Moose;
-use namespace::autoclean;
-
-BEGIN { extends 'Catalyst::Controller' }
-
-__PACKAGE__->config->{namespace} = '';
 
+use Moose;
 use Moose::Autobox;
-use Sys::Hostname ();
-use XML::Atom::Feed;
-use XML::Atom::Entry;
-use XML::RSS;
-use XML::OPML::SimpleGen;
-
-=head1 NAME
-
-Gitalist::Controller::Root - Root Controller for Gitalist
-
-=head1 DESCRIPTION
-
-[enter your description here]
-
-=head1 METHODS
-
-=cut
-
-sub _get_object {
-  my($self, $c, $haveh) = @_;
-
-  my $h = $haveh || $c->req->param('h') || '';
-  my $f = $c->req->param('f');
-
-  my $m = $c->stash->{Project};
-  my $pd = $m->path;
-
-  # Either use the provided h(ash) parameter, the f(ile) parameter or just use HEAD.
-  my $hash = ($h =~ /[^a-f0-9]/ ? $m->head_hash($h) : $h)
-          || ($f && $m->hash_by_path($f))
-          || $m->head_hash
-          # XXX This could definitely use more context.
-          || Carp::croak("Couldn't find a hash for the commit object!");
-
-  my $obj = $m->get_object($hash)
-    or Carp::croak("Couldn't find a object for '$hash' in '$pd'!");
-
-  return $obj;
-}
-
-=head2 index
-
-Provides the project listing.
-
-=cut
-
-sub index :Path :Args(0) {
-  my ( $self, $c ) = @_;
-
-  $c->detach($c->req->param('a'))
-    if $c->req->param('a');
-
-  my @list = @{ $c->model()->projects };
-  die 'No projects found in '. $c->model->repo_dir
-    unless @list;
-
-  my $search = $c->req->param('s') || '';
-  if($search) {
-    @list = grep {
-         index($_->name, $search) > -1
-      or ( $_->description !~ /^Unnamed repository/ and index($_->description, $search) > -1 )
-    } @list
-  }
-
-  $c->stash(
-    search_text => $search,
-    projects    => \@list,
-    action      => 'index',
-  );
-}
-
-sub project_index : Local {
-  my ( $self, $c ) = @_;
-
-  my @list = @{ $c->model()->projects };
-  die 'No projects found in '. $c->model->repo_dir
-    unless @list;
-
-  $c->response->content_type('text/plain');
-  $c->response->body(
-    join "\n", map $_->name, @list
-  );
-  $c->response->status(200);
-}
-
-=head2 summary
-
-A summary of what's happening in the repo.
-
-=cut
-
-sub summary : Local {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  $c->detach('error_404') unless $project;
-  my $commit = $self->_get_object($c);
-  my @heads  = @{$project->heads};
-  my $maxitems = Gitalist->config->{paging}{summary} || 10;
-  $c->stash(
-    commit    => $commit,
-    log_lines => [$project->list_revs(
-        sha1 => $commit->sha1,
-        count => $maxitems,
-    )],
-    refs      => $project->references,
-    heads     => [ @heads[0 .. ($#heads < $maxitems ? $#heads : $maxitems)] ],
-    action    => 'summary',
-  );
-}
-
-=head2 heads
-
-The current list of heads (aka branches) in the repo.
-
-=cut
-
-sub heads : Local {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  $c->stash(
-    commit => $self->_get_object($c),
-    heads  => $project->heads,
-    action => 'heads',
-  );
-}
-
-=head2 tags
-
-The current list of tags in the repo.
-
-=cut
-
-sub tags : Local {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  $c->stash(
-    commit => $self->_get_object($c),
-    tags   => $project->tags,
-    action => 'tags',
-  );
-}
-
-sub blame : Local {
-  my($self, $c) = @_;
-
-  my $project = $c->stash->{Project};
-  my $h  = $c->req->param('h')
-       || $project->hash_by_path($c->req->param('hb'), $c->req->param('f'))
-       || die "No file or sha1 provided.";
-  my $hb = $c->req->param('hb')
-       || $project->head_hash
-       || die "Couldn't discern the corresponding head.";
-  my $filename = $c->req->param('f') || '';
-
-  my $blame = $project->get_object($hb)->blame($filename);
-  $c->stash(
-    blame    => $blame,
-    head     => $project->get_object($hb),
-    filename => $filename,
-
-    # XXX Hack hack hack, see View::SyntaxHighlight
-    language => ($filename =~ /\.p[lm]$/i ? 'Perl' : ''),
-    blob     => join("\n", map $_->{line}, @$blame),
-  );
-
-  $c->forward('View::SyntaxHighlight')
-    unless $c->stash->{no_wrapper};
-}
-
-sub _blob_objs {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  my $h  = $c->req->param('h')
-       || $project->hash_by_path($c->req->param('hb'), $c->req->param('f'))
-       || die "No file or sha1 provided.";
-  my $hb = $c->req->param('hb')
-       || $project->head_hash
-       || die "Couldn't discern the corresponding head.";
-
-  my $filename = $c->req->param('f') || '';
-
-  my $blob = $project->get_object($h);
-  $blob = $project->get_object(
-    $project->hash_by_path($h || $hb, $filename)
-  ) if $blob->type ne 'blob';
-
-  return $blob, $project->get_object($hb), $filename;
-}
-
-=head2 blob
-
-The blob action i.e the contents of a file.
-
-=cut
-
-sub blob : Local {
-  my ( $self, $c ) = @_;
-
-  my($blob, $head, $filename) = $self->_blob_objs($c);
-  $c->stash(
-    blob     => $blob->content,
-    head     => $head,
-    filename => $filename,
-    # XXX Hack hack hack, see View::SyntaxHighlight
-    language => ($filename =~ /\.p[lm]$/i ? 'Perl' : ''),
-    action   => 'blob',
-  );
-
-  $c->forward('View::SyntaxHighlight')
-    unless $c->stash->{no_wrapper};
-}
-
-=head2 blob_plain
-
-The plain text version of blob, where file is rendered as is.
-
-=cut
-
-sub blob_plain : Local {
-  my($self, $c) = @_;
-
-  my($blob) = $self->_blob_objs($c);
-  $c->response->content_type('text/plain; charset=utf-8');
-  $c->response->body($blob->content);
-  $c->response->status(200);
-}
-
-=head2 blobdiff_plain
-
-The plain text version of blobdiff.
-
-=cut
-
-sub blobdiff_plain : Local {
-  my($self, $c) = @_;
-
-  $c->stash(no_wrapper => 1);
-  $c->response->content_type('text/plain; charset=utf-8');
-
-  $c->forward('blobdiff');
-}
-
-=head2 blobdiff
-
-Exposes a given diff of a blob.
-
-=cut
-
-sub blobdiff : Local {
-  my ( $self, $c ) = @_;
-  my $commit = $self->_get_object($c, $c->req->param('hb'));
-  my $filename = $c->req->param('f')
-              || croak("No file specified!");
-  my($tree, $patch) = $c->stash->{Project}->diff(
-    commit => $commit,
-    patch  => 1,
-    parent => $c->req->param('hpb') || undef,
-    file   => $filename,
-  );
-  $c->stash(
-    commit    => $commit,
-    diff      => $patch,
-    filename  => $filename,
-    # XXX Hack hack hack, see View::SyntaxHighlight
-    blobs     => [$patch->[0]->{diff}],
-    language  => 'Diff',
-    action    => 'blobdiff',
-  );
-
-  $c->forward('View::SyntaxHighlight')
-    unless $c->stash->{no_wrapper};
-}
-
-=head2 commit
-
-Exposes a given commit.
-
-=cut
-
-sub commit : Local {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  my $commit = $self->_get_object($c);
-  $c->stash(
-      commit      => $commit,
-      diff_tree   => ($project->diff(commit => $commit))[0],
-      refs      => $project->references,
-      action      => 'commit',
-  );
-}
-
-=head2 commitdiff
-
-Exposes a given diff of a commit.
-
-=cut
-
-sub commitdiff : Local {
-  my ( $self, $c ) = @_;
-  my $commit = $self->_get_object($c);
-  my($tree, $patch) = $c->stash->{Project}->diff(
-      commit => $commit,
-      parent => $c->req->param('hp') || undef,
-      patch  => 1,
-  );
-  $c->stash(
-    commit    => $commit,
-    diff_tree => $tree,
-    diff      => $patch,
-    # XXX Hack hack hack, see View::SyntaxHighlight
-    blobs     => [map $_->{diff}, @$patch],
-    language  => 'Diff',
-    action    => 'commitdiff',
-  );
-
-  $c->forward('View::SyntaxHighlight')
-    unless $c->stash->{no_wrapper};
-}
+use Digest::MD5 qw(md5_hex);
+use Gitalist::Utils qw/ age_string /;
 
-sub commitdiff_plain : Local {
-  my($self, $c) = @_;
-
-  $c->stash(no_wrapper => 1);
-  $c->response->content_type('text/plain; charset=utf-8');
-
-  $c->forward('commitdiff');
-}
-
-=head2 shortlog
-
-Expose an abbreviated log of a given sha1.
-
-=cut
-
-sub shortlog : Local {
-  my ( $self, $c ) = @_;
-
-  my $project  = $c->stash->{Project};
-  my $commit   = $self->_get_object($c, $c->req->param('hb'));
-  my $filename = $c->req->param('f') || '';
-
-  my %logargs = (
-      sha1   => $commit->sha1,
-      count  => Gitalist->config->{paging}{log} || 25,
-      ($filename ? (file => $filename) : ())
-  );
-
-  my $page = $c->req->param('pg') || 0;
-  $logargs{skip} = $c->req->param('pg') * $logargs{count}
-    if $c->req->param('pg');
-
-  $c->stash(
-      commit    => $commit,
-      log_lines => [$project->list_revs(%logargs)],
-      refs      => $project->references,
-      page      => $page,
-      filename  => $filename,
-      action    => 'shortlog',
-  );
-}
+use namespace::autoclean;
 
-=head2 log
+BEGIN { extends 'Gitalist::Controller' }
 
-Calls shortlog internally. Perhaps that should be reversed ...
+__PACKAGE__->config(namespace => '');
 
-=cut
-sub log : Local {
-    $_[0]->shortlog($_[1]);
-    $_[1]->stash->{action} = 'log';
-}
+sub root : Chained('/') PathPart('') CaptureArgs(0) {}
 
-# For legacy support.
-sub history : Local {
+sub index : Chained('base') PathPart('') Args(0) {
     my ( $self, $c ) = @_;
-    $self->shortlog($c);
-    my $project = $c->stash->{Project};
-    my $file = $project->get_object(
-        $project->hash_by_path(
-            $project->head_hash,
-            $c->stash->{filename}
-        )
-    );
-     $c->stash( action => 'history',
-               filetype => $file->type,
-           );
+    $c->stash( search_text => $c->req->param('s') || '' ) # FIXME - XSS?
 }
 
-=head2 tree
-
-The tree of a given commit.
-
-=cut
-
-sub tree : Local {
-  my ( $self, $c ) = @_;
-  my $project = $c->stash->{Project};
-  my $commit  = $self->_get_object($c, $c->req->param('hb'));
-  my $filename = $c->req->param('f') || '';
-  my $tree    = $filename
-    ? $project->get_object($project->hash_by_path($commit->sha1, $filename))
-    : $project->get_object($commit->tree_sha1)
-  ;
-  $c->stash(
-      commit    => $commit,
-      tree      => $tree,
-      tree_list => [$project->list_tree($tree->sha1)],
-      path      => $c->req->param('f') || '',
-      action    => 'tree',
-  );
-}
-
-=head2 reflog
-
-Expose the local reflog. This may go away.
-
-=cut
-
-sub reflog : Local {
-  my ( $self, $c ) = @_;
-  my @log = $c->stash->{Project}->reflog(
-      '--since=yesterday'
-  );
-
-  $c->stash(
-      log    => \@log,
-      action => 'reflog',
-  );
-}
-
-=head2 search
-
-The action for the search form.
-
-=cut
-
-sub search : Local {
-  my($self, $c) = @_;
-  $c->stash(current_action => 'GitRepos');
-  my $project = $c->stash->{Project};
-  my $commit  = $self->_get_object($c);
-  # Lifted from /shortlog.
-  my %logargs = (
-    sha1   => $commit->sha1,
-    count  => Gitalist->config->{paging}{log},
-    ($c->req->param('f') ? (file => $c->req->param('f')) : ()),
-    search => {
-      type   => $c->req->param('type'),
-      text   => $c->req->param('text'),
-      regexp => $c->req->param('regexp') || 0,
-    },
-  );
-
-  $c->stash(
-      commit  => $commit,
-      results => [$project->list_revs(%logargs)],
-      action  => 'search',
-	  # This could be added - page      => $page,
-  );
-}
-
-=head2 search_help
-
-Provides some help for the search form.
-
-=cut
-
-sub search_help : Local {
-    my ($self, $c) = @_;
-    $c->stash(template => 'search_help.tt2');
-}
-
-=head2 atom
-
-Provides an atom feed for a given project.
-
-=cut
-
-sub atom : Local {
-  my($self, $c) = @_;
-
-  my $feed = XML::Atom::Feed->new;
-
-  my $host = lc Sys::Hostname::hostname();
-  $feed->title($host . ' - ' . Gitalist->config->{name});
-  $feed->updated(~~DateTime->now);
-
-  my $project = $c->stash->{Project};
-  my %logargs = (
-      sha1   => $project->head_hash,
-      count  => Gitalist->config->{paging}{log} || 25,
-      ($c->req->param('f') ? (file => $c->req->param('f')) : ())
-  );
-
-  my $mk_title = $c->stash->{short_cmt};
-  for my $commit ($project->list_revs(%logargs)) {
-    my $entry = XML::Atom::Entry->new;
-    $entry->title( $mk_title->($commit->comment) );
-    $entry->id($c->uri_for('commit', {h=>$commit->sha1}));
-    # XXX Needs work ...
-    $entry->content($commit->comment);
-    $feed->add_entry($entry);
-  }
-
-  $c->response->body($feed->as_xml);
-  $c->response->content_type('application/atom+xml');
-  $c->response->status(200);
-}
-
-=head2 rss
-
-Provides an RSS feed for a given project.
-
-=cut
-
-sub rss : Local {
-  my ($self, $c) = @_;
-
-  my $project = $c->stash->{Project};
-
-  my $rss = XML::RSS->new(version => '2.0');
-  $rss->channel(
-    title          => lc(Sys::Hostname::hostname()) . ' - ' . Gitalist->config->{name},
-    link           => $c->uri_for('summary', {p=>$project->name}),
-    language       => 'en',
-    description    => $project->description,
-    pubDate        => DateTime->now,
-    lastBuildDate  => DateTime->now,
-  );
-
-  my %logargs = (
-      sha1   => $project->head_hash,
-      count  => Gitalist->config->{paging}{log} || 25,
-      ($c->req->param('f') ? (file => $c->req->param('f')) : ())
-  );
-  my $mk_title = $c->stash->{short_cmt};
-  for my $commit ($project->list_revs(%logargs)) {
-    # XXX Needs work ....
-    $rss->add_item(
-        title       => $mk_title->($commit->comment),
-        permaLink   => $c->uri_for(commit => {h=>$commit->sha1}),
-        description => $commit->comment,
-    );
-  }
-
-  $c->response->body($rss->as_string);
-  $c->response->content_type('application/rss+xml');
-  $c->response->status(200);
-}
-
-sub opml : Local {
-  my($self, $c) = @_;
-
-  my $opml = XML::OPML::SimpleGen->new();
-
-  $opml->head(title => lc(Sys::Hostname::hostname()) . ' - ' . Gitalist->config->{name});
-
-  my @list = @{ $c->model()->projects };
-  die 'No projects found in '. $c->model->repo_dir
-    unless @list;
-
-  for my $proj ( @list ) {
-    $opml->insert_outline(
-      text   => $proj->name. ' - '. $proj->description,
-      xmlUrl => $c->uri_for(rss => {p => $proj->name}),
-    );
-  }
-
-  $c->response->body($opml->as_string);
-  $c->response->content_type('application/rss');
-  $c->response->status(200);
-}
-
-=head2 patch
-
-A raw patch for a given commit.
-
-=cut
-
-sub patch : Local {
-    my ($self, $c) = @_;
-    $c->detach('patches', [1]);
-}
-
-=head2 patches
-
-The patcheset for a given commit ???
-
-=cut
-
-sub patches : Local {
-    my ($self, $c, $count) = @_;
-    $count ||= Gitalist->config->{patches}{max};
-    my $commit = $self->_get_object($c);
-    my $parent = $c->req->param('hp') || undef;
-    my $patch = $commit->get_patch( $parent, $count );
-    $c->response->body($patch);
-    $c->response->content_type('text/plain');
-    $c->response->status(200);
-}
-
-=head2 snapshot
-
-Provides a snapshot of a given commit.
-
-=cut
+# XXX Fragile much?
+sub css : Chained('/root') PathPart('core.css') Args(0) {
+    my ( $self, $c ) = @_;
 
-sub snapshot : Local {
-    my ($self, $c) = @_;
-    my $format = $c->req->param('sf') || 'tgz';
-    die unless $format;
-    my $sha1 = $c->req->param('h') || $self->_get_object($c)->sha1;
-    my @snap = $c->stash->{Project}->snapshot(
-        sha1 => $sha1,
-        format => $format
-    );
-    $c->response->status(200);
-    $c->response->headers->header( 'Content-Disposition' =>
-                                       "attachment; filename=$snap[0]");
-    $c->response->body($snap[1]);
+    $c->stash( template => 'static/css/core.css', content_type => 'text/css' );
 }
 
-=head2 auto
-
-Populate the header and footer. Perhaps not the best location.
-
-=cut
-
-sub auto : Private {
+sub base : Chained('/root') PathPart('') CaptureArgs(0) {
   my($self, $c) = @_;
 
-  my $project = $c->req->param('p');
-  if (defined $project) {
-    eval {
-      $c->stash(Project => $c->model('GitRepos')->project($project));
-    };
-    if ($@) {
-      $c->detach('/error_404');
-    }
-  }
-
-  my $a_project = $c->stash->{Project} || $c->model()->projects->[0];
+  my $git_version = `git --version`;
+  chomp($git_version);
   $c->stash(
-    git_version => $a_project->run_cmd('--version'),
+    git_version => $git_version,
     version     => $Gitalist::VERSION,
 
-    # XXX Move these to a plugin!
     time_since => sub {
       return 'never' unless $_[0];
       return age_string(time - $_[0]->epoch);
@@ -660,72 +41,59 @@ sub auto : Private {
     short_cmt => sub {
       my $cmt = shift;
       my($line) = split /\n/, $cmt;
-      $line =~ s/^(.{70,80}\b).*/$1 \x{2026}/;
+      $line =~ s/^(.{70,80}\b).*/$1 \x{2026}/ if defined $line;
       return $line;
     },
     abridged_description => sub {
         join(' ', grep { defined } (split / /, shift)[0..10]);
     },
+    uri_for_gravatar => sub {
+        my $email = shift;
+        my $size = shift;
+        my $uri = 'http://www.gravatar.com/avatar/' . md5_hex($email);
+        $uri .= "?s=$size" if $size;
+        return $uri;
+    },
   );
 }
 
-=head2 end
+sub search : Chained('base') Args(0) {}
 
-Attempt to render a view, if needed.
+=head2 search_help
+
+Provides some help for the search form.
 
 =cut
 
-sub end : ActionClass('RenderView') {
+sub search_help : Chained('base') Args(0) {}
+
+sub end : ActionClass('Serialize') {
     my ($self, $c) = @_;
-    # Give project views the current HEAD.
-    if ($c->stash->{Project}) {
-        $c->stash->{HEAD} = $c->stash->{Project}->head_hash;
+    # Give repository views the current HEAD.
+    if ($c->stash->{Repository}) {
+        $c->stash->{HEAD} = $c->stash->{Repository}->head_hash;
+    }
+    if ($c->stash->{data} && blessed $c->stash->{data}) {
+        $c->stash->{rest} = $c->stash->{data}->pack;
     }
 }
 
-sub error_404 :Private {
+sub error_404 : Action {
     my ($self, $c) = @_;
     $c->response->status(404);
     $c->response->body('Page not found');
 }
 
-sub age_string {
-  my $age = shift;
-  my $age_str;
-
-  if ( $age > 60 * 60 * 24 * 365 * 2 ) {
-    $age_str  = ( int $age / 60 / 60 / 24 / 365 );
-    $age_str .= " years ago";
-  }
-  elsif ( $age > 60 * 60 * 24 * ( 365 / 12 ) * 2 ) {
-    $age_str  = int $age / 60 / 60 / 24 / ( 365 / 12 );
-    $age_str .= " months ago";
-  }
-  elsif ( $age > 60 * 60 * 24 * 7 * 2 ) {
-    $age_str  = int $age / 60 / 60 / 24 / 7;
-    $age_str .= " weeks ago";
-  }
-  elsif ( $age > 60 * 60 * 24 * 2 ) {
-    $age_str  = int $age / 60 / 60 / 24;
-    $age_str .= " days ago";
-  }
-  elsif ( $age > 60 * 60 * 2 ) {
-    $age_str  = int $age / 60 / 60;
-    $age_str .= " hours ago";
-  }
-  elsif ( $age > 60 * 2 ) {
-    $age_str  = int $age / 60;
-    $age_str .= " min ago";
-  }
-  elsif ( $age > 2 ) {
-    $age_str  = int $age;
-    $age_str .= " sec ago";
-  }
-  else {
-    $age_str .= " right now";
-  }
-  return $age_str;
-}
+__PACKAGE__->config(
+    default => 'text/html',
+    map => {
+        'application/json' => [qw/ JSON /],
+        map { $_ => [qw/ View Default /] }
+             qw( text/css text/html text/plain
+                 application/atom+xml application/rss+xml application/rss )
+    },
+    content_type_stash_key => 'content_type',
+);
 
 __PACKAGE__->meta->make_immutable;
 
@@ -741,19 +109,23 @@ This controller handles all of the root level paths for the application
 
 =head1 METHODS
 
-=head2 age_string
+=head2 root
 
-=head2 blame
+Root of chained actions
 
-=head2 commitdiff_plain
+=head2 base
 
-=head2 error_404
+Populate the header and footer. Perhaps not the best location.
+
+=head2 index
 
-=head2 history
+Provides the repository listing.
 
-=head2 opml
+=head2 end
+
+Attempt to render a view, if needed.
 
-=head2 project_index
+=head2 error_404
 
 =head1 AUTHORS