Move display mangling to templates, add read API

[gruntmaster-page.git] / lib / Gruntmaster / Page / Generic.pm

diff --git a/lib/Gruntmaster/Page/Generic.pm b/lib/Gruntmaster/Page/Generic.pm
index 9e097c052737e053f6a980a5972e7d3cc9e41d31..95d1cd8cac6f791d0a73a49ea9f507a6850bcd9c 100644 (file)
--- a/lib/Gruntmaster/Page/Generic.pm
+++ b/lib/Gruntmaster/Page/Generic.pm
@@ -30,49 +30,48 @@ sub makepkg {
        1
 }
 
-sub make_generate {
-       my %thing = @_;
-       sub {
-               my ($self, $htc, $lang, $env, $ct) = @_;
-               undef $ct unless $thing{contest};
-               debug $env => "Contest is $ct";
-               local $Gruntmaster::Data::contest = $ct if $ct;
-               my @thing = hgetall $thing{hash};
-               @thing = map  { $thing{mangle}->(); $_ } @thing if exists $thing{mangle};
-               @thing = grep { $thing{choose}->() } @thing if exists $thing{choose};
-               @thing = sort { $thing{sortby}->() } @thing if exists $thing{sortby};
-               my %params;
-               $thing{group} //= sub { $thing{id} };
-               for (@thing) {
-                       my $group = $thing{group}->();
-                       $params{$group} //= [];
-                       push $params{$group}, $_
-               }
-               $htc->param(%params);
+sub list {
+       my ($thing, $lang, $env, $ct) = @_;
+       my %thing = %$thing;
+       undef $ct unless $thing{contest};
+       debug $env => "Contest is $ct";
+       local $Gruntmaster::Data::contest = $ct if $ct;
+       my @thing = hgetall $thing{hash};
+       @thing = map  { $thing{mangle}->(); $_ } @thing if exists $thing{mangle};
+       @thing = grep { $thing{choose}->() } @thing if exists $thing{choose};
+       @thing = sort { $thing{sortby}->() } @thing if exists $thing{sortby};
+       my %params;
+       $thing{group} //= sub { $thing{id} };
+       for (@thing) {
+               my $group = $thing{group}->();
+               $params{$group} //= [];
+               push $params{$group}, $_
        }
+       wantarray ? %params : \%params
 }
 
-sub make_entry_generate{
-       my %thing = @_;
-       sub {
-               my ($self, $htc, $lang, $env, $id, $ct) = @_;
-               ($id, $ct) = ($ct, $id) if $thing{contest};
-               local $Gruntmaster::Data::contest = $ct if $ct;
-               debug $env => "Hash is $thing{hash} and id is $id";
-               my %params = HGETALL "$thing{hash}.$id";
-               $thing{mangle}->(local $_ = \%params) if exists $thing{mangle};
-               %params = (%params, $thing{hook}->(local $_ = \%params)) if exists $thing{hook};
-               $htc->param(%params);
-       }
+sub entry {
+       my ($thing, $lang, $env, $id, $ct) = @_;
+       my %thing = %$thing;
+       ($id, $ct) = ($ct, $id) if $thing{contest};
+       local $Gruntmaster::Data::contest = $ct if $ct;
+       debug $env => "Hash is $thing{hash} and id is $id";
+       my %params = HGETALL "$thing{hash}.$id";
+       $thing{mangle}->(local $_ = \%params) if exists $thing{mangle};
+       wantarray ? %params : \%params
 }
 
+sub headers ($) { ['Content-Type' => 'application/json', 'Cache-Control' => 'max-age=' . $_[0]->max_age] }
+
 sub create_thing {
        my %thing = @_;
        my $ucid = ucfirst $thing{id};
        my $pkg = "Gruntmaster::Page::$ucid";
 
-       putsym "${pkg}::_generate", make_generate %thing if makepkg $pkg, @thing{qw/id title/};
-       putsym "${pkg}::Entry::_generate", make_entry_generate %thing if makepkg "${pkg}::Entry", "$thing{id}_entry", '<tmpl_var name>';
+       putsym "${pkg}::_generate", sub { $_[1]->param(list \%thing, @_[2..$#_]) } if makepkg $pkg, @thing{qw/id title/};
+       putsym "${pkg}::Entry::_generate",  sub { $_[1]->param(entry \%thing, @_[2..$#_]) } if makepkg "${pkg}::Entry", "$thing{id}_entry", '<tmpl_var name>';
+       putsym "${pkg}::Read::generate", sub { [200, headers shift, [encode_json list \%thing, @_]] } if makepkg "${pkg}::Read";
+       putsym "${pkg}::Entry::Read::generate", sub { [200, headers shift, [encode_json entry \%thing, @_]] } if makepkg "${pkg}::Entry::Read";
 }
 
 sub params;
@@ -81,7 +80,6 @@ sub choose (&);
 sub sortby (&);
 sub group  (&);
 sub mangle (&);
-sub hook   (&);
 
 sub thing (&){
        my %thing;
@@ -92,7 +90,6 @@ sub thing (&){
        local *{"mangle"} = sub { $thing{mangle} = shift };
        local *{"group"} = sub { $thing{group} = shift };
        local *{"contest"} = sub { $thing{contest} = 1 };
-       local *{"hook"} = sub { $thing{hook} = shift };
        use strict 'refs';
 
        shift->();
@@ -116,22 +113,15 @@ thing {
 
 thing {
        params qw/ct contest Contests/;
-       mangle {
-               $_->{start} = strftime '%c', localtime $_->{start};
-               $_->{end} = strftime '%c', localtime $_->{end};
-       };
        sortby { $a->{start} <=> $b->{start} };
        group { time < $_->{start} ? 'pending' : time > $_->{end} ? 'finished' : 'running' };
-       hook { started => time >= $_->{start} };
+       mangle { $_->{started} = time >= $_->{start} };
 };
 
 thing {
        params qw/log job/, 'Job log';
        contest;
-       mangle {
-               $_->{results} &&= decode_json $_->{results};
-               $_->{time} = sprintf "%.4fs", $_->{time} for values ($_->{results} // [])
-       }
+       mangle { $_->{results} &&= decode_json $_->{results}; }
 };
 
 1