--- trunk/lib/Frey/Web.pm 2008/10/31 19:53:50 214 +++ trunk/lib/Frey/Web.pm 2008/11/26 07:57:12 532 @@ -1,17 +1,55 @@ 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', isa => 'ArrayRef[Str]', default => sub { [ 'static/frey.css' ] }, ); +has 'request_url' => ( + is => 'rw', + isa => 'Uri', coerce => 1, + default => '/', +); + +has 'title' => ( + is => 'rw', + isa => 'Str', + lazy => 1, + default => sub { + my ($self) = @_; + ref($self); + }, +); + +has 'content_type' => ( + 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 Inline JavaScript and CSS smaller than this size into page reducing @@ -48,6 +86,8 @@ $out .= $self->_inline_path( $path ) ? qq|| : qq||; + } elsif ( $path =~ m{<.+>}s ) { + $out .= $path; } else { confess "don't know how to render $path"; } @@ -62,6 +102,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -69,17 +111,19 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( -e $path ) { + if ( $path =~ m{<.*>}s ) { + push @{ $self->head }, $path; + } elsif ( -e $path ) { if ( $path =~ m/\.(?:js|css)$/ ) { push @{ $self->head }, $path; } else { confess "can't add_head( $path ) it's not js or css"; } + return -s $path; } else { confess "can't find $path: $!"; } - return -s $path; } our $reload_counter = 0; @@ -95,33 +139,280 @@ =cut -use Frey::Bookmarklet; -use Frey::ClassBrowser; +our @status; +sub status { @status }; + +our $icon_html; sub page { my $self = shift; my $a = {@_}; + warn "## page ",dump($a); + $reload_counter++; - my $html = qq|| - . $self->_head_html - . '' . ( $a->{title} || ref($self) ) . '' - . ( $a->{head} || '' ) - . '' - . ( $a->{body} || '' ) - . qq|
- Frey $Frey::VERSION - reload - Bookmarklets| . Frey::Bookmarklet->markup . qq| - ClassBrowser| . Frey::ClassBrowser->markup . qq| + my $status_line = ''; + + 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 > $self->dump_max_bytes; + } else { + $content = qq|$content|; + } + warn "### part [$name] = ", length( $content ), " bytes" if $self->debug; + $status_line .= qq|$name $content\n|; + } + } + + my $url = $self->request_url; + $url =~ s{\?reload=\d+}{}; + + 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 = ''; + } + + $status_line .= $self->warnings_html; + + 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 unless $icon_html; + + my $html = join("\n", + qq||, + $self->_head_html, + '' . ( $self->title || $a->{title} || ref($self) ) . '', + '', + ( $icon_html || '' ), + ( $a->{head} || '' ), + qq| + + $body +
+ Frey $Frey::VERSION $revision + $status_line + $right
- |; + |, + ); warn "## >>> page ",length($html), " bytes\n" if $self->debug; 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 @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 = (); + $icon_html = ''; +} + +sub status_parts { + warn "## status parts ", dump( map { keys %$_ } @status ); +} + +sub DEMOLISH { + my ( $self ) = @_; + warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status; +} + +=head2 add_icon + + Frey::Foo->add_icon; # /static/icons/Frey/Foo.png + Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png + +=cut + +sub icon_path { + my ($self,$class,$variant) = @_; + my $icon = $class; + $icon =~ s{::}{/}g; + $icon .= "/$variant" if $variant; + my $path = 'static/icons/' . $icon . '.png'; + if ( -e $path ) { + warn "# $class from $self icon_path $path"; + return $path; + } else { + warn "TODO: add $path icon for $class"; + return undef; + } +} + +sub add_icon { + my ($self,$variant) = @_; + + my $class = ref($self); + $class = $self->class if $self->can('class'); + my $icon_path = $self->icon_path( $class, $variant ) || return; + + $icon_html .= qq||; + warn "# using icon $icon_path"; + +=for later + + # 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 : $@"; + } + $icon_html .= qq|| if -e $ico_path; + +=cut + +} + +my $warn_colors = { + '#' => '#444', + '##' => '#888', +}; + +my $multiline_markers = { + '(' => '\)', + '{' => '}', + '[' => '\]', + '"' => '"', +}; + +my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']'; +warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re"; + +sub log_path { + $Frey::Bootstrap::log_path || warn "no log_path?"; +} + +sub warnings_html { + my ($self,$level) = shift; + $level ||= $self->debug; + my $path = $self->log_path; + + my $warnings; + my $line = 0; + my $multiline_end; + + open(my $log, '<', $path) || die "can't open $path: $!"; + while(<$log>) { + chomp; + $line++; + + if ( $multiline_end ) { + undef $multiline_end if m{^$multiline_end}; + next; + } + + my $style = ''; + + if ( m{^(#*)\s+} ) { + my $l = $1 ? length($1) : 0; + $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$}; + next if $l > $level; + warn "## multiline_end: $multiline_end $l > $level for '$_'" if $multiline_end; + undef $multiline_end; + + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : ''; + + $warnings .= qq|$_ +$line
|; + # FIXME should be but CSS hates me + } + } + close($log) || die "can't close $path: $!"; + + return + qq|warn| + . $self->editor_links( $warnings ) + . qq|| + ; +} + 1;