|| $c->model('Git')->head_hash
|| die "Couldn't discern the corresponding head.";
+ my $filename = $c->req->param('f') || '';
+
$c->stash(
blob => $c->model('Git')->get_object($h)->content,
head => $c->model('Git')->get_object($hb),
- filename => $c->req->param('f') || '',
+ filename => $filename,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ language => ($filename =~ /\.p[lm]$/ ? 'Perl' : ''),
action => 'blob',
);
my ( $self, $c ) = @_;
my $commit = $self->_get_commit($c);
+ my @difflist = $c->model('Git')->diff($commit->parent_sha1, $commit->sha1);
$c->stash(
- commit => $commit,
- diff_tree => [$c->model('Git')->diff_tree($commit)],
- diff => [$c->model('Git')->diff($commit->parent_sha1, $commit->sha1)],
- action => 'commitdiff',
+ commit => $commit,
+ diff_tree => [$c->model('Git')->diff_tree($commit)],
+ diff => \@difflist,
+ # XXX Hack hack hack, see View::SyntaxHighlight
+ blobs => [map $_->{diff}, @difflist],
+ language => 'Diff',
+ action => 'commitdiff',
);
+
+ $c->forward('View::SyntaxHighlight');
}
=head2 shortlog
use HTML::Entities qw(encode_entities);
+=begin
+
+B<Notes>
+
+What should be done, but isn't currently:
+
+ broquaint> Another Cat question - if I want to have arbitrary things highlighted is pushing things through a View at all costs terribly wrong?
+ broquaint> e.g modifying this slightly to highlight anything (or arrays of anything) http://github.com/broquaint/Gitalist/blob/a7cc1ede5f9729465bb53da9c3a8b300a3aa8a0a/lib/Gitalist/View/SyntaxHighlight.pm
+ t0m> no, that's totally fine.. I'd tend to push the rendering logic into a model, so you end up doing something like: $c->model('SyntaxDriver')->highlight_all($stuff, $c->view('SyntaxHighlight'));
+ broquaint> I'm thinking it's a bad idea because the Controller needs to munge data such that the View knows what to do
+ broquaint> You just blew my mind ;)
+ t0m> ^^ That works _much_ better if you split up your view methods into process & render..
+ t0m> ala TT..
+ t0m> i.e. I'd have 'highlight this scalar' as the ->render method in the view..
+ t0m> And then the 'default' thing (i.e. process method) will do that and shove the output in the body..
+ t0m> but then you can write foreach my $thing (@things) { push(@highlighted_things, $c->view('SyntaxHighlight')->render($thing)); }
+ t0m> and then I'd move that ^^ loop down into a model which actually knows about / abstracts walking the data structures concerned..
+ t0m> But splitting render and process is the most important bit.. :) Otherwise you need to jump through hoops to render things that don't fit 'nicely' into the bits of stash / body that the view uses by 'default'
+ t0m> I wouldn't kill you for putting the structure walking code in the view given you're walking simple arrays / hashes.. It becomes more important if you have a more complex visitor..
+ t0m> (I use Visitor in the design patterns sense)
+ t0m> As the visitor is responsible for walking the structure, delegating to the ->render call in the view which is responsible for actually mangling the content..
+
+=cut
+
sub process {
my($self, $c) = @_;
+ for($c->stash->{blobs} ? @{$c->stash->{blobs}} : $c->stash->{blob}) {
+ $_ = $self->highlight($c->stash->{language} => $_);
+ }
+
+ $c->forward('View::Default');
+}
+
+sub highlight {
+ my($self, $lang, $blob) = @_;
+
# If we're not going to highlight the blob unsure that it's ready to go
# into HTML at least.
- if($c->stash->{filename} =~ /\.p[lm]$/) {
+ if($lang) {
# via
# http://github.com/jrockway/angerwhale/blob/master/lib/Angerwhale/Format/Pod.pm#L136
- eval {
+ my $ret = eval {
no warnings 'redefine';
local *Syntax::Highlight::Engine::Kate::Template::logwarning
= sub { die @_ }; # i really don't care
my $hl = Syntax::Highlight::Engine::Kate->new(
- language => 'Perl',
+ language => $lang,
substitutions => {
"<" => "<",
">" => ">",
},
);
- $c->stash->{blob} = $hl->highlightText($c->stash->{blob});
+ $hl->highlightText($blob);
};
warn $@ if $@;
+ return $ret || $blob;
} else {
- $c->stash->{blob} = encode_entities($c->stash->{blob});
+ return encode_entities($blob);
}
-
- $c->forward('View::Default');
}
__PACKAGE__->meta->make_immutable;
projects / catagits/Gitalist.git / commitdiff