Restored original functionality within Dancer

environments/development.yml

@@ -25,3 +25,7 @@ show_errors: 1
 # DO NOT EVER USE THIS FEATURE IN PRODUCTION 
 # OR TINY KITTENS SHALL DIE WITH LOTS OF SUFFERING
 auto_reload: 0
+
+# sugar-trail repo root
+repo_root:  /srv/strail/strepo
+repo_vcs:   git

lib/SugarTrail.pm

@@ -3,33 +3,42 @@ use Dancer ':syntax';
 
 use SugarTrail::Repo;
 use helper;
-use URL::Encode qw/ url_decode /;
 
 our $VERSION = '0.1';
 
-my $repo_root = '/srv/strail/strepo';
-my $repo_vcs  = 'git';
+my $r = SugarTrail::Repo->new(
+    root    => config->{repo_root},
+    vcs     => config->{repo_vcs}
+);
 
-my $repo = SugarTrail::Repo->new( root => $repo_root, vcs=> $repo_vcs );
 
+get qr|^/st/([^\?]*)(.*)$| => sub {
 
+    my $p = params();
 
-get qr{(/[^\?]*)} => sub {
+    &helper::dmup (ENV => \%ENV);
+    &helper::dmup (params => scalar params);
+    &helper::dmup (config => config);
 
-    my ($stm) = split '\?', $ENV{REQUEST_URI}, 2;
-    $stm = url_decode($stm);
+    my ($stpath, $query) = splat;
+    my $format = params->{__format} // 'plain';
+    header('Content-Type' => ( 
+            $format eq 'html' ? 'text/html' : 'text/plain'
+    ));
 
-    my $m = $repo->load_stm( stm => $stm . '.stm' );
-    unless ($m) {
-        return template 'not_found';
-    }
+    my $m = $r->load_stm( stm => "/$stpath.stm" )
+        or return template 'not_found';
+    my $s = $m->generate_slave(scalar params);
 
-    my $params = params();
-    my $s = $m->generate_slave($params);
-
-    &helper::dmup(params=>$params);
+    template 'st', {
+        st_headers =>   $s->head(),
+        content =>      $s->body(),
+        warnings =>     $s->warnings()
+    }, { layout => $format };
+};
 
-    return '<pre>' . $s->source . '</pre>';
+get '/' => sub {
+    template 'index';
 };
 
 true;

lib/SugarTrail/Template/Slave.pm

@@ -17,21 +17,21 @@ sub new {
 
 sub source {
     my $self = shift;
-    return sprintf "%s\n\n%s%s", $self->head, $self->warnings, $self->body; 
+    return sprintf "%s\n%s%s", $self->head, $self->warnings, $self->body;
 }
 
 sub head {
     my $self = shift;
     my @head;
-    push @head, sprintf "%s: %s", $_, $self->{meta}->{$_} foreach keys %{$self->{meta}};
-    return join "\n", @head;
+    push @head, sprintf "%s: %s\n", $_, $self->{meta}->{$_} foreach keys %{$self->{meta}};
+    return join "", @head;
 }
 
 sub body {
     my $self = shift;
     my @source;
-    push @source, $_->{line} foreach @{$self->{steps}};
-    return join "\n", @source;
+    push @source, $_->{line} . "\n" foreach @{$self->{steps}};
+    return join "", @source;
 }
 
 sub warnings {

views/layouts/html.tt

@@ -0,0 +1,2 @@
+<p style="color:#0a0">This is a green html but nevermind...</p>
+<pre><% content %></pre>

views/layouts/plain.tt

@@ -0,0 +1 @@
+<% content %>

views/st.tt

@@ -0,0 +1,2 @@
+<% st_headers %>
+<% warnings %><% content %>