--- trunk/lib/Frey/Web.pm 2008/11/28 23:34:26 611 +++ trunk/lib/Frey/Web.pm 2008/11/30 16:21:07 644 @@ -24,7 +24,11 @@ has 'request_url' => ( is => 'rw', isa => 'Uri', coerce => 1, - default => '/', + required => 1, + default => sub { + cluck "undefined request_url"; + '/'; + }, ); has 'title' => ( @@ -63,7 +67,7 @@ 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 => 120, + default => 250, ); my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); @@ -241,7 +245,7 @@ qq| reload - $exit + $exit |; @@ -369,10 +373,11 @@ sub clean_status { my ($self) = shift; @head = ( 'static/frey.css' ); + my $params = { request_url => $self->request_url }; @status = ( - { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup }, - { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - { 'INC' => Frey::INC->new->as_markup }, + { '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 }, ); $icon_html = ''; } @@ -461,7 +466,7 @@ warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re"; sub log_path { - $Frey::Bootstrap::log_path || warn "no log_path?"; + $Frey::Bootstrap::log_path || die "no log_path?"; } sub warnings_html { @@ -491,6 +496,8 @@ chomp; $line++; + next if m{^\s+(Mojo|Class::MOP|Moose)::}; + my $style = ''; =for filter @@ -532,8 +539,10 @@ $msg = qq|$msg|; } - $msg .= $spacer . - qq|+$line\n|; + #$msg .= $spacer . qq|$line\n|; + $msg = qq|$line$msg| + . ( $spacer ? $spacer : '' ) + . "\n"; # XXX
 needs this
 
 			$warnings[ $pos++ % $max ] = $msg;
 		}
@@ -544,7 +553,7 @@
 	my $size = -s $path;
 
 	my $warnings = join("",
-		map { $warnings[ ( $pos + $_ ) % $max ] || '' } 1 .. $max 
+		map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
 	);
 
 	my $s = length($warnings);