--- trunk/lib/Frey/Web.pm 2008/11/19 19:59:52 468 +++ trunk/lib/Frey/Web.pm 2008/11/25 17:15:18 519 @@ -7,11 +7,12 @@ 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', @@ -19,16 +20,6 @@ default => sub { [ 'static/frey.css' ] }, ); -has 'status' => ( - is => 'rw', - isa => 'ArrayRef[HashRef[Str]]', - lazy => 1, - default => sub { [ - { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, - ] }, -); - has 'request_url' => ( is => 'rw', isa => 'Uri', coerce => 1, @@ -49,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 @@ -140,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|; } @@ -180,12 +183,43 @@ $body = ''; } + my $warn_colors = { + '#' => '#444', + '##' => '#888', + }; + $status_line - .= qq|warn| - . $self->editor_links( join("", $self->warnings ) ) - . qq|| + .= 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+)}; + my $html = join("\n", qq||, $self->_head_html, @@ -196,9 +230,9 @@ $body
- Frey $Frey::VERSION - $url + Frey $Frey::VERSION $revision $status_line + $right
|, @@ -209,6 +243,35 @@ 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 ) = @_; @@ -236,4 +299,22 @@ ; } +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; +} + 1;