--- trunk/lib/Frey/Web.pm 2008/11/27 21:31:02 564
+++ trunk/lib/Frey/Web.pm 2008/11/28 15:07:03 588
@@ -16,11 +16,8 @@
use Frey::SVK;
-has 'head' => (
- is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/frey.css' ] },
-);
+our @head;
+sub head { @head }
has 'request_url' => (
is => 'rw',
@@ -83,6 +80,7 @@
$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
";
}
@@ -98,10 +96,14 @@
$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;
if ( $name =~ m{::} && $name !~ $re_html ) {
return qq|$name $content\n|;
+ } elsif ( $name =~ s{^\s*($name $content\n|;
}
@@ -115,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 ) ?
@@ -151,10 +153,10 @@
$path =~ s!^/!!;
if ( $path =~ $re_html ) {
- push @{ $self->head }, $path;
+ 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";
}
@@ -165,6 +167,17 @@
}
+sub add_css {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
+}
+
our $reload_counter = 0;
@@ -193,10 +206,6 @@
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, { 'INC' => Frey::INC->new->as_markup };
-
foreach my $part ( @status ) {
foreach my $name ( keys %$part ) {
$status_line .= $self->popup( $name, $part->{$name} );
@@ -230,8 +239,9 @@
|;
- 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;
@@ -295,7 +305,7 @@
$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
{at $1 line $2}gsm;
- $error =~ s{(via package ")([\w:]+)(")}
+ $error =~ s{(via (?:package) "?)([\w:]+)("?)}
{$1$2$3}gsm;
return $error;
@@ -316,25 +326,70 @@
;
}
+=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, $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 {
- @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
@@ -349,7 +404,7 @@
$icon .= "/$variant" if $variant;
my $path = 'static/icons/' . $icon . '.png';
if ( -e $path ) {
- warn "# $class from $self icon_path $path";
+ warn "# $class from $self icon_path $path" if $self->debug;
return $path;
} else {
$self->TODO( "add $path icon for $class" );
@@ -406,7 +461,9 @@
$level ||= $self->debug,
my $path = $self->log_path;
- my $warnings;
+ my $max = 50;
+ my $pos = 0;
+ my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
my $line = 0;
my $multiline_end;
@@ -417,6 +474,8 @@
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";
@@ -433,6 +492,9 @@
next;
}
+=cut
+ if ( m{^(#*)\s+} ) { # FIXME
+
$style = $warn_colors->{$1}
? ' style="color:' . $warn_colors->{$1} . '"'
: '';
@@ -443,17 +505,30 @@
$msg = substr( $msg, 0, $self->html_dump_width );
$spacer = '…'
}
- $msg =~ s{^\s}{ }g;
- $warnings .= qq|$msg$spacer+$line
|;
+ $warnings[ $pos++ % $max ]
+ = $msg
+# = ( $style ? qq|$msg| : $msg )
+ . $spacer
+ . qq|+$line
|;
# FIXME should be 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
- qq||
+ # need to wrap into span so we can have links in warnings
+ qq||
;
}
@@ -479,7 +554,7 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package from $path $path|;
+ qq|via $package at $path line $line|;
}
warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;