--- trunk/lib/Frey/Web.pm	2008/11/26 17:36:02	538
+++ trunk/lib/Frey/Web.pm	2008/11/27 21:31:02	564
@@ -1,17 +1,19 @@
 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' => (
@@ -47,21 +49,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 +77,34 @@
 }
 
 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;
+	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*};
+
+	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|;
+	} else {
+		return qq|<span class="frey-$type">$name $content</span>\n|;
+	}
 }
 
 sub _inline_path {
@@ -126,7 +150,7 @@
 	return if ! defined $path || $path eq '';
 	$path =~ s!^/!!;
 
-	if ( $path =~ m{<.*>}s ) {
+	if ( $path =~ $re_html ) {
 		push @{ $self->head }, $path;
 	} elsif ( -e $path ) {
 		if ( $path =~ m/\.(?:js|css)$/ ) {
@@ -159,21 +183,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 = {@_};
@@ -186,6 +195,7 @@
 
 	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 ) {
@@ -208,25 +218,6 @@
 
 	$status_line .= $self->warnings_html;
 
-	my $inc_html;
-	{
-		my $inc;
-		map {
-			s{.pm$}{};
-			my $class = $_;
-			s[/][}->{]g;
-			$class =~ s[/][::]g;
-			eval '$inc->{' . $_ . '} = $class';
-		} sort keys %INC;
-		$inc_html = dump( $inc );
-		$inc_html =~ s{\s+=>\s+\d+}{}gs;
-		$inc_html =~ s{(['"]?)(\w+)\1\s+=>\s+(['"]?)([\w:]*\2)\3}{<a target="$4" href="/$4" title="$4">$2</a>}gs;
-		$inc_html =~ s{\s+=>\s+}{ }gs;
-		$inc_html =~ s{,}{}gs;
-	}
-
-	$status_line .= $self->popup( INC => "<small>$inc_html</small>" );
-
 	my	($exit,$description) = ('exit','stop server');
 		($exit,$description) = ('restart','restart server')
 		if $ENV{FREY_RESTART}; # tune labels on exit link
@@ -361,7 +352,7 @@
 		warn "# $class from $self icon_path $path";
 		return $path;
 	} else {
-		warn "TODO: add $path icon for $class";
+		$self->TODO( "add $path icon for $class" );
 		return undef;
 	}
 }
@@ -448,8 +439,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 = '&hellip;'
 			}
 			$msg =~ s{^\s}{&nbsp;}g;
@@ -466,4 +457,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 <a target="editor" href="/editor+$path+$line">$path</a>|;
+	}
+	warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+	return @backtrace;
+}
+
 1;