From a1331e538ed8fff6e9554de553a2869954f54167 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 2 May 2014 23:16:37 +0000
Subject: view: API cleanup, remove "as_" prefix

These views are not OO, so the "as_" prefix makes little sense
and "as_html" conflicts with Hval, which is OO.
---
 lib/PublicInbox/Feed.pm | 2 +-
 lib/PublicInbox/View.pm | 6 +++---
 lib/PublicInbox/WWW.pm  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/PublicInbox')

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 09eb2fca..12ac8a95 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -243,7 +243,7 @@ sub add_to_feed {
 	defined $mid or return 0;
 	$mid = PublicInbox::Hval->new_msgid($mid);
 	my $href = $mid->as_href . '.html';
-	my $content = PublicInbox::View->as_feed_entry($mime, $fullurl . $href);
+	my $content = PublicInbox::View->feed_entry($mime, $fullurl . $href);
 	defined($content) or return 0;
 
 	my $subject = mime_header($mime, 'Subject') or return 0;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index a43ab620..52e8f0b2 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -16,7 +16,7 @@ my $enc_utf8 = find_encoding('UTF-8');
 my $enc_mime = find_encoding('MIME-Header');
 
 # public functions:
-sub as_html {
+sub msg_html {
 	my ($class, $mime, $full_pfx) = @_;
 
 	headers_to_html_header($mime, $full_pfx) .
@@ -26,10 +26,10 @@ sub as_html {
 		'</pre></body></html>';
 }
 
-sub as_feed_entry {
+sub feed_entry {
 	my ($class, $mime, $full_pfx) = @_;
 
-	"<pre>" . multipart_text_as_html($mime, $full_pfx) . "</pre>";
+	'<pre>' . multipart_text_as_html($mime, $full_pfx) . '</pre>';
 }
 
 
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 4dbfe47d..898f42a8 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -166,7 +166,7 @@ sub get_mid_html {
 	my $pfx = "../f/$mid_href.html";
 	require Email::MIME;
 	[ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-		[ PublicInbox::View->as_html(Email::MIME->new($x), $pfx) ] ];
+		[ PublicInbox::View->msg_html(Email::MIME->new($x), $pfx) ] ];
 }
 
 # /$LISTNAME/f/$MESSAGE_ID.html                   -> HTML content (fullquotes)
@@ -177,7 +177,7 @@ sub get_full_html {
 	require PublicInbox::View;
 	require Email::MIME;
 	[ 200, [ 'Content-Type' => 'text/html' ],
-		[ PublicInbox::View->as_html(Email::MIME->new($x))] ];
+		[ PublicInbox::View->msg_html(Email::MIME->new($x))] ];
 }
 
 sub self_url {
-- 
cgit v1.2.3-24-ge0c7