--- trunk/lib/Frey/Pod.pm 2008/11/05 08:21:03 292 +++ trunk/lib/Frey/Pod.pm 2008/11/16 16:36:53 358 @@ -18,23 +18,14 @@ use File::Slurp; use Data::Dump qw/dump/; - -sub request { - my ( $self, $req ) = @_; - my $f = { $req->params }; - my $class = delete( $f->{class} ) || $self->class; - $req->print( $self->page( title => $class, body => $self->markup( $class ) ) ); -} +use Pod::Find qw/pod_where/; sub markup { my $self = shift; my $class = $self->class; use Pod::Simple::HTML; - my $path = eval { $self->package_path( $class ) }; - if ( $@ ) { - warn $@; - return; - } + my $path = pod_where( { -inc => 1 }, $class ); + return $self->error( "Can't find pod for $class" ) unless $path; my $pod = read_file( $path ); my $converter = Pod::Simple::HTML->new(); my $body; @@ -44,12 +35,16 @@ $body =~ s{.*?]+>}{}s; $body =~ s{\s*\s*$}{}; $body =~ s!%3A%3A!::!g; - $body =~ s{]*)>}{}g; - $body =~ s{]*)>}{}g; +# $body =~ s{]*)>}{}g; + $body =~ s{]*)>([^<]+)<([^>]+)>}{$4<$5>◊<$5>}g; $body =~ s!\n\t

!; $body =~ s!

!!; $body =~ s!__index__!index!g; + return { + title => $class, + body => $body, + } if wantarray; return $body; }