--- trunk/lib/Frey/Web.pm 2008/11/19 03:36:24 448 +++ trunk/lib/Frey/Web.pm 2008/11/26 00:45:52 524 @@ -1,15 +1,18 @@ package Frey::Web; use Moose::Role; +with 'Frey::Backtrace'; + use Frey::Types; use Continuity::Widget::DomNode; use Data::Dump qw/dump/; -use Carp qw/confess/; +use Carp qw/confess cluck/; use File::Slurp; use Frey::Bookmarklet; use Frey::ClassBrowser; +use Frey::SVK; has 'head' => ( is => 'rw', @@ -17,16 +20,6 @@ default => sub { [ 'static/frey.css' ] }, ); -has 'status' => ( - is => 'rw', - isa => 'ArrayRef[HashRef[Str]]', - lazy => 1, - default => sub { [ - { 'Bookmarklets' => Frey::Bookmarklet->new->markup }, - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup }, - ] }, -); - has 'request_url' => ( is => 'rw', isa => 'Uri', coerce => 1, @@ -47,6 +40,14 @@ is => 'rw', isa => 'Str', default => 'text/html', + documentation => 'Content-type header', +); + +has 'dump_max_bytes' => ( + is => 'rw', + isa => 'Int', + default => 4096, + documentation => 'Maximum dump size sent to browser before truncation', ); =head2 inline_smaller_than @@ -138,25 +139,29 @@ =cut +our @status; +sub status { @status }; + sub page { my $self = shift; my $a = {@_}; + warn "## page ",dump($a); + $reload_counter++; my $status_line = ''; - foreach my $part ( @{ $self->status } ) { - if ( ref($part) ne 'HASH' ) { - warn "part not hash ",dump( $part ) ; - #$self->status( $part ); - next; - } + + unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }; + unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }; + + foreach my $part ( @status ) { foreach my $name ( keys %$part ) { my $content = $part->{$name}; if ( ref($content) ) { $content = '' . dump($content) . ''; my $l = length($content); - $content = qq|$l bytes| if $l > 1024; + $content = qq|$l bytes| if $l > $self->dump_max_bytes; } else { $content = qq|$content|; } @@ -168,9 +173,54 @@ my $url = $self->request_url; $url =~ s{\?reload=\d+}{}; - my $body = $a->{body} || $self->markup; - return $body if $self->content_type !~ m{html}; - $body ||= ''; + my $body = $a->{body}; + $body ||= $self->as_markup if $self->can('as_markup'); + if ( $self->content_type !~ m{html} ) { + warn "# return only $self body ", $self->content_type; + return $body + } elsif ( ! defined $body ) { + warn "# no body"; + $body = ''; + } + + my $warn_colors = { + '#' => '#444', + '##' => '#888', + }; + + $status_line + .= qq|warn| + . $self->editor_links( + join("", map { + warn "# $_"; + my $style = ''; + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : '' + if m{^(#+)}; + qq|$_
|; # XXX should be but CSS hates me + } $self->warnings ) + ) + . qq|| + if $self->warnings; + + my ($exit,$description) = ('exit','stop server'); + ($exit,$description) = ('restart','restart server') + if $ENV{FREY_RESTART}; # tune labels on exit link + + my $right = + qq| + + reload + $exit + + |; + + my $info = Frey::SVK->info; + my $revision = Frey::SVK->info->{Revision} || ''; + $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; + + $self->add_icon; my $html = join("\n", qq||, @@ -182,9 +232,9 @@ $body
- Frey $Frey::VERSION - $url + Frey $Frey::VERSION $revision $status_line + $right
|, @@ -195,15 +245,104 @@ return $html; } +=head2 editor + +Create HTML editor link with optional line and title + + my $html = $self->editor( $class, $line, $title ); + +=cut + +sub editor { + my ( $self, $class, $line, $title ) = @_; + confess "need class" unless $class; + if ( ! defined $title ) { + $title = "edit $class"; + $title .= " line $line" if $line; + } + $line ||= 1; + qq|$class|; +} + +=head2 editor_links + +Create HTML links to editor for perl error message + + my $html = $self->editor_links( $error ) + +=cut + +sub editor_links { + my ( $self, $error ) = @_; + + $error =~ s{at\s+(\S+)\s+line\s+(\d+)} + {at $1 line $2}gsm; + + $error =~ s{(via package ")([\w:]+)(")} + {$1$2$3}gsm; + + return $error; +} + sub error { my $self = shift; my $error = join(" ", @_); - 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{(via package ")([\w:]+)(")}{$1$2$3}gsm; - return qq|
$error
|; + + my @backtrace = $self->backtrace; + $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace; + + warn "ERROR: $error\n"; + return + qq|
|
+		. $self->editor_links( $error ) .
+		qq|
| + ; +} + +sub add_status { + my ( $self, $data ) = @_; + push @status, $data; +} + +sub clean_status { + @status = (); +} + +sub status_parts { + warn "## status parts ", dump( map { keys %$_ } @status ); +} + +sub DEMOLISH { + my ( $self ) = @_; + cluck "## DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status; +} + +sub add_icon { + my $self = shift; + my $icon = ref($self); + $icon = $self->class if $self->can('class'); + $icon =~ s{::}{/}g; + + my $icon_path = "static/icons/$icon.png"; + + if ( -e $icon_path ) { + $self->add_head( qq|| ); + warn "# using icon $icon_path"; + + # FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work! + my $ico_path = $icon_path; + $ico_path =~ s{png$}{ico}; + if ( ! -e $ico_path ) { + system "convert $icon_path $ico_path"; + warn "# convert $icon_path $ico_path : $@"; + } + $self->add_head( qq|| ) if -e $ico_path; + + } else { + warn "can't find $icon_path"; + } } 1;