--- trunk/lib/Frey/Web.pm 2008/11/26 18:02:38 540
+++ 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;
@@ -49,21 +47,22 @@
is => 'rw',
isa => 'Int',
default => 4096,
- documentation => 'Maximum dump size sent to browser before truncation',
+ 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',
+ documentation => 'inline JavaScript and CSS to reduce round-trips',
);
-has 'chop_warning' => (
+has 'html_dump_width' => (
+ documentation => 'crop longer lines in dumps',
is => 'rw',
isa => 'Int',
- default => 80,
- documentation => 'Crop lines longer',
+# 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 = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"');
@@ -76,8 +75,13 @@
}
sub html_dump {
- my $self = shift;
- $self->html_escape( 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 {
@@ -161,19 +165,27 @@
our $icon_html;
-sub popup {
- my ( $self, $name, $content, $full ) = @_;
+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 = '' . dump($content) . '
';
- my $l = length($content);
- $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes;
+ $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 "## popup [$name] = ", length( $content ), " bytes" if $self->debug;
- return qq|\n|;
+ 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 {
@@ -432,8 +444,8 @@
my $msg = $self->html_escape( $_ );
my $spacer = ' ';
- if ( length($msg) > $self->chop_warning ) {
- $msg = substr( $msg, 0, $self->chop_warning );
+ if ( length($msg) > $self->html_dump_width ) {
+ $msg = substr( $msg, 0, $self->html_dump_width );
$spacer = '…'
}
$msg =~ s{^\s}{ }g;
@@ -450,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;