X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9036bc9c1e2d4b70ce35d791f24bf1b930e7ab3d..29b407ddf91b653e6e8380f73e221628a392376f:/common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 41e0e28..31c2c22 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -1,6 +1,6 @@
 <:
+use 5.014;
 use utf8;
-use strict;
 use warnings;
 no  warnings 'qw';  # you know what you doing
 no  warnings 'uninitialized';  # save some useless checks for more legible code
@@ -8,7 +8,33 @@ use open ':std' => ':utf8';
 
 use File::stat 'stat';
 use HTTP::Date;
-use Shiar_Sheet::KeySigns qw(%sign);  # dependant on $get{ascii}
+use Encode qw( decode_utf8 );
+
+sub Alert {
+	my ($html, $debug) = @_;
+	ref $html eq 'ARRAY' or $html = [$html];
+	my ($title, @lines) = @{$html};
+	$body = "<h2>$title</h2>";
+	$body .= "\n<p>$_</p>" for @lines;
+	$body .= "\n<pre>$debug</pre>" if $Dev and $debug;
+	say "<div class=error>$body</div>\n";
+}
+
+$PLP::ERROR = sub {
+	my ($text, $html) = @_;
+	Alert("<strong>Fatal error</strong>: $html.");
+	warn $text;
+};
+
+BEGIN {
+	require Time::HiRes;
+	our $Time = [Time::HiRes::gettimeofday];
+}
+
+# user request
+our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
+our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
 
 our $style;
 our $showkeys = !exists $get{keys} ? undef :
@@ -17,29 +43,34 @@ our $showkeys = !exists $get{keys} ? undef :
 $header{content_type} = 'text/html; charset=utf-8';
 
 sub stylesheet {
-	my %styles = map {$_ => $_} @_;
-
-	if (exists $get{style}) {
-		$style = $styles{ $get{style} };
-		require CGI::Cookie;
-		AddCookie(CGI::Cookie->new(
-			-name    => 'style',
-			-value   => $style,
-			-path    => '/',  # site-wide; current page is confusing to most users
-			-expires => $style ? '+5y' : '-1d',
-		)->as_string);
+	my ($avail) = @_;
+	my @avail = ref $avail eq 'ARRAY' ? @{$avail} : $avail or return;
+	my %styles = map {$_ => $_} @avail;
+
+	if (defined( my $setstyle = $get{style} )) {
+		$style = $styles{ $setstyle };
+		eval {
+			require CGI::Cookie;
+			my $cookie = CGI::Cookie->new(
+				-name    => 'style',
+				-value   => $setstyle || '',
+				-path    => '/',  # site-wide; current page is confusing to most users
+				-expires => $setstyle ? '+5y' : '-1d',
+			) or die "empty object returned\n";
+			AddCookie($cookie->as_string);
+		} or warn "Unable to create style cookie: $@";
 	}
 
-	$style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
+	$style ||= exists $cookie{style} && $styles{ $cookie{style} } || $avail[0];
 
-	return join "\n", map { sprintf(
+	return map { sprintf(
 		'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-		$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css", $_
-	) } @_;
+		$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+	) } @avail;
 }
 
 sub checkmodified {
-	my $lastmod;
+	my $lastmod = 0;
 	for (@_) {
 		my $mod = stat $_ or next;
 		$mod = $mod->mtime or next;
@@ -64,11 +95,16 @@ sub Html {
 		(grep { /\bShiar_/ } values %INC),
 		$meta->{data} ? @{ $meta->{data} } : (),
 	);
+	$header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
 
 	# default fallbacks
 	$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
 	$meta->{charset} ||= 'utf-8';
 
+	# convert options to arrays
+	ref $_ eq 'ARRAY' or $_ = [$_]
+		for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
+
 	# optional amends
 	push @{ $meta->{raw} }, (
 		'<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
@@ -76,52 +112,57 @@ sub Html {
 		!$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
 			: $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
 			: (),
-		'<script type="text/javascript" src="/keys.js"></script>',
+		'<script type="text/javascript" src="/keys.js?1.6"></script>',
 	) if $meta->{keys};
 
-	# flatten arrays
-	ref $_ eq 'ARRAY' and $_ = join ' ',  @$_ for $meta->{description};
-	ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
-	ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{rawstyle}, $meta->{raw};
-	ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
-
-	# other vars
-	my $sep = $meta->{charset} eq 'utf-8' ? '•' : ' -- ';
-	my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
-
 	# leading output
 	$header{content_type} = "text/html; charset=$meta->{charset}";
-	print <<"EOT";
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-
-<head>
-<meta http-equiv="content-type" content="$header{content_type}">
-<title>$meta->{title}</title>
-<meta name="description" content="$meta->{description}">
-<meta name="keywords" content="$meta->{keywords}">
-<link rel="icon" type="image/png" href="/clip.png">
-EOT
-	print $_, "\n" for $meta->{stylesheet} || ();
-	print $_, "\n" for $meta->{raw} || ();
-	print qq{</head>\n\n<body id="$file">\n};
+	say '<!DOCTYPE html>';
+	say '<html lang="en">';
+	say '';
+	say '<head>';
+	say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
+	say sprintf '<title>%s</title>', $meta->{title};
+	say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
+		for join(' ', @{ $meta->{description} }) || ();
+	say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
+		for join(', ', @{ $meta->{keywords} }) || ();
+	say '<meta name="viewport" content="width=device-width, initial-scale=1">';
+	say '<link rel="icon" type="image/png" href="/clip.png">';
+	say for stylesheet($meta->{stylesheet});
+	say for map { @{$_} } $meta->{raw} || ();
+	say '<meta name="robots" content="noindex">' if $Dev;
+	say '</head>';
+	say '';
+	say sprintf '<body id="%s">', $file;
+
+	# development version indicator
+	printf '<p style="%s">beta</p>', join('; ',
+		'position: fixed',
+		'right: 1em',
+		'opacity: .5',
+		'border: 1ex solid red',
+		'border-width: 1ex 0',
+		'z-index: 1',
+		'background: inherit',
+	) if $Dev;
 
 	# prepare trailing output
 	PLP_END {
 		print <<"EOT";
 <p class="footer">
 	<a href="/" rel="start">sheet.shiar.nl</a>/$file.<a href="/source/$file.plp"
-	 rel="code" title="Written in Perl">plp</a>
-	<a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
+	 rel="source" title="Written in Perl">plp</a>
+	version <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
 	 rel="vcs-git" title="Git repository">$meta->{version}</a>
-	created by <a href="http://shiar.nl/" rel="author">Shiar</a> $sep
-	<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="copyright"
+	created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
+	<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="license copyright"
 	 title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
-</p>
-
-</html>
 EOT
+		say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
+		say '</p>';
+		say '';
+		say '</html>';
 	};
 }