Make [[!meta enclosure=foo.mp3]] "work" for HTML.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 421f1dc86a83d33ac823f9989ad9e42c6dea12c9..cb0768b91799ad4e642b8f1f67dee73f691748b5 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -121,6 +121,9 @@ sub preprocess (@) {
                add_link($page, $value);
                return "";
        }
                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}) {
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
                if (exists $params{sortas}) {


@@ -318,6 +321,11 @@ sub pagetemplate (@) {
                $template->param(title_overridden => 1);
        }
 
                $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}))
        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 da91b34463c1f93cc1cb1f052d58e05e4a10c987..a50b7ff2a5f1219b28c927fcb67b6d7f2ff4d8fc 100755 (executable)
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -3,23 +3,27 @@ use warnings;
 use strict;
 
 BEGIN {
 use strict;
 
 BEGIN {

-       eval q{use XML::Feed};
+       eval q{use XML::Feed; use HTML::Parser};

        if ($@) {
        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 {
        }
        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);
 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 = (
        ok(! system(@command));
 
        my %media_types = (


@@ -30,7 +34,7 @@ sub simple_podcast {
        );
 
        for my $format (qw(atom rss)) {
        );
 
        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});
 
                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();
 }
 
 simple_podcast();

+single_page_html();

diff --git a/t/tinypodcast/podcast.mdwn b/t/tinypodcast/podcast.mdwn
new file mode 100644 (file)
index 0000000..b02f8de
--- /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 89b4f3a06805e65d832a3ab279baf8e7e29675ea..ac60863843b1d87aff11a117672b892f5ffeec96 100644 (file)
--- 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_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>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>