aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-18 16:24:22 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-19 20:22:46 -0500
commit546da9bac7135d7d1b02dce0c0eef2209d939fc6 (patch)
tree4c737a7fa89f9110a060153f7eaf0a1b7babb4f9
parent86df150fb0d9d0890b14fef545a772379a2f56af (diff)
downloadikiwiki-546da9bac7135d7d1b02dce0c0eef2209d939fc6.tar
ikiwiki-546da9bac7135d7d1b02dce0c0eef2209d939fc6.tar.gz
Make [[!meta enclosure=foo.mp3]] "work" for HTML.
-rw-r--r--IkiWiki/Plugin/meta.pm8
-rwxr-xr-xt/podcast.t69
-rw-r--r--t/tinypodcast/podcast.mdwn3
-rw-r--r--templates/page.tmpl6
4 files changed, 79 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 421f1dc86..cb0768b91 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -121,6 +121,9 @@ sub preprocess (@) {
add_link($page, $value);
return "";
}
+ elsif ($key eq 'enclosure') {
+ $pagestate{$page}{meta}{enclosure}=$value;
+ }
elsif ($key eq 'author') {
$pagestate{$page}{meta}{author}=$value;
if (exists $params{sortas}) {
@@ -318,6 +321,11 @@ sub pagetemplate (@) {
$template->param(title_overridden => 1);
}
+ if (exists $pagestate{$page}{meta}{enclosure}) {
+ # XXX what if the enclosure doesn't exist?
+ $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
+ }
+
foreach my $field (qw{authorurl}) {
eval q{use HTML::Entities};
$template->param($field => HTML::Entities::encode_entities($pagestate{$page}{meta}{$field}))
diff --git a/t/podcast.t b/t/podcast.t
index da91b3446..a50b7ff2a 100755
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -3,23 +3,27 @@ use warnings;
use strict;
BEGIN {
- eval q{use XML::Feed};
+ eval q{use XML::Feed; use HTML::Parser};
if ($@) {
- eval q{use Test::More skip_all => "XML::Feed not available"};
+ eval q{use Test::More skip_all =>
+ "XML::Feed and/or HTML::Parser not available"};
}
else {
- eval q{use Test::More tests => 72};
+ eval q{use Test::More tests => 77};
}
}
+my $tmp = 't/tmp';
+my $statedir = 't/tinypodcast/.ikiwiki';
+
sub simple_podcast {
my $baseurl = 'http://example.com';
my @command = (qw(./ikiwiki.out -plugin inline -rss -atom));
push @command, qw(-underlaydir=underlays/basewiki);
push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
- push @command, "-url=$baseurl", qw(t/tinypodcast t/tmp/out);
+ push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
- ok(! system("mkdir t/tmp"));
+ ok(! system("mkdir $tmp"));
ok(! system(@command));
my %media_types = (
@@ -30,7 +34,7 @@ sub simple_podcast {
);
for my $format (qw(atom rss)) {
- my $feed = XML::Feed->parse("t/tmp/out/index.$format");
+ my $feed = XML::Feed->parse("$tmp/out/index.$format");
is($feed->title, 'wiki',
qq{$format feed title});
@@ -82,7 +86,58 @@ sub simple_podcast {
}
}
- ok(! system("rm -rf t/tmp t/tinypodcast/.ikiwiki"));
+ ok(! system("rm -rf $tmp $statedir"));
+}
+
+sub single_page_html {
+ my @command = (qw(./ikiwiki.out));
+ push @command, qw(-underlaydir=underlays/basewiki);
+ push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
+ push @command, qw(t/tinypodcast), "$tmp/out";
+
+ ok(! system("mkdir $tmp"));
+ ok(! system(@command));
+ my $html = "$tmp/out/podcast/index.html";
+
+ my $body = _extract_html_content($html, 'content');
+ like($body, qr/article has content and/m, q{html body text});
+
+ my $enclosure = _extract_html_content($html, 'enclosure');
+ like($enclosure, qr/Download this episode/m, q{html enclosure});
+
+ # XXX die if specified enclosure doesn't exist
+ # XXX die if more than one enclosure is specified
+
+ ok(! system("rm -rf $tmp $statedir"));
+}
+
+sub _extract_html_content {
+ my ($file, $desired_id, $desired_tag) = @_;
+ $desired_tag = 'div' unless defined $desired_tag;
+
+ my $p = HTML::Parser->new(api_version => 3);
+ my $content = '';
+
+ $p->handler(start => sub {
+ my ($tag, $self, $attr) = @_;
+ return if $tag ne $desired_tag;
+ return unless exists $attr->{id} && $attr->{id} eq $desired_id;
+
+ $self->handler(text => sub {
+ my ($dtext) = @_;
+ $content .= $dtext;
+ }, "dtext");
+
+ $self->handler(end => sub {
+ my ($tag, $self) = @_;
+ $self->eof if $tag eq $desired_tag;
+ }, "tagname,self");
+ }, "tagname,self,attr");
+
+ $p->parse_file($file) || die $!;
+
+ return $content;
}
simple_podcast();
+single_page_html();
diff --git a/t/tinypodcast/podcast.mdwn b/t/tinypodcast/podcast.mdwn
new file mode 100644
index 000000000..b02f8dee0
--- /dev/null
+++ b/t/tinypodcast/podcast.mdwn
@@ -0,0 +1,3 @@
+[[!meta enclosure="piano.mp3"]]
+
+this article has content _and_ an enclosure!
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 89b4f3a06..ac6086384 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -128,6 +128,12 @@
<TMPL_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
+<TMPL_IF ENCLOSURE>
+<a href="<TMPL_VAR ENCLOSURE>">Download this episode</a>
+</TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
<TMPL_UNLESS DYNAMIC>
<TMPL_IF COMMENTS>
<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>