--- trunk/lib/Frey/Web.pm 2008/11/18 02:14:40 398
+++ trunk/lib/Frey/Web.pm 2008/11/28 16:39:37 591
@@ -1,30 +1,23 @@
package Frey::Web;
use Moose::Role;
-#with 'Frey::Escape';
+with 'Frey::Session';
use Frey::Types;
-use Continuity::Widget::DomNode;
+#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess/;
+use Carp qw/confess cluck/;
use File::Slurp;
-has 'head' => (
- is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/frey.css' ] },
-);
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+use Frey::INC;
-has 'status' => (
- is => 'rw',
- isa => 'ArrayRef[HashRef[Str]]',
- lazy => 1,
- default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->markup },
- ] },
-);
+use Frey::SVK;
+
+our @head;
+sub head { @head }
has 'request_url' => (
is => 'rw',
@@ -32,22 +25,88 @@
default => '/',
);
-=head2 inline_smaller_than
+has 'title' => (
+ is => 'rw',
+ isa => 'Str',
+ lazy => 1,
+ default => sub {
+ my ($self) = @_;
+ ref($self);
+ },
+);
-Inline JavaScript and CSS smaller than this size into page reducing
-round-trips to server.
+has 'content_type' => (
+ is => 'rw',
+ isa => 'Str',
+ default => 'text/html',
+ documentation => 'Content-type header',
+);
-=cut
+has 'dump_max_bytes' => (
+ is => 'rw',
+ isa => 'Int',
+ default => 4096,
+ documentation => 'maximum dump size sent to browser before truncation',
+);
has 'inline_smaller_than' => (
is => 'rw',
isa => 'Int',
default => 10240,
+ documentation => 'inline JavaScript and CSS to reduce round-trips',
);
-sub dom2html {
-# warn "## dom2html ",dump( @_ );
- return Continuity::Widget::DomNode->create( @_ )->to_string;
+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;
+# $dump =~ $self->editor_links( $dump ); # FIXME include this
+ 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*};
+
+ $content =~ s{([^<]+
)}{$1} && $self->TODO("code wrapped in span");
+
+ warn "## $type [$name] = ", length( $content ), " bytes"; # if $self->debug; # FIXME
+
+ if ( $name =~ m{::} && $name !~ $re_html ) {
+ return qq|$name $content\n|;
+ } elsif ( $name =~ s{^\s*($name $content\n|;
+ }
}
sub _inline_path {
@@ -58,7 +117,7 @@
sub _head_html {
my $self = shift;
my $out = '';
- foreach my $path ( @{ $self->head } ) {
+ foreach my $path ( @head ) {
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
$out .= $self->_inline_path( $path ) ?
@@ -68,6 +127,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -82,6 +143,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -89,17 +152,30 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( -e $path ) {
+ if ( $path =~ $re_html ) {
+ push @head, $path;
+ } elsif ( -e $path ) {
if ( $path =~ m/\.(?:js|css)$/ ) {
- push @{ $self->head }, $path;
+ push @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;
+}
+
+sub add_css {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
}
our $reload_counter = 0;
@@ -115,45 +191,79 @@
=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 $status_line = '';
- foreach my $part ( @{ $self->status } ) {
- confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH';
+
+ 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;
- } 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} );
}
}
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
+ my $body = $a->{body};
+ if ( ! $body ) {
+ my $run = $a->{run} || 'as_markup';
+ warn "# no body, invoke $self->$run";
+ $body = $self->$run;
+ }
+ 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 $svk = Frey::SVK->new;
+ my $info = $svk->info;
+ my $revision = $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->request_url . qq|
+ Frey $Frey::VERSION $revision
$status_line
+ $right
$2
$3]gs; # FIXME insert bless hiding back
+
+ $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;
- 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|| + ; +} + +=head1 Status line + +=head2 add_status + + $self->add_status( { name => { some => 'data' } } ); + + $self->add_status( "append to last status popup" ); + +=cut + +sub add_status { + my ( $self, $data ) = @_; + push @status, { 'X' => [ $self->backtrace ] }; + if ( ref($data) ) { + push @status, $data; + } else { + if ( defined $status[ $#status ] ) { + $status[ $#status ]->{ '+' } = $data; + } else { + push @status, { '+' => $data }; + } + } +} + +=head2 clean_status + +Called at beginning of each request + + $self->clean_status; + +=cut + +sub clean_status { + my ($self) = shift; + @head = ( 'static/frey.css' ); + @status = ( + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, + { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, + { 'INC' => Frey::INC->new->as_markup }, + ); + $icon_html = ''; +} + +=head2 status_parts + +Dump all status line parts + + $self->status_parts + +=cut + +sub status_parts { + warn "## status parts ", dump( map { keys %$_ } @status ); +} + +=for debug + +sub DEMOLISH { + my ( $self ) = @_; + warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status; +} + +=cut + +=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" if $self->debug; + return $path; + } else { + $self->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 $max = 50; + my $pos = 0; + my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines + my $line = 0; + my $multiline_end; + + open(my $log, '<', $path) || die "can't open $path: $!"; + while(<$log>) { + chomp; + $line++; + + my $style = ''; + +=for filter + + 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; + } + +=cut + if ( m{^(#*)\s+} ) { # FIXME + + $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 = '…' + } + $warnings[ $pos++ % $max ] + = $msg +# = ( $style ? qq|$msg| : $msg ) + . $spacer + . qq|+$line
but CSS hates me
+ }
+ }
+ close($log) || die "can't close $path: $!";
+
+ my $size = -s $path;
+
+ my $warnings = join('',
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. $max
+ );
+
+ my $s = length($warnings);
+
+ return
+ # need to wrap into span so we can have links in warnings
+ qq|warn|
+ . $warnings
+# . $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 at $path line $line|;
+ }
+ #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+ return @backtrace;
}
1;