From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.3 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 26DD71F4BD; Sat, 13 Sep 2014 22:03:47 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: Eric Wong Subject: [PATCH] line-wrap generated HTML source around attrs for readability Date: Sat, 13 Sep 2014 22:03:45 +0000 Message-Id: <1410645825-28840-1-git-send-email-e@80x24.org> X-Mailer: git-send-email 2.1.0.64.gab5fb8d.dirty List-Id: It's important to keep HTML source readable to folks who prefer to read raw HTML. This should improve readability of the HTML source by keeping line length in check without wasting bytes. --- lib/PublicInbox/Feed.pm | 6 +++--- lib/PublicInbox/View.pm | 14 +++++++------- lib/PublicInbox/WWW.pm | 8 ++++---- t/plack.t | 2 +- t/view.t | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 350cc65..339d9c2 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -12,7 +12,7 @@ use PublicInbox::View; use constant { DATEFMT => '%Y-%m-%dT%H:%M:%SZ', # atom standard MAX_PER_PAGE => 25, # this needs to be tunable - PRE_WRAP => '
',
+	PRE_WRAP => "",
 };
 
 # main function
@@ -73,8 +73,8 @@ sub generate_html_index {
 	my $th = PublicInbox::Thread->new(@messages);
 	$th->thread;
 	my $html = "$title" .
-		'' .
+		'{atomurl} . "\"\ntype=\"application/atom+xml\"/>" .
 		'' . PRE_WRAP;
 
 	# sort child messages in chronological order
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 262e72e..14133d5 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -13,7 +13,7 @@ require POSIX;
 # TODO: make these constants tunable
 use constant MAX_INLINE_QUOTED => 12; # half an 80x24 terminal
 use constant MAX_TRUNC_LEN => 72;
-use constant PRE_WRAP => '
';
+use constant PRE_WRAP => "";
 
 *ascii_html = *PublicInbox::Hval::ascii_html;
 
@@ -74,7 +74,7 @@ sub index_entry {
 	}
 	$ts = POSIX::strftime($fmt, gmtime($ts));
 
-	$rv .= "$pfx$subj $from - $ts\n\n";
+	$rv .= "$pfx$subj $from - $ts\n\n";
 
 	my $irp = $header_obj->header_raw('In-Reply-To');
 	my ($anchor_idx, $anchor);
@@ -217,7 +217,7 @@ sub add_text_body_short {
 				}
 			} while (@sum && length($cur) < MAX_TRUNC_LEN);
 			$cur =~ s/ \z/ .../;
-			"> <$cur<\/a>>\n";
 		} else {
 			$cur;
@@ -234,7 +234,7 @@ sub add_text_body_full {
 		my $cur = $1;
 		my @lines = split(/\n/, $cur);
 		if (@lines > MAX_INLINE_QUOTED) {
-			"$cur";
+			"$cur";
 		} else {
 			$cur;
 		}
@@ -272,7 +272,7 @@ sub headers_to_html_header {
 		$rv .= 'Message-ID: <' . $mid->as_html . '> ';
 		my $href = $mid->as_href;
 		$href = "../m/$href" unless $full_pfx;
-		$rv .= "(original)\n";
+		$rv .= "(original)\n";
 	}
 
 	my $irp = $header_obj->header_raw('In-Reply-To');
@@ -281,7 +281,7 @@ sub headers_to_html_header {
 		my $html = $v->as_html;
 		my $href = $v->as_href;
 		$rv .= "In-Reply-To: <";
-		$rv .= "$html>\n";
+		$rv .= "$html>\n";
 	}
 
 	my $refs = $header_obj->header_raw('References');
@@ -336,7 +336,7 @@ sub linkify_refs {
 		my $v = PublicInbox::Hval->new_msgid($_);
 		my $html = $v->as_html;
 		my $href = $v->as_href;
-		"<$html>";
+		"<$html>";
 	} @_);
 }
 
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 2d8f2af..f67e72c 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -252,10 +252,10 @@ sub footer {
 	if ($nurls == 0) {
 		$urls = '($GIT_DIR/cloneurl missing)';
 	} elsif ($nurls == 1) {
-		$urls = 'git URL for ssoma: ' . $urls[0];
 	} else {
-		$urls = 'git URLs for ssoma:\n" . join("\n", map { "\t$_" } @urls);
 	}
 
@@ -264,11 +264,11 @@ sub footer {
 		$addr = $addr->[0]; # first address is primary
 	}
 
-	$addr = "$addr";
+	$addr = "$addr";
 	$desc =  $desc;
 	join("\n",
 		'- ' . $desc,
-		'A public-inbox, ' .
+		"A public-inbox, ' .
 			'anybody may post in plain-text (not HTML):',
 		$addr,
 		$urls
diff --git a/t/plack.t b/t/plack.t
index 3bc4433..85dd337 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -98,7 +98,7 @@ EOF
 		my $res = $cb->(GET($pfx . '/atom.xml'));
 		is(200, $res->code, 'success response received for atom');
 		like($res->content,
-			qr!link href="\Q$pfx\E/m/blah%40example\.com\.html"!,
+			qr!link\s+href="\Q$pfx\E/m/blah%40example\.com\.html"!s,
 			'atom feed generated correct URL');
 	});
 }
diff --git a/t/view.t b/t/view.t
index 91ba168..1851793 100644
--- a/t/view.t
+++ b/t/view.t
@@ -44,19 +44,19 @@ EOF
 	my $html = PublicInbox::View->msg_html($s);
 
 	# ghetto tests
-	like($html, qr!]+>> Long and wordy/,
+	like($html, qr/]+>> Long and wordy/,
 		"long quoted text is anchored");
 
 	# short page
 	my $pfx = "http://example.com/test/f";
 	my $short = PublicInbox::View->msg_html($s, $pfx);
-	like($short, qr!]+>Long and wordy/,
 		"long quoted text is made into a link");
 	ok(length($short) < length($html), "short page is shorter");
 }
-- 
EW