urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'smcv/openid'

master
Joey Hess 2008-12-21 13:13:28 -05:00
parent 041f8e3774 f0c76aa51c
commit 79d2d44db2
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/openid.pm
View File

@ -191,13 +191,15 @@ sub openiduser ($) {
eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) { eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
my $display=$oid->display; my $display=$oid->display;
# Convert "user.somehost.com" to "user [somehost.com]". # Convert "user.somehost.com" to "user [somehost.com]"
# (also "user.somehost.co.uk")
if ($display !~ /\[/) { if ($display !~ /\[/) {
$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/; $display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/;
} }
# Convert "http://somehost.com/user" to "user [somehost.com]". # Convert "http://somehost.com/user" to "user [somehost.com]".
# (also "https://somehost.com/user/")
if ($display !~ /\[/) { if ($display !~ /\[/) {
$display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/; $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
} }
$display=~s!^https?://!!; # make sure this is removed $display=~s!^https?://!!; # make sure this is removed
eval q{use CGI 'escapeHTML'}; eval q{use CGI 'escapeHTML'};

30
t/openiduser.t 100755
View File

@ -0,0 +1,30 @@
#!/usr/bin/perl
use warnings;
use strict;
BEGIN {
eval q{
use Net::OpenID::VerifiedIdentity;
};
if ($@) {
eval q{use Test::More skip_all => "Net::OpenID::VerifiedIdentity not available"};
}
else {
eval q{use Test::More tests => 9};
}
use_ok("IkiWiki::Plugin::openid");
}
# Some typical examples:
is(IkiWiki::openiduser('http://josephturian.blogspot.com'), 'josephturian [blogspot.com]');
is(IkiWiki::openiduser('http://yam655.livejournal.com/'), 'yam655 [livejournal.com]');
is(IkiWiki::openiduser('http://id.mayfirst.org/jamie/'), 'jamie [id.mayfirst.org]');
# and some less typical ones taken from the ikiwiki commit history
is(IkiWiki::openiduser('http://thm.id.fedoraproject.org/'), 'thm [id.fedoraproject.org]');
is(IkiWiki::openiduser('http://dtrt.org/'), 'dtrt.org');
is(IkiWiki::openiduser('http://alcopop.org/me/openid/'), 'openid [alcopop.org/me]');
is(IkiWiki::openiduser('http://id.launchpad.net/882/bielawski1'), 'bielawski1 [id.launchpad.net/882]');
is(IkiWiki::openiduser('http://technorati.com/people/technorati/drajt'), 'drajt [technorati.com/people/technorati]');