Make enclosures absolute (in feeds they have to be).
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 21 Feb 2013 00:14:20 +0000 (19:14 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 21 Feb 2013 00:14:20 +0000 (19:14 -0500)
IkiWiki/Plugin/meta.pm
t/podcast.t

index 70233decf5c2cc4ac87971a122c8859f9a83465f..f5b9bb5219f769563415cd90463bba9a6979f188 100644 (file)
@@ -128,7 +128,7 @@ sub preprocess (@) {
                }
                add_depends($page, $link, deptype("presence"));
 
                }
                add_depends($page, $link, deptype("presence"));
 
-               $value=urlto($link, $page);
+               $value=urlto($link, $page, 1);
                $pagestate{$page}{meta}{enclosure}=$value;
                # fallthrough
        }
                $pagestate{$page}{meta}{enclosure}=$value;
                # fallthrough
        }
@@ -330,7 +330,7 @@ sub pagetemplate (@) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
-               $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
+               $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
        }
 
        foreach my $field (qw{authorurl}) {
        }
 
        foreach my $field (qw{authorurl}) {
index 235c2e7685f8add7a8216ba7f49740d9124b30cb..88d2ca074878c1f08b841b84d1c6a47a932b2bb1 100755 (executable)
@@ -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 => 89};
+               eval q{use Test::More tests => 92};
        }
 }
 
        }
 }
 
@@ -110,8 +110,8 @@ sub single_page_html {
        like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano');
        like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano');
-       ok(-f $href,
-               q{html enclosure exists});
+       is($href, '/piano.mp3',
+               q{html enclosure sans -url is site-absolute});
 
        $html = "$tmp/out/attempted_multiple_enclosures/index.html";
        like(_extract_html_content($html, 'content'), qr/has content and/m,
 
        $html = "$tmp/out/attempted_multiple_enclosures/index.html";
        like(_extract_html_content($html, 'content'), qr/has content and/m,
@@ -119,8 +119,21 @@ sub single_page_html {
        like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
                q{html enclosure});
        ($href) = _extract_html_links($html, 'walter');
        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});
+       is($href, '/walter.ogg',
+               q{html enclosure sans -url is site-absolute});
+
+       my $baseurl = 'http://example.com';
+       ok(! system(@command, "-url=$baseurl", q{--rebuild}));
+
+       $html = "$tmp/out/pianopost/index.html";
+       ($href) = _extract_html_links($html, 'piano');
+       is($href, "$baseurl/piano.mp3",
+               q{html enclosure with -url is fully absolute});
+
+       $html = "$tmp/out/attempted_multiple_enclosures/index.html";
+       ($href) = _extract_html_links($html, 'walter');
+       is($href, "$baseurl/walter.ogg",
+               q{html enclosure with -url is fully absolute});
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
@@ -146,11 +159,11 @@ sub inlined_pages_html {
        like($enclosures, qr/this episode/m,
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano.mp3');
        like($enclosures, qr/this episode/m,
                q{html enclosure});
        my ($href) = _extract_html_links($html, 'piano.mp3');
-       ok(-f $href,
-               q{html enclosure from pianopost exists});
+       is($href, '/piano.mp3',
+               q{html enclosure from pianopost sans -url});
        ($href) = _extract_html_links($html, 'walter.ogg');
        ($href) = _extract_html_links($html, 'walter.ogg');
-       ok(-f $href,
-               q{html enclosure from attempted_multiple_enclosures exists});
+       is($href, '/walter.ogg',
+               q{html enclosure from attempted_multiple_enclosures sans -url});
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }
 
        ok(! system("rm -rf $tmp $statedir"), q{teardown});
 }