--- trunk/lib/Frey/Web.pm 2008/11/20 15:23:13 482 +++ trunk/lib/Frey/Web.pm 2008/11/26 20:48:07 546 @@ -1,17 +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::INC; + +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 { [ - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, - { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - ] }, -); - has 'request_url' => ( is => 'rw', isa => 'Uri', coerce => 1, @@ -56,22 +47,64 @@ is => 'rw', isa => 'Int', default => 4096, - documentation => 'Maximum dump size sent to browser before truncation', + documentation => 'maximum dump size sent to browser before truncation', ); -=head2 inline_smaller_than - -Inline JavaScript and CSS smaller than this size into page reducing -round-trips to server. - -=cut - has 'inline_smaller_than' => ( is => 'rw', isa => 'Int', default => 10240, + documentation => 'inline JavaScript and CSS to reduce round-trips', +); + +has 'html_dump_width' => ( + documentation => 'crop longer lines in dumps', + is => 'rw', + isa => 'Int', +# required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them + default => 128, ); +my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); +my $escape_re = join '|' => keys %escape; + +sub html_escape { + my ( $self, $html ) = @_; + $html =~ s/($escape_re)/$escape{$1}/g; + return $html; +} + +sub html_dump { + my ( $self, $dump ) = @_; + $dump = dump( $dump ) if ref($dump); + my $width = $self->html_dump_width; + $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs; + $dump = $self->html_escape( $dump ); + $dump =~ s{\Q...\E}{…}gs; + return "$dump"; +} + +sub popup { my $self = shift; $self->popup_dropdown('popup', @_); } +sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); } + +our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1)>}s; # relaxed html check for one semi-valid tag + +sub popup_dropdown { + my ( $self, $type, $name, $content, $full ) = @_; + + $content = $self->html_dump($content) if ref $content; + + $content = qq|$content| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*}; + + warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug; + + if ( $name =~ m{::} && $name !~ $re_html ) { + return qq|$name $content\n|; + } else { + return qq|$name $content\n|; + } +} + sub dom2html { # warn "## dom2html ",dump( @_ ); return Continuity::Widget::DomNode->create( @_ )->to_string; @@ -120,7 +153,7 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( $path =~ m{<.*>}s ) { + if ( $path =~ $re_html ) { push @{ $self->head }, $path; } elsif ( -e $path ) { if ( $path =~ m/\.(?:js|css)$/ ) { @@ -148,30 +181,28 @@ =cut +our @status; +sub status { @status }; + +our $icon_html; + 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 }; + unshift @status, { 'INC' => Frey::INC->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|; + $status_line .= $self->popup( $name, $part->{$name} ); } } @@ -188,26 +219,7 @@ $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; + $status_line .= $self->warnings_html; my ($exit,$description) = ('exit','stop server'); ($exit,$description) = ('restart','restart server') @@ -216,22 +228,29 @@ my $right = qq| - $url + 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 + Frey $Frey::VERSION $revision $status_line $right
@@ -255,7 +274,11 @@ sub editor { my ( $self, $class, $line, $title ) = @_; confess "need class" unless $class; - $line ||= 1; + if ( ! defined $title ) { + $title = "edit $class"; + $title .= " line $line" if $line; + } + $line ||= 1; qq|$class|; @@ -296,4 +319,173 @@ ; } +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++; + + my $style = ''; + + if ( $multiline_end ) { + if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) { +# warn "## $line end of $multiline_end in '$_'\n"; + undef $multiline_end; + } else { +# warn "## $line skipped\n"; + } + } elsif ( m{^(#*)\s+} ) { + my $l = $1 ? length($1) : 0; + if ( $l > $level ) { + undef $multiline_end; + $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$}; +# warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end; + next; + } + + $style = $warn_colors->{$1} + ? ' style="color:' . $warn_colors->{$1} . '"' + : ''; + + my $msg = $self->html_escape( $_ ); + my $spacer = ' '; + if ( length($msg) > $self->html_dump_width ) { + $msg = substr( $msg, 0, $self->html_dump_width ); + $spacer = '…' + } + $msg =~ s{^\s}{ }g; + $warnings .= qq|$msg
$spacer+$line
|; + # FIXME should be but CSS hates me + } + } + close($log) || die "can't close $path: $!"; + + return + qq|warn| + . $self->editor_links( $warnings ) + . qq|| + ; +} + + +=head2 backtrace + +Show backtrace with links to editor + + my @backtrace = $self->backtrace; + +=cut + +sub backtrace { + my ($self) = @_; + + my @backtrace; + foreach ( 0 .. 5 ) { + my ( + $package,$path,$line + # subroutine hasargs + # wantarray evaltext is_require + # hints bitmask hinthash + ) = caller($_) or last; + + push @backtrace, + qq|via $package from $path $path|; + } + warn "# backtrace: ", dump( @backtrace ) if @backtrace; + return @backtrace; +} + 1;