flowcontrol.dia @@ -61,10 +61,13 @@ sub parse { # Get XRDS my $xrds = shift @{$doc->getElementsByTagName('xrds:XRDS')}; + $xrds = shift @{$doc->getElementsByTagName('XRDS')} unless $xrds; + return unless $xrds; # Get /last/ XRD my @xrd = $xrds->getElementsByTagName('XRD'); my $xrd = $xrd[-1]; + return unless $xrd; my $services = []; my @services = $xrd->getElementsByTagName('Service'); @@ -145,7 +148,6 @@ Protocol::Yadis::Document - Protocol::Yadis document object </Service> </XRD> </xrds:XRDS> - EOD my $services = $d->services; lib/Protocol/Yadis/Document.pm @@ -1,15 +1,52 @@ -use Test::More tests => 37; +#!/usr/bin/perl + +use strict; +use warnings; + +use Test::More tests => 41; use Protocol::Yadis::Document; my $d = Protocol::Yadis::Document->parse; -ok(not defined); +ok(not defined $d); $d = Protocol::Yadis::Document->parse(''); -ok(not defined); +ok(not defined $d); $d = Protocol::Yadis::Document->parse('<asdasd'); -ok(not defined); +ok(not defined $d); + +$d = Protocol::Yadis::Document->parse(<<''); +<?xml version="1.0" encoding="UTF-8"?> +<foo xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)"> + <XRD> + </XRD> +</foo> + +ok(not defined $d); + +$d = Protocol::Yadis::Document->parse(<<''); +<?xml version="1.0" encoding="UTF-8"?> +<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)"> +</xrds:XRDS> + +ok(not defined $d); + +$d = Protocol::Yadis::Document->parse(<<''); +<?xml version="1.0" encoding="UTF-8"?> +<XRDS xmlns="xri://$xrds"> + <XRD xmlns="xri://$xrd*($v*2.0)"> + <Service> + <Type> http://lid.netmesh.org/sso/2.0 </Type> + </Service> + <Service> + <Type> http://lid.netmesh.org/sso/1.0 </Type> + </Service> + </XRD> +</XRDS> + +is($d->services->[0]->Type->[0]->content, 'http://lid.netmesh.org/sso/2.0'); +is($d->services->[1]->Type->[0]->content, 'http://lid.netmesh.org/sso/1.0'); $d = Protocol::Yadis::Document->parse(<<''); <?xml version="1.0" encoding="UTF-8"?> t/document.t def2c0a59f96aab5c82e2199fa1253d4e96fc569 vti viacheslav.t@gmail.com http://github.com/vti/protocol-yadis/commit/9da599366b74c44bb6e5a95a5c20a4cc61511af6 9da599366b74c44bb6e5a95a5c20a4cc61511af6 2009-11-10T03:10:10-08:00 2009-11-10T03:10:10-08:00 Made document parsing more robust dcb3d916706475a5aad1f9efd9435a07b48871d7 vti viacheslav.t@gmail.com