/[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 648 by dpavlin, Sun Nov 30 19:21:52 2008 UTC revision 678 by dpavlin, Tue Dec 2 02:05:55 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 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 314  sub editor_links { Line 317  sub editor_links {
317    
318  #       $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
319    
320            # perl's backtrace
321          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
322                  {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;
323    
324          $error =~ s{(via (?:package) "?)([\w:]+)("?)}          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
325                  {$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
326            || # or anything that looks like "Class::Name"
327            $error =~ s{"(\w+(?:::\w+)+)"}
328                    {"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
329    
330            # method error messages
331            # FIXME replace with link to Frey::Introspect data
332            $error =~ s{(method ")(\w+)(" via)}
333                    {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
334    
335            # link paths to editor
336            $error =~ s{(lib/[\w/]+\.pm)(\s+(\d+)\s+bytes)}
337                    {<a target="editor" href="/editor+$1+1" title="vi $1">$1</a>}gsm;
338    
339          return $error;          return $error;
340  }  }
341    
342    =head2 error
343    
344    This method will return error to browser and backtrace unless
345    error message ends with LF C<\n> just like L<warn>
346    
347    =cut
348    
349  sub error {  sub error {
350          my $self = shift;          my $self = shift;
351          my $error = join(" ", @_);          my $error = join(" ", @_);
352    
353          my @backtrace = $self->backtrace;          my $fatal = '';
354          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;  
355            if ( $error !~ m{\n$} ) {
356                    if ( my @backtrace = $self->backtrace ) {
357                            $error .= "\n\t" . join( "\n\t", @backtrace );
358                            $fatal = qq| class="fatal"|;
359                    }
360            }
361    
362          warn "ERROR: $error\n";          warn "ERROR: $error\n";
363          return          return
364                  qq|<pre class="frey-error">|                  qq|<pre class="frey-error$fatal">|
365                  . $self->editor_links( $error ) .                  . $self->editor_links( $error ) .
366                  qq|</pre>|                  qq|</pre>|
367                  ;                  ;
# Line 373  Called at beginning of each request Line 402  Called at beginning of each request
402  sub clean_status {  sub clean_status {
403          my ($self) = shift;          my ($self) = shift;
404          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
         my $params = { request_url => $self->request_url };  
405          @status = (          @status = (
406                  { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
407                  { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
408                  { 'INC' => Frey::INC->new( %$params )->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
409          );          );
410          $icon_html = '';          $icon_html = '';
411  }  }
# Line 462  my $multiline_markers = { Line 490  my $multiline_markers = {
490          '"' => '"',          '"' => '"',
491  };  };
492    
493    =for later
494    
495  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
496  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
497    
498    =cut
499    
500  sub log_path {  sub log_path {
501          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
502  }  }
# Line 472  sub log_path { Line 504  sub log_path {
504  our $last_log_pos  = 0;  our $last_log_pos  = 0;
505  our $last_log_line = 0;  our $last_log_line = 0;
506    
507    our $pwd = `pwd`;
508    chomp $pwd;
509    
510  sub warnings_html {  sub warnings_html {
511          my ($self,$level) = shift;          my ($self,$level) = shift;
512          $level ||= $self->debug,          $level ||= $self->debug,
# Line 528  sub warnings_html { Line 563  sub warnings_html {
563                          my $level = $1;                          my $level = $1;
564                          my $msg = $_;                          my $msg = $_;
565    
566                            # Mojo seems to expand warn messages to full path which is annoying
567                            $msg =~ s{/[^/]+/\.\./}{/}gs;
568                            $msg =~ s{$pwd/*}{}gs;
569    
570                          my $spacer = ' ';                          my $spacer = ' ';
571                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
572                          if ( length($real_msg) > $self->html_dump_width ) {                          if ( length($real_msg) > $self->html_dump_width ) {
# Line 594  sub backtrace { Line 633  sub backtrace {
633                  ) = caller($_) or last;                  ) = caller($_) or last;
634    
635                  push @backtrace,                  push @backtrace,
636                          qq|via $package at $path line $line|;                          qq|via "$package" at $path line $line|;
637          }          }
638          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
639          return @backtrace;          return @backtrace;
Legend:
Removed from v.648  
changed lines
  Added in v.678
  ViewVC Help
Powered by ViewVC 1.1.26