Document that last enclosure wins.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c77837e3cbd5c92016977fe7b273286a21abd71a..70233decf5c2cc4ac87971a122c8859f9a83465f 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -130,6 +130,7 @@ sub preprocess (@) {
 
                $value=urlto($link, $page);
                $pagestate{$page}{meta}{enclosure}=$value;
 
                $value=urlto($link, $page);
                $pagestate{$page}{meta}{enclosure}=$value;

+               # fallthrough

        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;

diff --git a/t/podcast.t b/t/podcast.t
index 993814742068665eb34f5773b604f199a6612e73..3125a7e55d79d4a1ae253effbfe5a634ec2c7d60 100755 (executable)
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -9,7 +9,7 @@ BEGIN {
                        "XML::Feed and/or HTML::Parser not available"};
        }
        else {
                        "XML::Feed and/or HTML::Parser not available"};
        }
        else {

-               eval q{use Test::More tests => 78};
+               eval q{use Test::More tests => 81};

        }
 }
 
        }
 }
 


@@ -25,8 +25,10 @@ sub simple_podcast {
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
 
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out";
 

-       ok(! system("mkdir $tmp"), q{setup});
-       ok(! system(@command), q{build});
+       ok(! system("mkdir $tmp"),
+               q{setup});
+       ok(! system(@command),
+               q{build});

 
        my %media_types = (
                'simplepost'    => undef,
 
        my %media_types = (
                'simplepost'    => undef,


@@ -97,21 +99,28 @@ sub single_page_html {
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, qw(t/tinypodcast), "$tmp/out";
 
        push @command, qw(-set underlaydirbase=underlays -templatedir=templates);
        push @command, qw(t/tinypodcast), "$tmp/out";
 

-       ok(! system("mkdir $tmp"), q{setup});
-       ok(! system(@command), q{build});
+       ok(! system("mkdir $tmp"),
+               q{setup});
+       ok(! system(@command),
+               q{build});

 
        my $html = "$tmp/out/pianopost/index.html";
 
        my $html = "$tmp/out/pianopost/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});
-
+       like(_extract_html_content($html, 'content'), qr/has content and/m,
+               q{html body text});
+       like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
+               q{html enclosure});

        my ($href) = _extract_html_links($html, 'piano');
        my ($href) = _extract_html_links($html, 'piano');

-       ok(-f $href, q{html enclosure exists});
-
-       # XXX die if more than one enclosure is specified
+       ok(-f $href,
+               q{html enclosure exists});
+
+       $html = "$tmp/out/attempted_multiple_enclosures/index.html";
+       like(_extract_html_content($html, 'content'), qr/has content and/m,
+               q{html body text});
+       like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
+               q{html enclosure});
+       ($href) = _extract_html_links($html, 'walter');
+       ok(-f $href,
+               q{html enclosure exists});

 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }

diff --git a/t/tinypodcast/attempted_multiple_enclosures.mdwn b/t/tinypodcast/attempted_multiple_enclosures.mdwn
new file mode 100644 (file)
index 0000000..ea7bae8
--- /dev/null
+++ b/t/tinypodcast/attempted_multiple_enclosures.mdwn
@@ -0,0 +1,4 @@
+[[!meta enclosure="piano.mp3" enclosure="scroll.3gp"]]
+[[!meta enclosure="walter.ogg"]]
+
+this article has content _and_ only one enclosure!