$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+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
sub popup_dropdown {
my ( $self, $type, $name, $content, $full ) = @_;
@@ -115,9 +132,11 @@
}
}
-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 {
@@ -126,12 +145,14 @@
foreach my $path ( @head ) {
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m/\.css$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m{<.+>}s ) {
$out .= $path;
@@ -173,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
+
+ |;
+ } 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|
+
+
+ |;
+ }
+ } 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|
-
- | );
+ $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 => '',
body => 'Page Body',
@@ -200,14 +262,10 @@
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 = '';
@@ -227,7 +285,7 @@
warn "# no body, invoke $self->$run on ", ref($self);
$body = $self->$run;
}
- if ( $self->content_type !~ m{html} ) {
+ if ( $self->content_type !~ m{html} || ! $self->wrap_in_page ) {
warn "# return only $self body ", $self->content_type;
return $body
} elsif ( ! defined $body ) {
@@ -243,7 +301,7 @@
my $right =
qq|
-
+
reload
$exit
@@ -254,23 +312,41 @@
my $revision = $svk->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
- $self->add_icon unless $icon_html;
+ $status_line = $ENV{FREY_DEV} ? qq|
+ $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| - . $self->editor_links( $error ) . - qq|| - ; + $self->add_icon('error'); + $error = $self->html_links( $error ); + return qq|
$error $backtrace| ; } =head1 Status line @@ -350,8 +470,8 @@ sub add_status { my ( $self, $data ) = @_; - push @status, { 'X' => [ $self->backtrace ] }; - if ( ref($data) ) { + die "no data" unless $data; + if ( ref $data ) { push @status, $data; } else { if ( defined $status[ $#status ] ) { @@ -366,19 +486,19 @@ Called at beginning of each request - $self->clean_status; + $self->setup_request; =cut -sub clean_status { +sub setup_request { my ($self) = shift; + warn "## clean_status"; @head = ( 'static/frey.css' ); @status = ( - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->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 }, + { 'INC' => Frey::INC->new->as_markup }, ); - $icon_html = ''; } =head2 status_parts @@ -402,53 +522,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||; - 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', @@ -461,19 +534,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, @@ -528,11 +613,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 ); @@ -573,7 +654,7 @@ return # need to wrap editor link into span so we can have links in warnings qq|warn
|
- . $self->editor_links( $warnings )
+ . $self->html_links( $warnings )
. qq|
|
;
}
@@ -591,7 +672,7 @@
my ($self) = @_;
my @backtrace;
- foreach ( 0 .. 5 ) {
+ foreach ( 1 .. 5 ) { # 0 = backtrace
my (
$package,$path,$line
# subroutine hasargs
@@ -600,10 +681,47 @@
) = 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;
+}
+
+no Moose::Role;
+
1;