--- trunk/lib/Frey/Web.pm 2008/11/25 17:15:18 519
+++ trunk/lib/Frey/Web.pm 2008/11/28 00:42:35 578
@@ -1,24 +1,22 @@
package Frey::Web;
use Moose::Role;
-with 'Frey::Backtrace';
+with 'Frey::Session';
use Frey::Types;
-use Continuity::Widget::DomNode;
+#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess cluck/;
use File::Slurp;
use Frey::Bookmarklet;
use Frey::ClassBrowser;
+use Frey::INC;
+
use Frey::SVK;
-has 'head' => (
- is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/frey.css' ] },
-);
+our @head;
has 'request_url' => (
is => 'rw',
@@ -47,25 +45,62 @@
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,
);
-sub dom2html {
-# warn "## dom2html ",dump( @_ );
- return Continuity::Widget::DomNode->create( @_ )->to_string;
+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 _inline_path {
@@ -76,7 +111,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 ) ?
@@ -111,11 +146,11 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( $path =~ m{<.*>}s ) {
- push @{ $self->head }, $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";
}
@@ -126,6 +161,17 @@
}
+sub add_css {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
+}
+
our $reload_counter = 0;
@@ -142,6 +188,8 @@
our @status;
sub status { @status };
+our $icon_html;
+
sub page {
my $self = shift;
my $a = {@_};
@@ -153,20 +201,12 @@
my $status_line = '';
unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup };
- unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->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} );
}
}
@@ -183,26 +223,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,15 +237,19 @@
|;
- my $info = Frey::SVK->info;
- my $revision = Frey::SVK->info->{Revision} || '';
+ 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|
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 $package at $path line $line|;
+ }
+ warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+ return @backtrace;
}
1;