Syntax higlighting improvements

[catagits/Gitalist.git] / lib / Gitalist / Model / ContentMangler.pm

diff --git a/lib/Gitalist/Model/ContentMangler.pm b/lib/Gitalist/Model/ContentMangler.pm
index 1f48b57..720e0b3 100644 (file)
--- a/lib/Gitalist/Model/ContentMangler.pm
+++ b/lib/Gitalist/Model/ContentMangler.pm
@@ -1,20 +1,34 @@
 package Gitalist::Model::ContentMangler;
 use Moose;
 use MooseX::Types::Moose qw/HashRef/;
+use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
+use Gitalist::ContentMangler::Resolver;
 use namespace::autoclean;
 
 extends 'Catalyst::Model';
 
-# FIXME - Never cleared!!
-has _languages => (
+has resolver_class => (
+    isa => NonEmptySimpleStr,
+    is => 'ro',
+    required => 1,
+    default => 'Gitalist::ContentMangler::Resolver::Default',
+);
+
+has resolver_config => (
     isa => HashRef,
     is => 'ro',
     default => sub { {} },
-    traits => ['Hash'],
-    handles => {
-        _add_language => 'set',
-        languages => 'keys',
-        css => 'values',
+);
+
+has _resolver => (
+    does => 'Gitalist::ContentMangler::Resolver',
+    handles => ['resolve'],
+    is => 'bare', lazy => 1,
+    default => sub {
+        my $self = shift;
+        my $class = $self->resolver_class;
+        Class::MOP::load_class($class);
+        return $class->new($self->resolver_config);
     },
 );
 
@@ -26,20 +40,24 @@ has _languages => (
 # We need to support multiple languages, and we also want to be able to do HTMLizing (for e.g. Pod)
 
 sub process {
-    my ($self, $c) = @_;
-
-    # XXX Hack hack hack
-    my $language = $c->stash->{language} || '';
-    $language = 'Perl' if $c->stash->{filename} =~ /\.p[lm]$/i;
-    # FIXME - MOAR..
-
-    $self->_add_language($language, $c->uri_for('/static/css/syntax/' . $language . '.css')) if $language;
-    
-    if ($c->stash->{blobs} || $c->stash->{blob}) {
-        for($c->stash->{blobs} ? @{$c->stash->{blobs}} : $c->stash->{blob}) {
-            $_ = $c->view('SyntaxHighlight')->render($c, $_, { language => $language });
-        }
-    }
+  my ($self, $c) = @_;
+
+  # Find appropriate mangler based on filename,action,config
+  # Mangler should provide a transform e.g what part of the stash to mangle
+  # Then call the transform with the appropriate mangling
+
+  my($transformer, $config) = $self->resolve({
+    filename => $c->stash->{filename} || '',
+    blob     => \$c->stash->{blob},
+    config   => Gitalist->config->{'Model::ContentMangler'},
+    action   => $c->action->name,
+  });
+
+  return
+       unless $transformer;
+
+  Class::MOP::load_class($transformer);
+  $transformer->new($config)->transform($c, $config);
 }
 
 __PACKAGE__->meta->make_immutable;