--- trunk/lib/Frey/Web.pm	2008/11/26 16:34:25	537
+++ trunk/lib/Frey/Web.pm	2008/11/28 15:07:03	588
@@ -1,24 +1,23 @@
 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;
+sub head { @head }
 
 has 'request_url' => (
 	is => 'rw',
@@ -47,21 +46,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 = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
@@ -74,13 +74,39 @@
 }
 
 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}{&hellip;}gs;
+#	$dump =~ $self->editor_links( $dump ); # FIXME include this
+	return "<code>$dump</code>";
 }
 
-sub dom2html {
-#	warn "## dom2html ",dump( @_ );
-	return Continuity::Widget::DomNode->create( @_ )->to_string;
+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|<span>$content</span>| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*};
+
+	$content =~ s{<span>(<code>[^<]+</code>)</span>}{$1} && $self->TODO("code wrapped in span");
+
+	warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
+
+	if ( $name =~ m{::} && $name !~ $re_html ) {
+		return qq|<a class="frey-$type" target="$name" href="/$name">$name $content</a>\n|;
+	} elsif ( $name =~ s{^\s*(<a)\s+}{$1 class="frey-$type"} ) {
+		return qq|$name $content\n|;
+	} else {
+		return qq|<span class="frey-$type">$name $content</span>\n|;
+	}
 }
 
 sub _inline_path {
@@ -91,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 ) ?
@@ -126,11 +152,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";
 		}
@@ -141,6 +167,17 @@
 
 }
 
+sub add_css {
+	my ($self,$css) = @_;
+	my ( $package, $path, $line ) = caller;
+	$self->add_head( qq|
+	<style type="text/css">
+	/* via $package at $path line $line */
+	$css
+	</style>
+	| );
+}
+
 our $reload_counter = 0;
 
 
@@ -159,21 +196,6 @@
 
 our $icon_html;
 
-sub popup {
-	my ( $self, $name, $content, $full ) = @_;
-
-	if ( ref($content) ) {
-		$content = '<code>' . dump($content) . '</code>';
-		my $l = length($content);
-		$content = qq|<span>$l bytes</span>| if ! $full && $l > $self->dump_max_bytes;
-	} else {
-		$content = qq|<span>$content</span>|;
-	}
-
-	warn "## popup [$name] = ", length( $content ), " bytes" if $self->debug;
-	return qq|<span class="frey-popup">$name $content</span>\n|;
-}
-
 sub page {
 	my $self = shift;
 	my $a = {@_};
@@ -184,9 +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 };
-
 	foreach my $part ( @status ) {
 		foreach my $name ( keys %$part ) {
 			$status_line .= $self->popup( $name, $part->{$name} );
@@ -208,8 +227,6 @@
 
 	$status_line .= $self->warnings_html;
 
-	$status_line .= $self->popup( INC => { %INC }, 1 );
-
 	my	($exit,$description) = ('exit','stop server');
 		($exit,$description) = ('restart','restart server')
 		if $ENV{FREY_RESTART}; # tune labels on exit link
@@ -222,8 +239,9 @@
 			</span>
 		|;
 
-	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;
@@ -287,7 +305,7 @@
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
 		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
 
-	$error =~ s{(via package ")([\w:]+)(")}
+	$error =~ s{(via (?:package) "?)([\w:]+)("?)}
 		{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
 
 	return $error;
@@ -308,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
@@ -341,10 +404,10 @@
 	$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 {
-		warn "TODO: add $path icon for $class";
+		$self->TODO( "add $path icon for $class" );
 		return undef;
 	}
 }
@@ -398,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;
 
@@ -409,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";
@@ -425,28 +492,72 @@
 				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->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 = '&hellip;'
 			}
-			$msg =~ s{^\s}{&nbsp;}g;
-			$warnings .= qq|<tt$style>$msg</tt>$spacer<small><a target="editor" href="/editor+$path+$line">+$line</a></small><br/>|;
+			$warnings[ $pos++ % $max ]
+				= $msg
+#				= ( $style ? qq|<span$style>$msg</span>| : $msg )
+				. $spacer
+				. qq|<a target="editor" href="/editor+$path+$line" style="float: right;">+$line</a><br/>|;
 			# FIXME <tt> should be <code> 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|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="open $path level $level">warn</a><span>|
-		. $self->editor_links( $warnings )
-		. qq|</span></span>|
+		# need to wrap into span so we can have links in warnings
+		  qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|
+		. $warnings
+#		. $self->editor_links( $warnings )
+		. qq|</code></span></a>|
 		;
 }
 
+
+=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;