lib/PublicInbox/Feed.pm | 6 +++--- lib/PublicInbox/View.pm | 14 +++++++------- lib/PublicInbox/WWW.pm | 8 ++++---- t/plack.t | 2 +- t/view.t | 8 ++++---- diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 350cc65e866575618ce5537fc240a6c2fa7d6f04..339d9c2031834e8bacf72b1c28f76c347726933a 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 @@
 	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 262e72e9a1ed69c7f7774a92ca371fdcc59cccd1..14133d554ee81063e9badd07ecad2708179585a4 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -13,7 +13,7 @@
 # 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 @@ 		$fmt = '%m/%d';
 	}
 	$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 @@ 					$cur .= $tmp . ' ';
 				}
 			} while (@sum && length($cur) < MAX_TRUNC_LEN);
 			$cur =~ s/ \z/ .../;
-			"> <$cur<\/a>>\n";
 		} else {
 			$cur;
@@ -234,7 +234,7 @@ 	$s =~ s!^((?:(?:>[^\n]*)\n)+)!
 		my $cur = $1;
 		my @lines = split(/\n/, $cur);
 		if (@lines > MAX_INLINE_QUOTED) {
-			"$cur";
+			"$cur";
 		} else {
 			$cur;
 		}
@@ -272,7 +272,7 @@ 		$mid = PublicInbox::Hval->new_msgid($mid);
 		$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 @@ 		my $v = PublicInbox::Hval->new_msgid(my $tmp = $irp);
 		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 @@ 	join(' ', map {
 		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 2d8f2afc0a61350f5c67e10a7204e2af65aee2f5..f67e72cefbfb9629189fa50ccb572e8fc690179a 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -252,10 +252,10 @@ 	my $nurls = scalar @urls;
 	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 @@ 	if (ref($addr) eq 'ARRAY') {
 		$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 3bc4433f9ae3ce73cedf1d124790a8e238c8ed27..85dd337dd11d6fe55a0aa39a94c58c38996ecf5c 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -98,7 +98,7 @@ 		my $pfx = 'http://example.com/test';
 		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 91ba16869820537fa1731bc9121aea84f12cb41b..1851793377fbd557f90fb7dc2105ac916798b346 100644
--- a/t/view.t
+++ b/t/view.t
@@ -44,19 +44,19 @@ 	$s = Email::MIME->new($s->as_string);
 	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");
 }