+
+=cut
+
sub error {
my $self = shift;
my $error = join(" ", @_);
- my @backtrace = $self->backtrace;
- $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+ my $fatal = '';
+
+ if ( $error !~ m{\n$} ) {
+ if ( my @backtrace = $self->backtrace ) {
+ $error .= "\n\t" . join( "\n\t", @backtrace );
+ $fatal = qq| frey-fatal|;
+ }
+ }
warn "ERROR: $error\n";
return
- qq||
- . $self->editor_links( $error ) .
+ qq||
+ . $self->html_links( $error ) .
qq|
|
;
}
@@ -373,11 +418,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 = '';
}
@@ -413,6 +457,7 @@
sub icon_path {
my ($self,$class,$variant) = @_;
my $icon = $class;
+ $icon ||= $self->title;
$icon =~ s{::}{/}g;
$icon .= "/$variant" if $variant;
my $path = 'static/icons/' . $icon . '.png';
@@ -462,13 +507,28 @@
'"' => '"',
};
+=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 $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;
@@ -526,7 +586,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -567,7 +627,7 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
;
}
@@ -594,10 +654,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;