X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/b0060d114740f866161b5871976e41278acacfd2..ac5213bf8d4067b6f3a02e3cdcb90ce729c1e64d:/browser.plp

diff --git a/browser.plp b/browser.plp
index 2de8458..1f5cfc0 100644
--- a/browser.plp
+++ b/browser.plp
@@ -16,42 +16,57 @@ Html({
 :>
 <h1>Browser compatibility</h1>
 
-<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
-<:
-my $canihas = do 'browser-usage.inc.pl'
-	or printf "<p>Browser usage data not found: <em>%s</em>.</p>\n", $! || $@;
-
-print "with $_ browser usage statistics." for map {
-	my $ref = $_->{-source} || 'unknown';
-	$ref = sprintf '<a href="%s">%s</a>', $_, $ref for $_->{-url} || ();
-	$ref .= " $_" for $_->{-date} || ();
-	$ref
-} $canihas || ();
-:>
+<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page<:
+my ($canihas, $usage);
+given ($get{usage} // 'wm') {
+	when (!$_) {
+		# none
+	}
+	when (!/^\w+$/) {
+		printf "<p>Invalid browser usage data request: <em>%s</em>",
+			'identifier must be alphanumeric name or <q>0</q>';
+	}
+	$canihas = do "browser-usage-$_.inc.pl" or do {
+		printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
+		break;
+	};
+	$usage = $_;
+	my $ref = $canihas->{-source} || 'unknown';
+	$ref = sprintf '<a href="%s">%s</a>', $_, $ref for $canihas->{-url} || ();
+	$ref .= " $_" for $canihas->{-date} || ();
+	print "\nwith $ref browser usage statistics";
+}
+:>.
 </p>
 
 <div id="browser">
 <:
 my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
+$_->{verrelease} = {
+	# mark last two (future) versions as unreleased, ensure current isn't
+	map { $_->[-1] => 0, $_->[-2] => 0, $_->[-3] => undef } $_->{versions}
+} for values %{ $caniuse->{agents} };
 
 my %CSTATS = (
-	'n'   => 'l0',
-	'y'   => 'l6',
-	'y x' => 'l5',
-	'a'   => 'l4',
-	'a x' => 'l4',
+	'n'   => 'l1',
+	'y'   => 'l5',
+	'y x' => 'l5 ex',
+	'a'   => 'l3',
+	'a x' => 'l3 ex',
 	'p j' => 'l2',
 	'j'   => 'l2',
 	'p'   => 'l2',
-	'u'   => 'l9',
+	'p p' => 'l2',
+	'u'   => 'l0',
 );
 my %CSTATUS = (
-	unoff => 'l0', # unofficial
-	wd    => 'l4', # draft
-	cr    => 'l5', # candidate
-	pr    => 'l5', # proposed
-	rec   => 'l6', # recommendation
-	ietf  => 'l6', # standard
+	unoff => 'l1', # unofficial
+	wd    => 'l3', # draft
+	cr    => 'l4', # candidate
+	pr    => 'l4', # proposed
+	rec   => 'l5', # recommendation
+	other => 'l5', # non-w3
+	ietf  => 'l5', # standard
 );
 my %versions;
 if (my ($somerow) = values %{ $caniuse->{data} }) {
@@ -66,11 +81,12 @@ $canihas ||= {
 	map {
 		$_ => +{
 			map {
-				($_->[4] =>  0 ), # future
-				($_->[3] =>  .5), # next
-				($_->[0] =>  5 ), # past
-				($_->[1] => 10 ), # previous
-				($_->[2] => 30 ), # current
+				my $zero = $#$_ - 2;  # baseline index
+				($_->[$zero - 2] =>  .5), # past
+				($_->[$zero - 1] => 10 ), # previous
+				($_->[$zero + 2] =>  0 ), # future
+				($_->[$zero + 1] =>  .5), # next
+				($_->[$zero    ] => 30 ), # current
 			} $caniuse->{agents}->{$_}->{versions}
 		}
 	} @browsers
@@ -102,8 +118,12 @@ print '<thead>', $header;
 print "\n<tr>";
 print '<td>' x 3;
 for my $browser (@browsers) {
-	printf('<td title="%.1f%%">%s',
-		$canihas->{$browser}->{$_}, showversions($_),
+	printf('<td title="%.1f%%"%s>%s',
+		$canihas->{$browser}->{$_},
+		(map {
+			defined $_ && !$_ && ' class="ex"'
+		} $caniuse->{agents}->{$browser}->{verrelease}->{$_}),
+		showversions($_),
 	) for @{ $versions{$browser} };
 }
 print '<td>' x 1;
@@ -172,7 +192,7 @@ for my $id (sort {
 	for ($row->{status}) {
 		my $cell = $_ // '-';
 		$cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
-		printf '<td title="%s" class="%s">%s',
+		printf '<td title="%s" class="l %s">%s',
 			$caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
 	}
 	for my $browser (@browsers) {
@@ -233,15 +253,15 @@ sub showversions {
 
 <div class="legend">
 	<table class="glyphs"><tr>
-	<td class="X l6">supported
-	<td class="X l5">prefixed
-	<td class="X l4">partial
+	<td class="X l5">supported
+	<td class="X l3">partial
 	<td class="X l2">external (js/plugin)
-	<td class="X l0">missing
-	<td class="X l9">unknown
+	<td class="X l1">missing
+	<td class="X l0">unknown
+	<td class="X l0 ex">prefixed
 	</table>
 
-	<div>
+	<p><: if ($usage) { :>
 		Usage percentage:
 		<span class="  p0">0</span> -
 		<span class="p p0 p00">.01</span> -
@@ -249,12 +269,21 @@ sub showversions {
 		<span class="p p1">10</span> -
 		<span class="p p2">20</span> -
 		<span class="p p5">majority</span>
-	</div>
+<: } else { :>
+		<table class="glyphs"><tr>
+			<td class="p p1">previous version</td>
+			<td class="p p3">current</td>
+			<td class="p p0 p00">upcoming (within months)</td>
+			<td class="  p0">future (within a year)</td>
+		</table>
+<: } :>	</p>
 
 	<div class="right">
 		<ul class="legend legend-set">
 		<li>default <strong>style</strong> is
 			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
+		<li><strong>usage</strong> source is
+			<:= !defined $get{usage} && 'default ' :><:= defined $usage ? "<em>$usage</em>" : 'not included (<em>0</em>)' :>
 		</ul>
 	</div>
 </div>