--- trunk/lib/Frey/Web.pm 2008/11/20 12:56:37 476
+++ trunk/lib/Frey/Web.pm 2008/11/26 16:17:17 535
@@ -7,11 +7,12 @@
use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess/;
+use Carp qw/confess cluck/;
use File::Slurp;
use Frey::Bookmarklet;
use Frey::ClassBrowser;
+use Frey::SVK;
has 'head' => (
is => 'rw',
@@ -19,16 +20,6 @@
default => sub { [ 'static/frey.css' ] },
);
-has 'status' => (
- is => 'rw',
- isa => 'ArrayRef[HashRef[Str]]',
- lazy => 1,
- default => sub { [
- { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
- { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
- ] },
-);
-
has 'request_url' => (
is => 'rw',
isa => 'Uri', coerce => 1,
@@ -59,19 +50,34 @@
documentation => 'Maximum dump size sent to browser before truncation',
);
-=head2 inline_smaller_than
-
-Inline JavaScript and CSS smaller than this size into page reducing
-round-trips to server.
-
-=cut
-
has 'inline_smaller_than' => (
is => 'rw',
isa => 'Int',
default => 10240,
+ documentation => 'Inline JavaScript and CSS to reduce round-trips',
+);
+
+has 'chop_warning' => (
+ is => 'rw',
+ isa => 'Int',
+ default => 80,
+ documentation => 'Crop lines longer',
);
+my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"');
+my $escape_re = join '|' => keys %escape;
+
+sub html_escape {
+ my ( $self, $html ) = @_;
+ $html =~ s/($escape_re)/$escape{$1}/g;
+ return $html;
+}
+
+sub html_dump {
+ my $self = shift;
+ $self->html_escape( dump( @_ ) );
+}
+
sub dom2html {
# warn "## dom2html ",dump( @_ );
return Continuity::Widget::DomNode->create( @_ )->to_string;
@@ -148,19 +154,25 @@
=cut
+our @status;
+sub status { @status };
+
+our $icon_html;
+
sub page {
my $self = shift;
my $a = {@_};
+ warn "## page ",dump($a);
+
$reload_counter++;
my $status_line = '';
- foreach my $part ( @{ $self->status } ) {
- if ( ref($part) ne 'HASH' ) {
- warn "part not hash ",dump( $part ) ;
- #$self->status( $part );
- next;
- }
+
+ 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 ) {
my $content = $part->{$name};
if ( ref($content) ) {
@@ -188,30 +200,38 @@
$body = '';
}
- $status_line
- .= qq||
- if $self->warnings;
+ $status_line .= $self->warnings_html;
+
+ my ($exit,$description) = ('exit','stop server');
+ ($exit,$description) = ('restart','restart server')
+ if $ENV{FREY_RESTART}; # tune labels on exit link
my $right =
qq|
- $url
+ reload
+ $exit
|;
+ my $info = Frey::SVK->info;
+ my $revision = Frey::SVK->info->{Revision} || '';
+ $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
+
+ $self->add_icon unless $icon_html;
+
my $html = join("\n",
qq|
|,
$self->_head_html,
'' . ( $self->title || $a->{title} || ref($self) ) . '',
'',
+ ( $icon_html || '' ),
( $a->{head} || '' ),
qq|
$body
-
Frey $Frey::VERSION
+
Frey $Frey::VERSION $revision
$status_line
$right
@@ -224,6 +244,35 @@
return $html;
}
+=head2 editor
+
+Create HTML editor link with optional line and title
+
+ my $html = $self->editor( $class, $line, $title );
+
+=cut
+
+sub editor {
+ my ( $self, $class, $line, $title ) = @_;
+ confess "need class" unless $class;
+ if ( ! defined $title ) {
+ $title = "edit $class";
+ $title .= " line $line" if $line;
+ }
+ $line ||= 1;
+ qq|$class|;
+}
+
+=head2 editor_links
+
+Create HTML links to editor for perl error message
+
+ my $html = $self->editor_links( $error )
+
+=cut
+
sub editor_links {
my ( $self, $error ) = @_;
@@ -251,4 +300,145 @@
;
}
+sub add_status {
+ my ( $self, $data ) = @_;
+ push @status, $data;
+}
+
+sub clean_status {
+ @status = ();
+ $icon_html = '';
+}
+
+sub status_parts {
+ warn "## status parts ", dump( map { keys %$_ } @status );
+}
+
+sub DEMOLISH {
+ my ( $self ) = @_;
+ warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
+}
+
+=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";
+ return $path;
+ } else {
+ warn "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||;
+ 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|| if -e $ico_path;
+
+=cut
+
+}
+
+my $warn_colors = {
+ '#' => '#444',
+ '##' => '#888',
+};
+
+my $multiline_markers = {
+ '(' => ')',
+ '{' => '}',
+ '[' => ']',
+ '"' => '"',
+};
+
+my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
+warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+
+sub log_path {
+ $Frey::Bootstrap::log_path || warn "no log_path?";
+}
+
+sub warnings_html {
+ my ($self,$level) = shift;
+ $level ||= $self->debug,
+ my $path = $self->log_path;
+
+ my $warnings;
+ my $line = 0;
+ my $multiline_end;
+
+ open(my $log, '<', $path) || die "can't open $path: $!";
+ while(<$log>) {
+ chomp;
+ $line++;
+
+ my $style = '';
+
+ if ( $multiline_end ) {
+ if ( m{^\Q$multiline_end\E} || m{^\s.+\Q$multiline_end\E;$} ) {
+ warn "## $line end of $multiline_end in '$_'\n";
+ undef $multiline_end;
+ } else {
+ warn "## $line skipped\n";
+ }
+ } elsif ( m{^(#*)\s+} ) {
+ my $l = $1 ? length($1) : 0;
+ if ( $l > $level ) {
+ undef $multiline_end;
+ $multiline_end = $multiline_markers->{$1} if m{($multiline_re)$};
+ warn "## $line start $1 .. $multiline_end level $l > $level for '$_'\n" if $multiline_end;
+ next;
+ }
+
+ $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 );
+ $spacer = '…'
+ }
+ $msg =~ s{^\s}{ }g;
+ $warnings .= qq|$msg$spacer+$line
|;
+ # FIXME should be but CSS hates me
+ }
+ }
+ close($log) || die "can't close $path: $!";
+
+ return
+ qq||
+ ;
+}
+
1;