--- trunk/lib/Frey/Web.pm	2008/11/28 00:30:03	577
+++ trunk/lib/Frey/Web.pm	2009/06/30 13:58:38	1124
@@ -1,27 +1,35 @@
 package Frey::Web;
 use Moose::Role;
 
-with 'Frey::Session';
+with 'Frey::Session', 'Frey::Class::Icon';
 
-use Frey::Types;
-
-#use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess cluck carp/;
 use File::Slurp;
+use Text::Tabs; # expand, unexpand
+use Digest::MD5 qw/md5/;
+
+use lib 'lib';
+
+use Frey::Types;
 
 use Frey::Bookmarklet;
-use Frey::ClassBrowser;
+use Frey::Class::Browser;
 use Frey::INC;
 
 use Frey::SVK;
 
-our @head = ( 'static/frey.css' );
+our @head;
+sub head { @head }
 
 has 'request_url' => (
 	is => 'rw',
 	isa => 'Uri', coerce => 1,
-	default => '/',
+	required => 1,
+	default => sub {
+		carp "undefined request_url";
+		'/';
+	},
 );
 
 has 'title' => (
@@ -60,7 +68,14 @@
 	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,
+	default => 250,
+);
+
+has 'wrap_in_page' => (
+	documentation => 'wrap full html page with status bar around content',
+	is => 'rw',
+	isa => 'Bool',
+	default => 1,
 );
 
 my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
@@ -68,10 +83,19 @@
 
 sub html_escape {
 	my ( $self, $html ) = @_;
+	return '' unless defined $html;
 	$html =~ s/($escape_re)/$escape{$1}/g;
 	return $html;
 }
 
+# from Mojo::ByteStream
+sub url_escape {
+	my ( $self, $url, $pattern ) = @_;
+	$pattern ||= 'A-Za-z0-9\-\.\_\~';
+	$url =~ s/([^$pattern])/sprintf('%%%02X',ord($1))/ge;
+	return $url;
+}
+
 sub html_dump {
 	my ( $self, $dump ) = @_;
 	$dump = dump( $dump ) if ref($dump);
@@ -79,13 +103,14 @@
 	$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->html_links( $dump ); # FIXME include this
 	return "<code>$dump</code>";
 }
 
 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
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
 
 sub popup_dropdown {
 	my ( $self, $type, $name, $content, $full ) = @_;
@@ -94,18 +119,24 @@
 
 	$content = qq|<span>$content</span>| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*};
 
-	warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
+	$content =~ s{<span>(<code>[^<]+</code>)</span>}{$1} && $self->TODO("code wrapped in span");
+
+	warn "## $type [$name] = ", length( $content ), " bytes"; # if $self->debug; # FIXME
 
 	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 {
+sub _inline {
 	my ( $self, $path ) = @_;
-	-s $path < $self->inline_smaller_than;
+	return unless defined $path;
+	warn "# _inline $path";
+	-e $path && -s $path < $self->inline_smaller_than && -s $path;
 }
 
 sub _head_html {
@@ -114,12 +145,14 @@
 	foreach my $path ( @head ) {
 		$path =~ s!^/!!;
 		if ( $path =~ m/\.js$/ ) {
-			$out .= $self->_inline_path( $path ) ?
-				qq|<!-- $path --><script type="text/javascript">\n| . read_file($path) . qq|\n</script>| :
+			my $size;
+			$out .= $size = _inline( $path ) ?
+				qq|<script type="text/javascript">\n/* inline $path $size bytes */\n\n| . read_file($path) . qq|\n</script>| :
 				qq|<script type="text/javascript" src="/$path"></script>|;
 		} elsif ( $path =~ m/\.css$/ ) {
-			$out .= $self->_inline_path( $path ) ?
-				qq|<!-- $path --><style type="text/css">\n| . read_file( $path ) . qq|\n</style>| :
+			my $size;
+			$out .= $size = _inline( $path ) ?
+				qq|<style type="text/css">\n/* inline $path $size bytes */\n\n| . read_file( $path ) . qq|\n</style>| :
 				qq|<link type="text/css" rel="stylesheet" href="/$path" media="screen">|;
 		} elsif ( $path =~ m{<.+>}s ) {
 			$out .= $path;
@@ -161,23 +194,64 @@
 
 }
 
+sub _add_css_js {
+	my ( $self, $what, $content ) = @_;
+
+	my $md5 = md5( $content );
+	return if $self->{_add_css_js_seen}->{$what}->{$md5}++;
+
+	my $tag  = $what eq 'css' ? 'style'    : 'script';
+	my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
+	my $head;
+
+	my ( $package, $path, $line ) = caller(1);
+
+	$content = "/$content" if $content !~ m{[\n\r]} && -e $content;
+	if ( $content =~ $re_html && $what ne 'js' ) {
+		$head = qq|
+			$content
+			<!-- $type via $package at $path line $line -->
+		|;
+	} elsif ( $content =~ m{^(/\w+|https?://)} && $content !~ m{[\n\r]} ) {
+		if ( $what eq 'js' ) {
+			$head = qq|
+				<$tag type="$type" src="$content">
+				/* $what via $package at $path line $line */
+				</$tag>
+			|;
+		} else {
+			$head = qq|
+				<link rel="stylesheet" type="$type" href="$content">
+				<!-- $what via $package at $path line $line -->
+			|;
+		}
+	} else {
+		$head = qq|
+			<$tag type="$type">
+			/* via $package at $path line $line */
+			$content
+			</$tag>
+		|;
+	};
+	$self->add_head( $head );
+}
+
 sub add_css {
 	my ($self,$css) = @_;
-	my ( $package, $path, $line ) = caller;
-	$self->add_head( qq|
-	<style type="text/css">
-	/* via package $package at $path line $line */
-	$css
-	</style>
-	| );
+	$self->_add_css_js( 'css', $css );
+}
+
+sub add_js {
+	my ($self,$js) = @_;
+	$self->_add_css_js( 'js', $js );
 }
 
 our $reload_counter = 0;
 
 
-=head2 page
+=head2 html_page
 
-  $self->page(
+  $self->html_page(
   	title => 'page title',
 	head  => '<!-- optional head markup -->',
 	body  => '<b>Page Body</b>',
@@ -188,22 +262,14 @@
 our @status;
 sub status { @status };
 
-our $icon_html;
-
-sub page {
+sub html_page {
 	my $self = shift;
 	my $a = {@_};
 
-	warn "## page ",dump($a);
-
 	$reload_counter++;
 
 	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} );
@@ -214,8 +280,12 @@
 	$url =~ s{\?reload=\d+}{};
 
 	my $body = $a->{body};
-	$body ||= $self->as_markup if $self->can('as_markup');
-	if ( $self->content_type !~ m{html} ) {
+	if ( ! $body ) {
+		my $run = $a->{run} || 'as_markup';
+		warn "# no body, invoke $self->$run on ", ref($self);
+		$body = $self->$run;
+	}
+	if ( $self->content_type !~ m{html} || ! $self->wrap_in_page ) {
 		warn "# return only $self body ", $self->content_type;
 		return $body
 	} elsif ( ! defined $body ) {
@@ -231,9 +301,9 @@
 
 	my $right =
 		qq|
-			<span class="right">
+			<span class="frey-status-right">
 			<a title="reload $url"  href="/reload$url">reload</a>
-			<a title="$description" href="/exit$url">$exit</a>
+			<a title="$description" href="/exit$url" target="exit">$exit</a>
 			</span>
 		|;
 
@@ -242,14 +312,28 @@
 	my $revision = $svk->info->{Revision} || '';
 	$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
 
-	$self->add_icon unless $icon_html;
+	$self->add_icon;
+
+	my $title = undef
+		|| $a->{title}
+		|| $self->title
+		|| ref($self)
+		;
+
+#	$title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+
+	$self->add_css(qq|
+		body {
+			padding-bottom: 3em; /* don't overlap status line */
+		}
+	|);
 
 	my $html = join("\n",
 		qq|<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html><head>|,
 		$self->_head_html,
-		'<title>' . ( $self->title || $a->{title} || ref($self) ) . '</title>',
+		qq|<title>$title</title>|,
 		'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">',
-		( $icon_html || '<!-- no icon -->' ),
+		( $self->icon_html ),
 		( $a->{head} || '' ),
 		qq|
 		</head><body>
@@ -289,46 +373,88 @@
 	qq|>$class</a>|;
 }
 
-=head2 editor_links
+=head2 html_links
 
 Create HTML links to editor for perl error message
 
-  my $html = $self->editor_links( $error )
+  my $html = $self->html_links( $error )
 
 =cut
 
-sub editor_links {
+sub html_links {
 	my ( $self, $error ) = @_;
 
+	$error = $self->strip_full_path( $error );
+
+#	$error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
+
+	# perl's backtrace
 	$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
-		{at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;
+		{at <a target="editor" href="/editor+$1+$2" title="vi $1 +$2">$1</a> line $2}gsm;
+
+	$error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
+		{$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm
+	|| # or anything that looks like "Class::Name"
+	$error =~ s{"(\w+(?:::\w+)+)"}
+		{"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
+
+	# method error messages
+	# FIXME replace with link to Frey::Introspect data
+	$error =~ s{(method ")(\w+)(" via)}
+		{$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
+
+	# link paths to editor
+	$error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
+		{<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
 
-	$error =~ s{(via package ")([\w:]+)(")}
-		{$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;
+	$error =~ s{(class ")([\w:]+)(")}
+		{$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
 
 	return $error;
 }
 
+sub html_self {
+	my $self = shift;
+	my $html = $self;
+	$html =~ s{([\w:]+)=}{<a target="$1" href="/$1" title="introspect $1">$1</a>=}gsm;
+	return $html;
+}
+
+=head2 error
+
+This method will return error to browser and backtrace unless
+error message ends with LF C<\n> just like L<warn>
+
+=cut
+
 sub error {
 	my $self = shift;
 	my $error = join(" ", @_);
 
-	my @backtrace = $self->backtrace;
-	$error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+	my $fatal = '';
+	my $backtrace = '';
+
+	if ( $error !~ m{\n$} ) {
+		if ( my @backtrace = $self->backtrace ) {
+			$backtrace =
+				  "\n" . $self->html_self . "->error backtrace\n\t"
+				. $self->html_links( join( "\n\t", @backtrace ) )
+				;
+			$fatal = qq| frey-fatal|;
+		}
+	}
 
 	warn "ERROR: $error\n";
-	return
-		qq|<pre class="frey-error">|
-		. $self->editor_links( $error ) .
-		qq|</pre>|
-		;
+	$self->add_icon('error');
+	$error = $self->html_links( $error );
+	return qq|<pre class="frey-error$fatal">$error $backtrace</pre>| ;
 }
 
 =head1 Status line
 
 =head2 add_status
 
-  $self->add_status( name => { some => 'data' } );
+  $self->add_status( { name => { some => 'data' } } );
 
   $self->add_status( "append to last status popup" );
 
@@ -336,10 +462,15 @@
 
 sub add_status {
 	my ( $self, $data ) = @_;
-	if ( ref($data) ) {
+	die "no data" unless $data;
+	if ( ref $data  ) {
 		push @status, $data;
 	} else {
-		$status[ $#status ]->{added} = $data;
+		if ( defined $status[ $#status ] ) {
+			$status[ $#status ]->{ '+' } = $data;
+		} else {
+			push @status, { '+' => $data };
+		}
 	}
 }
 
@@ -353,9 +484,13 @@
 
 sub clean_status {
 	my ($self) = shift;
-	@head = ();
-	@status = ();
-	$icon_html = '';
+	warn "## clean_status";
+	@head = ( 'static/frey.css' );
+	@status = (
+		{ 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
+		{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+		{ 'INC' => Frey::INC->new->as_markup },
+	);
 }
 
 =head2 status_parts
@@ -379,53 +514,6 @@
 
 =cut
 
-=head2 add_icon
-
-  Frey::Foo->add_icon;            # /static/icons/Frey/Foo.png
-  Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png
-
-=cut
-
-sub icon_path {
-	my ($self,$class,$variant) = @_;
-	my $icon = $class;
-	$icon =~ s{::}{/}g;
-	$icon .= "/$variant" if $variant;
-	my $path = 'static/icons/' . $icon . '.png';
-	if ( -e $path ) {
-		warn "# $class from $self icon_path $path" if $self->debug;
-		return $path;
-	} else {
-		$self->TODO( "add $path icon for $class" );
-		return undef;
-	}
-}
-
-sub add_icon {
-	my ($self,$variant) = @_;
-
-	my $class = ref($self);
-	$class = $self->class if $self->can('class');
-	my $icon_path = $self->icon_path( $class, $variant ) || return;
-
-	$icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;
-	warn "# using icon $icon_path";
-
-=for later
-
-	# FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
-	my $ico_path = $icon_path;
-	$ico_path =~ s{png$}{ico};
-	if ( ! -e $ico_path ) {
-		system "convert $icon_path $ico_path";
-		warn "# convert $icon_path $ico_path : $@";
-	}
-	$icon_html .= qq|<link rel="shortcut icon" type="image/x-icon" href="/$ico_path">| if -e $ico_path;
-
-=cut
-
-}
-
 my $warn_colors = {
 	'#'  => '#444',
 	'##' => '#888',
@@ -438,29 +526,65 @@
 	'"' => '"',
 };
 
+=for later
+
 my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
 warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
 
+=cut
+
 sub log_path {
-	$Frey::Bootstrap::log_path || warn "no log_path?";
+	$Frey::Bootstrap::log_path || die "no log_path?";
 }
 
+our $pwd = `pwd`;
+chomp $pwd;
+
+sub strip_full_path {
+	my ($self, $msg) = @_;
+	# Mojo seems to expand warn messages to full path which is annoying
+	$msg =~ s{/[^/]+/\.\./}{/}gs;
+	$msg =~ s{$pwd/*}{}gs;
+	return $msg;
+}
+
+our $last_log_pos  = 0;
+our $last_log_line = 0;
+
 sub warnings_html {
 	my ($self,$level) = shift;
 	$level ||= $self->debug,
 	my $path = $self->log_path;
 
-	my $warnings;
-	my $line = 0;
+	my $max = 30;
+	my $pos = 0;
+	my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
+	my $line = $last_log_line;
 	my $multiline_end;
 
-	open(my $log, '<', $path) || die "can't open $path: $!";
+	# XXX do we really want to do this every time?
+	my $css = qq|/* short css classes for levels */\n|;
+	my $level_to_class;
+	foreach ( keys %$warn_colors ) {
+		my $l = length($_);
+		my $class = 'l' . $l;
+		$css .= qq|.$class { color: $warn_colors->{$_} }\n|;
+		$level_to_class->{ $_ } = $class;
+	}
+	$self->add_css( $css );
+
+	open(my $log, '<', $path)    || die "can't open $path: $!";
+	seek($log, $last_log_pos, 0) || warn "can't seek: $!";
 	while(<$log>) {
 		chomp;
 		$line++;
 
+		next if m{^\s+(Mojo|Class::MOP|Moose)::};
+
 		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";
@@ -477,27 +601,53 @@
 				next;
 			}
 
-			$style = $warn_colors->{$1}
-				? ' style="color:' . $warn_colors->{$1} . '"'
-				: '';
+=cut
+		if ( m{^(#*)} ) {
+
+			my $level = $1;
+			my $msg = $self->strip_full_path( $_ );
 
-			my $msg = $self->html_escape( $_ );
 			my $spacer = ' ';
-			if ( length($msg) > $self->html_dump_width ) {
-				$msg = substr( $msg, 0, $self->html_dump_width );
+			my $real_msg = expand( $msg );
+			if ( length($real_msg) > $self->html_dump_width ) {
+				
+				$real_msg = substr( $msg, 0, $self->html_dump_width );
+				$msg = unexpand( $real_msg );
 				$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/>|;
-			# FIXME <tt> should be <code> but CSS hates me
+
+			$msg = $self->html_escape( $msg );
+
+			if ( my $class = $level_to_class->{ $level } ) {
+				$msg = qq|<span class="$class">$msg</span>|;
+			}
+
+			#$msg .= $spacer . qq|<a target="editor" href="/editor+$path+$line" style="float: right;">$line</a>\n|;
+			$msg = qq|<a target="editor" href="/editor+$path+$line" style="float: right;">$line</a>$msg|
+				. ( $spacer ? $spacer : '' )
+				. "\n"; # XXX <pre> needs this
+
+			$warnings[ $pos++ % $max ] = $msg;
 		}
 	}
+	$last_log_pos = tell($log);
+	$last_log_line = $line;
+	warn "log has $line lines tell position $last_log_pos";
 	close($log) || die "can't close $path: $!";
 
+	my $size = -s $path;
+
+	my $warnings = join("",
+		map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
+	);
+
+	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 editor link 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>|
+		. $self->html_links( $warnings )
+		. qq|</code></span>|
 		;
 }
 
@@ -514,7 +664,7 @@
 	my ($self) = @_;
 
 	my @backtrace;
-	foreach ( 0 .. 5 ) {
+	foreach ( 1 .. 5 ) { # 0 = backtrace
 		my (
 			$package,$path,$line
 			# subroutine hasargs
@@ -523,10 +673,45 @@
 		) = caller($_) or last;
 
 		push @backtrace,
-			qq|via package $package at $path line $line|;
+			qq|via "$package" at $path line $line|;
 	}
-	warn "# backtrace: ", dump( @backtrace ) if @backtrace;
+	#warn "# backtrace: ", dump( @backtrace ) if @backtrace;
 	return @backtrace;
 }
 
+=head2 checkbox
+
+Generate checkbox html markup from some attribute
+
+  my $html = $self->checkbox('attribute_name', $value);
+
+=cut
+
+sub checkbox {
+	my ($self,$name,$value) = @_;
+	my $checked = '';
+	my $all_checkboxes = eval { $self->$name };
+	warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
+	$all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
+	$checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
+	warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
+	qq|<input name="$name" value="$value" type="checkbox"$checked>|;
+}
+
+=head2 strip
+
+Strip whitespace around content
+
+  my $stripped = strip('  no more whitespace around this   ');
+
+=cut
+
+sub strip {
+	my $t = shift;
+	$t =~ s{^\s+}{}gs;
+	$t =~ s{>\s+<}{><}gs;
+	$t =~ s{\s+$}{}gs;
+	return $t;
+}
+
 1;