Make enclosure follow WikiLink LinkingRules.
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Mon, 18 Feb 2013 23:01:13 +0000 (18:01 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 20 Feb 2013 01:22:46 +0000 (20:22 -0500)
IkiWiki/Plugin/meta.pm
t/podcast.t

index cb0768b91799ad4e642b8f1f67dee73f691748b5..c77837e3cbd5c92016977fe7b273286a21abd71a 100644 (file)
@@ -122,6 +122,13 @@ sub preprocess (@) {
                return "";
        }
        elsif ($key eq 'enclosure') {
+               my $link=bestlink($page, $value);
+               if (! length $link) {
+                       error gettext("enclosure not found")
+               }
+               add_depends($page, $link, deptype("presence"));
+
+               $value=urlto($link, $page);
                $pagestate{$page}{meta}{enclosure}=$value;
        }
        elsif ($key eq 'author') {
@@ -322,7 +329,6 @@ sub pagetemplate (@) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
-               # XXX what if the enclosure doesn't exist?
                $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
        }
 
index 77f1468713118a0905ab4f8f23b9ba7ec6a89869..993814742068665eb34f5773b604f199a6612e73 100755 (executable)
@@ -3,16 +3,18 @@ use warnings;
 use strict;
 
 BEGIN {
-       eval q{use XML::Feed; use HTML::Parser};
+       eval q{use XML::Feed; use HTML::Parser; use HTML::LinkExtor};
        if ($@) {
                eval q{use Test::More skip_all =>
                        "XML::Feed and/or HTML::Parser not available"};
        }
        else {
-               eval q{use Test::More tests => 77};
+               eval q{use Test::More tests => 78};
        }
 }
 
+use Cwd;
+
 my $tmp = 't/tmp';
 my $statedir = 't/tinypodcast/.ikiwiki';
 
@@ -23,8 +25,8 @@ sub simple_podcast {
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
 
-       ok(! system("mkdir $tmp"));
-       ok(! system(@command));
+       ok(! system("mkdir $tmp"), q{setup});
+       ok(! system(@command), q{build});
 
        my %media_types = (
                'simplepost'    => undef,
@@ -86,7 +88,7 @@ sub simple_podcast {
                }
        }
 
-       ok(! system("rm -rf $tmp $statedir"));
+       ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 sub single_page_html {
@@ -95,8 +97,9 @@ sub single_page_html {
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, qw(t/tinypodcast), "$tmp/out";
 
-       ok(! system("mkdir $tmp"));
-       ok(! system(@command));
+       ok(! system("mkdir $tmp"), q{setup});
+       ok(! system(@command), q{build});
+
        my $html = "$tmp/out/pianopost/index.html";
 
        my $body = _extract_html_content($html, 'content');
@@ -105,10 +108,12 @@ sub single_page_html {
        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
+       my ($href) = _extract_html_links($html, 'piano');
+       ok(-f $href, q{html enclosure exists});
+
        # XXX die if more than one enclosure is specified
 
-       ok(! system("rm -rf $tmp $statedir"));
+       ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
 sub _extract_html_content {
@@ -139,5 +144,22 @@ sub _extract_html_content {
        return $content;
 }
 
+sub _extract_html_links {
+       my ($file, $desired_value) = @_;
+
+       my @hrefs = ();
+
+       my $p = HTML::LinkExtor->new(sub {
+               my ($tag, %attr) = @_;
+               return if $tag ne 'a';
+               return unless $attr{href} =~ qr/$desired_value/;
+               push(@hrefs, values %attr);
+       }, getcwd() . '/' . $file);
+
+       $p->parse_file($file);
+
+       return @hrefs;
+}
+
 simple_podcast();
 single_page_html();