--- trunk/lib/Frey/Web.pm 2008/11/18 02:14:40 398 +++ trunk/lib/Frey/Web.pm 2008/11/19 01:21:31 434 @@ -10,6 +10,9 @@ use Carp qw/confess/; use File::Slurp; +use Frey::Bookmarklet; +use Frey::ClassBrowser; + has 'head' => ( is => 'rw', isa => 'ArrayRef[Str]', @@ -21,8 +24,8 @@ isa => 'ArrayRef[HashRef[Str]]', lazy => 1, default => sub { [ - { 'Bookmarklets' => Frey::Bookmarklet->markup }, - { 'ClassBrowser' => Frey::ClassBrowser->markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->markup }, + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup }, ] }, ); @@ -32,6 +35,16 @@ default => '/', ); +has 'title' => ( + is => 'rw', + isa => 'Str', + lazy => 1, + default => sub { + my ($self) = @_; + ref($self); + }, +); + =head2 inline_smaller_than Inline JavaScript and CSS smaller than this size into page reducing @@ -115,9 +128,6 @@ =cut -use Frey::Bookmarklet; -use Frey::ClassBrowser; - sub page { my $self = shift; my $a = {@_}; @@ -126,7 +136,11 @@ my $status_line = ''; foreach my $part ( @{ $self->status } ) { - confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH'; + if ( ref($part) ne 'HASH' ) { + warn "part not hash ",dump( $part ) ; + #$self->status( $part ); + next; + } foreach my $name ( keys %$part ) { my $content = $part->{$name}; if ( ref($content) ) { @@ -144,11 +158,11 @@ my $html = join("\n", qq||, $self->_head_html, - '' . ( $a->{title} || ref($self) ) . '', + '' . ( $self->title || $a->{title} || ref($self) ) . '', '', ( $a->{head} || '' ), '', - ( $a->{body} || '' ), + ( $a->{body} || $self->markup || '' ), qq|
Frey $Frey::VERSION @@ -170,7 +184,8 @@ my ($package, $filename, $line) = caller; $error .= " at $filename line $line" if $error !~ m{ at }; warn "WARN: $error\n"; - $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm; + $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm; + $error =~ s{(via package ")([\w:]+)(")}{$1$2$3}gsm; return qq|
$error
|; }