/[Frey]/branches/zimbardo/lib/Frey/Web.pm
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /branches/zimbardo/lib/Frey/Web.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 611 by dpavlin, Fri Nov 28 23:34:26 2008 UTC revision 653 by dpavlin, Sun Nov 30 23:49:32 2008 UTC
# Line 7  use Frey::Types; Line 7  use Frey::Types;
7    
8  #use Continuity::Widget::DomNode;  #use Continuity::Widget::DomNode;
9  use Data::Dump qw/dump/;  use Data::Dump qw/dump/;
10  use Carp qw/confess cluck/;  use Carp qw/confess cluck carp/;
11  use File::Slurp;  use File::Slurp;
12    
13  use Frey::Bookmarklet;  use Frey::Bookmarklet;
# Line 24  sub head { @head } Line 24  sub head { @head }
24  has 'request_url' => (  has 'request_url' => (
25          is => 'rw',          is => 'rw',
26          isa => 'Uri', coerce => 1,          isa => 'Uri', coerce => 1,
27          default => '/',          required => 1,
28            default => sub {
29                    carp "undefined request_url";
30                    '/';
31            },
32  );  );
33    
34  has 'title' => (  has 'title' => (
# Line 63  has 'html_dump_width' => ( Line 67  has 'html_dump_width' => (
67          is => 'rw',          is => 'rw',
68          isa => 'Int',          isa => 'Int',
69  #       required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them  #       required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them
70          default => 120,          default => 250,
71  );  );
72    
73  my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');  my %escape = ('<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '"'=>'&quot;');
# Line 241  sub page { Line 245  sub page {
245                  qq|                  qq|
246                          <span class="right">                          <span class="right">
247                          <a title="reload $url"  href="/reload$url">reload</a>                          <a title="reload $url"  href="/reload$url">reload</a>
248                          <a title="$description" href="/exit$url">$exit</a>                          <a title="$description" href="/exit$url" target="exit">$exit</a>
249                          </span>                          </span>
250                  |;                  |;
251    
# Line 372  sub clean_status { Line 376  sub clean_status {
376          @status = (          @status = (
377                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
378                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
379                  { 'INC' => Frey::INC->new->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
380          );          );
381          $icon_html = '';          $icon_html = '';
382  }  }
# Line 461  my $multiline_re = '[\\' . join('\\', ke Line 465  my $multiline_re = '[\\' . join('\\', ke
465  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
466    
467  sub log_path {  sub log_path {
468          $Frey::Bootstrap::log_path || warn "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
469  }  }
470    
471    our $last_log_pos  = 0;
472    our $last_log_line = 0;
473    
474    our $pwd = `pwd`;
475    chomp $pwd;
476    
477  sub warnings_html {  sub warnings_html {
478          my ($self,$level) = shift;          my ($self,$level) = shift;
479          $level ||= $self->debug,          $level ||= $self->debug,
# Line 472  sub warnings_html { Line 482  sub warnings_html {
482          my $max = 30;          my $max = 30;
483          my $pos = 0;          my $pos = 0;
484          my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines          my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines
485          my $line = 0;          my $line = $last_log_line;
486          my $multiline_end;          my $multiline_end;
487    
488          # XXX do we really want to do this every time?          # XXX do we really want to do this every time?
# Line 486  sub warnings_html { Line 496  sub warnings_html {
496          }          }
497          $self->add_css( $css );          $self->add_css( $css );
498    
499          open(my $log, '<', $path) || die "can't open $path: $!";          open(my $log, '<', $path)    || die "can't open $path: $!";
500            seek($log, $last_log_pos, 0) || warn "can't seek: $!";
501          while(<$log>) {          while(<$log>) {
502                  chomp;                  chomp;
503                  $line++;                  $line++;
504    
505                    next if m{^\s+(Mojo|Class::MOP|Moose)::};
506    
507                  my $style = '';                  my $style = '';
508    
509  =for filter  =for filter
# Line 517  sub warnings_html { Line 530  sub warnings_html {
530                          my $level = $1;                          my $level = $1;
531                          my $msg = $_;                          my $msg = $_;
532    
533                            # Mojo seems to expand warn messages to full path which is annoying
534                            $msg =~ s{/[^/]+/\.\./}{/}gs;
535                            $msg =~ s{$pwd/*}{}gs;
536    
537                          my $spacer = ' ';                          my $spacer = ' ';
538                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
539                          if ( length($real_msg) > $self->html_dump_width ) {                          if ( length($real_msg) > $self->html_dump_width ) {
# Line 532  sub warnings_html { Line 549  sub warnings_html {
549                                  $msg = qq|<span class="$class">$msg</span>|;                                  $msg = qq|<span class="$class">$msg</span>|;
550                          }                          }
551    
552                          $msg .= $spacer .                          #$msg .= $spacer . qq|<a target="editor" href="/editor+$path+$line" style="float: right;">$line</a>\n|;
553                                  qq|<a target="editor" href="/editor+$path+$line" style="float: right;">+$line</a>\n|;                          $msg = qq|<a target="editor" href="/editor+$path+$line" style="float: right;">$line</a>$msg|
554                                    . ( $spacer ? $spacer : '' )
555                                    . "\n"; # XXX <pre> needs this
556    
557                          $warnings[ $pos++ % $max ] = $msg;                          $warnings[ $pos++ % $max ] = $msg;
558                  }                  }
559          }          }
560          warn "log has $line lines tell position ",tell($log);          $last_log_pos = tell($log);
561            $last_log_line = $line;
562            warn "log has $line lines tell position $last_log_pos";
563          close($log) || die "can't close $path: $!";          close($log) || die "can't close $path: $!";
564    
565          my $size = -s $path;          my $size = -s $path;
566    
567          my $warnings = join("",          my $warnings = join("",
568                  map { $warnings[ ( $pos + $_ ) % $max ] || '' } 1 .. $max                  map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
569          );          );
570    
571          my $s = length($warnings);          my $s = length($warnings);
# Line 553  sub warnings_html { Line 574  sub warnings_html {
574                  # need to wrap editor link into span so we can have links in warnings                  # need to wrap editor link into span so we can have links in warnings
575                    qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|                    qq|<span class="frey-popup"><a target="editor" href="/editor+$path+$line" title="$path \| $size -> $s bytes \| $line -> $pos lines \| level $level">warn</a><code>|
576                  . $self->editor_links( $warnings )                  . $self->editor_links( $warnings )
577                  . qq|</code></span></a>|                  . qq|</code></span>|
578                  ;                  ;
579  }  }
580    
Legend:
Removed from v.611  
changed lines
  Added in v.653
  ViewVC Help
Powered by ViewVC 1.1.26