--- trunk/lib/Frey/Web.pm 2008/11/30 23:19:06 652
+++ trunk/lib/Frey/Web.pm 2008/12/14 22:47:48 839
@@ -3,21 +3,22 @@
with 'Frey::Session';
-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 lib 'lib';
+
+use Frey::Types;
use Frey::Bookmarklet;
-use Frey::ClassBrowser;
+use Frey::Class::Browser;
use Frey::INC;
use Frey::SVK;
-use Text::Tabs; # expand, unexpand
-
our @head;
sub head { @head }
@@ -26,7 +27,7 @@
isa => 'Uri', coerce => 1,
required => 1,
default => sub {
- cluck "undefined request_url";
+ carp "undefined request_url";
'/';
},
);
@@ -86,14 +87,14 @@
$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
+# $dump =~ $self->html_links( $dump ); # FIXME include this
return "$dump";
}
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+).+?/\1|[^>]+/?)>}s; # relaxed html check for one semi-valid tag
sub popup_dropdown {
my ( $self, $type, $name, $content, $full ) = @_;
@@ -173,15 +174,48 @@
}
+sub _add_css_js {
+ my ( $self, $what, $content ) = @_;
+
+ my $tag = $what eq 'css' ? 'style' : 'script';
+ my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
+ my $head;
+
+ my ( $package, $path, $line ) = caller(1);
+
+ if ( $content =~ m{\.(js|css)} ) {
+ $content = "/$content" if -e $content;
+ if ( $what eq 'js' ) {
+ $head = qq|
+ <$tag type="$type" src="$content">
+ /* via $package at $path line $line */
+
+ |;
+ } else {
+ $head = qq|
+
+
+ |;
+ }
+ } else {
+ $head = qq|
+ <$tag type="$type">
+ /* via $package at $path line $line */
+ $content
+
+ |;
+ };
+ $self->add_head( $head );
+}
+
sub add_css {
my ($self,$css) = @_;
- my ( $package, $path, $line ) = caller;
- $self->add_head( qq|
-
- | );
+ $self->_add_css_js( 'css', $css );
+}
+
+sub add_js {
+ my ($self,$js) = @_;
+ $self->_add_css_js( 'js', $js );
}
our $reload_counter = 0;
@@ -249,7 +283,7 @@
|;
- my $svk = Frey::SVK->new( request_url => '/' );
+ my $svk = Frey::SVK->new;
my $info = $svk->info;
my $revision = $svk->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
@@ -301,41 +335,81 @@
qq|>$class|;
}
-=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)][$1$2$3]gs; # FIXME insert bless hiding back
+ # perl's backtrace
$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
- {at $1 line $2}gsm;
+ {at $1 line $2}gsm;
+
+ $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
+ {$1$2$3}gsm
+ || # or anything that looks like "Class::Name"
+ $error =~ s{"(\w+(?:::\w+)+)"}
+ {"$1"}gsm;
+
+ # method error messages
+ # FIXME replace with link to Frey::Introspect data
+ $error =~ s{(method ")(\w+)(" via)}
+ {$1$2$3}gsm;
+
+ # link paths to editor
+ $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
+ {$1}gsm;
- $error =~ s{(via (?:package) "?)([\w:]+)("?)}
- {$1$2$3}gsm;
+ $error =~ s{(class ")([\w:]+)(")}
+ {$1$2$3}gsm;
return $error;
}
+sub html_self {
+ my $self = shift;
+ my $html = $self;
+ $html =~ s{([\w:]+)=}{$1=}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
+
+=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||
- . $self->editor_links( $error ) .
- qq|
|
- ;
+ $self->add_icon('error');
+ $error = $self->html_links( $error );
+ return qq|$error $backtrace
| ;
}
=head1 Status line
@@ -373,11 +447,10 @@
sub clean_status {
my ($self) = shift;
@head = ( 'static/frey.css' );
- my $params = { request_url => $self->request_url };
@status = (
- { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },
- { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },
- { 'INC' => Frey::INC->new( %$params )->as_markup },
+ { '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 },
);
$icon_html = '';
}
@@ -412,24 +485,39 @@
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" );
+
+ sub icon_exists {
+ my $class = shift;
+ $class =~ s{::}{/}g;
+ $class .= "/$variant" if $variant;
+ my $icon_path = 'static/icons/' . $class . '.png';
+ return $icon_path if -e $icon_path;
+ return;
+ }
+
+ my $path = icon_exists( $class );
+ if ( ! $path ) {
+ my $super_class = $class;
+ while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
+ $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
+ }
+ }
+
+ if ( ! $path ) {
+ $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
return undef;
}
+
+ warn "# $class from $self icon_path $path" if $self->debug;
+ return $path;
}
sub add_icon {
my ($self,$variant) = @_;
- my $class = ref($self);
- $class = $self->class if $self->can('class');
+ my $class = $self->class if $self->can('class');
+ #$class ||= $self->title;
+ $class ||= ref($self);
my $icon_path = $self->icon_path( $class, $variant ) || return;
$icon_html .= qq||;
@@ -462,19 +550,31 @@
'"' => '"',
};
+=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 || die "no log_path?";
}
-our $last_log_pos = 0;
-our $last_log_line = 0;
-
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,
@@ -529,11 +629,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
-
- # Mojo seems to expand warn messages to full path which is annoying
- $msg =~ s{/[^/]+/\.\./}{/}gs;
- $msg =~ s{$pwd/*}{}gs;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -574,7 +670,7 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
;
}
@@ -592,7 +688,7 @@
my ($self) = @_;
my @backtrace;
- foreach ( 0 .. 5 ) {
+ foreach ( 1 .. 5 ) { # 0 = backtrace
my (
$package,$path,$line
# subroutine hasargs
@@ -601,10 +697,45 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package at $path line $line|;
+ qq|via "$package" at $path line $line|;
}
#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||;
+}
+
+=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;