--- trunk/lib/Frey/Web.pm 2008/11/26 07:57:12 532
+++ trunk/lib/Frey/Web.pm 2008/11/26 19:43:03 543
@@ -1,8 +1,6 @@
package Frey::Web;
use Moose::Role;
-with 'Frey::Backtrace';
-
use Frey::Types;
use Continuity::Widget::DomNode;
@@ -12,6 +10,8 @@
use Frey::Bookmarklet;
use Frey::ClassBrowser;
+use Frey::INC;
+
use Frey::SVK;
has 'head' => (
@@ -47,22 +47,43 @@
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 dom2html {
# warn "## dom2html ",dump( @_ );
return Continuity::Widget::DomNode->create( @_ )->to_string;
@@ -144,6 +165,29 @@
our $icon_html;
+sub popup { my $self = shift; $self->popup_dropdown('popup', @_); }
+sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
+
+sub popup_dropdown {
+ my ( $self, $type, $name, $content, $full ) = @_;
+
+ if ( ref($content) ) {
+ $content = $self->html_dump($content);
+# my $l = length($content);
+# $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes;
+ } else {
+ $content = qq|$content|;
+ }
+
+ warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
+
+ if ( $name =~ m{::} && ! $name =~ m{<(\w+).+?/\1>} ) {
+ return qq|$name $content\n|;
+ } else {
+ return qq|$name $content\n|;
+ }
+}
+
sub page {
my $self = shift;
my $a = {@_};
@@ -155,20 +199,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|\n|;
+ $status_line .= $self->popup( $name, $part->{$name} );
}
}
@@ -357,9 +393,9 @@
};
my $multiline_markers = {
- '(' => '\)',
+ '(' => ')',
'{' => '}',
- '[' => '\]',
+ '[' => ']',
'"' => '"',
};
@@ -372,7 +408,7 @@
sub warnings_html {
my ($self,$level) = shift;
- $level ||= $self->debug;
+ $level ||= $self->debug,
my $path = $self->log_path;
my $warnings;
@@ -384,25 +420,36 @@
chomp;
$line++;
- if ( $multiline_end ) {
- undef $multiline_end if m{^$multiline_end};
- next;
- }
-
my $style = '';
- if ( m{^(#*)\s+} ) {
+ 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;
- $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;
+ 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} . '"'
: '';
- $warnings .= qq|$_ +$line
|;
+ 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
}
}
@@ -415,4 +462,32 @@
;
}
+
+=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;