/[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 652 by dpavlin, Sun Nov 30 23:19:06 2008 UTC revision 685 by dpavlin, Tue Dec 2 18:29:01 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 26  has 'request_url' => ( Line 26  has 'request_url' => (
26          isa => 'Uri', coerce => 1,          isa => 'Uri', coerce => 1,
27          required => 1,          required => 1,
28          default => sub {          default => sub {
29                  cluck "undefined request_url";                  carp "undefined request_url";
30                  '/';                  '/';
31          },          },
32  );  );
# Line 86  sub html_dump { Line 86  sub html_dump {
86          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
87          $dump = $self->html_escape( $dump );          $dump = $self->html_escape( $dump );
88          $dump =~ s{\Q...\E}{…}gs;          $dump =~ s{\Q...\E}{…}gs;
89  #       $dump =~ $self->editor_links( $dump ); # FIXME include this  #       $dump =~ $self->html_links( $dump ); # FIXME include this
90          return "<code>$dump</code>";          return "<code>$dump</code>";
91  }  }
92    
# Line 225  sub page { Line 225  sub page {
225          if ( ! $body ) {          if ( ! $body ) {
226                  my $run = $a->{run} || 'as_markup';                  my $run = $a->{run} || 'as_markup';
227                  warn "# no body, invoke $self->$run on ", ref($self);                  warn "# no body, invoke $self->$run on ", ref($self);
228                  $body = $self->$run;                  eval {
229                            $body = $self->$run;
230                    };
231                    $body = $self->error( $@, '' ) if $@;
232          }          }
233          if ( $self->content_type !~ m{html} ) {          if ( $self->content_type !~ m{html} ) {
234                  warn "# return only $self body ", $self->content_type;                  warn "# return only $self body ", $self->content_type;
# Line 249  sub page { Line 252  sub page {
252                          </span>                          </span>
253                  |;                  |;
254    
255          my $svk = Frey::SVK->new( request_url => '/' );          my $svk = Frey::SVK->new;
256          my $info = $svk->info;          my $info = $svk->info;
257          my $revision = $svk->info->{Revision} || '';          my $revision = $svk->info->{Revision} || '';
258          $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};          $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
# Line 301  sub editor { Line 304  sub editor {
304          qq|>$class</a>|;          qq|>$class</a>|;
305  }  }
306    
307  =head2 editor_links  =head2 html_links
308    
309  Create HTML links to editor for perl error message  Create HTML links to editor for perl error message
310    
311    my $html = $self->editor_links( $error )    my $html = $self->html_links( $error )
312    
313  =cut  =cut
314    
315  sub editor_links {  sub html_links {
316          my ( $self, $error ) = @_;          my ( $self, $error ) = @_;
317    
318            $error = $self->strip_full_path( $error );
319    
320  #       $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back  #       $error =~ s[(bless\({\s+.+?\s+},\s+)("[^"]+")(\) at)][<span class="frey-dropdown">$1<code>$2</code>$3</span>]gs; # FIXME insert bless hiding back
321    
322            # perl's backtrace
323          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
324                  {at <a target="editor" href="/editor+$1+$2">$1</a> line $2}gsm;                  {at <a target="editor" href="/editor+$1+$2" title="vi $1 +$2">$1</a> line $2}gsm;
325    
326            $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
327                    {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm
328            || # or anything that looks like "Class::Name"
329            $error =~ s{"(\w+(?:::\w+)+)"}
330                    {"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
331    
332            # method error messages
333            # FIXME replace with link to Frey::Introspect data
334            $error =~ s{(method ")(\w+)(" via)}
335                    {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
336    
337            # link paths to editor
338            $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
339                    {<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
340    
341          $error =~ s{(via (?:package) "?)([\w:]+)("?)}          $error =~ s{(class ")([\w:]+)(")}
342                  {$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;                  {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
343    
344          return $error;          return $error;
345  }  }
346    
347    =head2 error
348    
349    This method will return error to browser and backtrace unless
350    error message ends with LF C<\n> just like L<warn>
351    
352    =cut
353    
354  sub error {  sub error {
355          my $self = shift;          my $self = shift;
356          my $error = join(" ", @_);          my $error = join(" ", @_);
357    
358          my @backtrace = $self->backtrace;          my $fatal = '';
359          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;  
360            if ( $error !~ m{\n$} ) {
361                    if ( my @backtrace = $self->backtrace ) {
362                            $error .= "\n\t" . join( "\n\t", @backtrace );
363                            $fatal = qq| frey-fatal|;
364                    }
365            }
366    
367          warn "ERROR: $error\n";          warn "ERROR: $error\n";
368          return          return
369                  qq|<pre class="frey-error">|                  qq|<pre class="frey-error$fatal">|
370                  . $self->editor_links( $error ) .                  . $self->html_links( $error ) .
371                  qq|</pre>|                  qq|</pre>|
372                  ;                  ;
373  }  }
# Line 373  Called at beginning of each request Line 407  Called at beginning of each request
407  sub clean_status {  sub clean_status {
408          my ($self) = shift;          my ($self) = shift;
409          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
         my $params = { request_url => $self->request_url };  
410          @status = (          @status = (
411                  { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
412                  { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
413                  { 'INC' => Frey::INC->new( %$params )->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
414          );          );
415          $icon_html = '';          $icon_html = '';
416  }  }
# Line 462  my $multiline_markers = { Line 495  my $multiline_markers = {
495          '"' => '"',          '"' => '"',
496  };  };
497    
498    =for later
499    
500  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
501  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
502    
503    =cut
504    
505  sub log_path {  sub log_path {
506          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
507  }  }
508    
 our $last_log_pos  = 0;  
 our $last_log_line = 0;  
   
509  our $pwd = `pwd`;  our $pwd = `pwd`;
510  chomp $pwd;  chomp $pwd;
511    
512    sub strip_full_path {
513            my ($self, $msg) = @_;
514            # Mojo seems to expand warn messages to full path which is annoying
515            $msg =~ s{/[^/]+/\.\./}{/}gs;
516            $msg =~ s{$pwd/*}{}gs;
517            return $msg;
518    }
519    
520    our $last_log_pos  = 0;
521    our $last_log_line = 0;
522    
523  sub warnings_html {  sub warnings_html {
524          my ($self,$level) = shift;          my ($self,$level) = shift;
525          $level ||= $self->debug,          $level ||= $self->debug,
# Line 529  sub warnings_html { Line 574  sub warnings_html {
574                  if ( m{^(#*)} ) {                  if ( m{^(#*)} ) {
575    
576                          my $level = $1;                          my $level = $1;
577                          my $msg = $_;                          my $msg = $self->strip_full_path( $_ );
   
                         # Mojo seems to expand warn messages to full path which is annoying  
                         $msg =~ s{/[^/]+/\.\./}{/}gs;  
                         $msg =~ s{$pwd/*}{}gs;  
578    
579                          my $spacer = ' ';                          my $spacer = ' ';
580                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
# Line 574  sub warnings_html { Line 615  sub warnings_html {
615          return          return
616                  # 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
617                    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>|
618                  . $self->editor_links( $warnings )                  . $self->html_links( $warnings )
619                  . qq|</code></span>|                  . qq|</code></span>|
620                  ;                  ;
621  }  }
# Line 601  sub backtrace { Line 642  sub backtrace {
642                  ) = caller($_) or last;                  ) = caller($_) or last;
643    
644                  push @backtrace,                  push @backtrace,
645                          qq|via $package at $path line $line|;                          qq|via "$package" at $path line $line|;
646          }          }
647          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
648          return @backtrace;          return @backtrace;

Legend:
Removed from v.652  
changed lines
  Added in v.685

  ViewVC Help
Powered by ViewVC 1.1.26