/[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 677 by dpavlin, Tue Dec 2 02:01:23 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)\s+"?)([\w:]+)("?)}
325                    {$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    
         $error =~ s{(via (?:package) "?)([\w:]+)("?)}  
                 {$1<a target="editor" href="/editor+$2+1">$2</a>$3}gsm;  
335    
336          return $error;          return $error;
337  }  }
338    
339    =head2 error
340    
341    This method will return error to browser and backtrace unless
342    error message ends with LF C<\n> just like L<warn>
343    
344    =cut
345    
346  sub error {  sub error {
347          my $self = shift;          my $self = shift;
348          my $error = join(" ", @_);          my $error = join(" ", @_);
349    
350          my @backtrace = $self->backtrace;          my $fatal = '';
351          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;  
352            if ( $error !~ m{\n$} ) {
353                    if ( my @backtrace = $self->backtrace ) {
354                            $error .= "\n\t" . join( "\n\t", @backtrace );
355                            $fatal = qq| class="fatal"|;
356                    }
357            }
358    
359          warn "ERROR: $error\n";          warn "ERROR: $error\n";
360          return          return
361                  qq|<pre class="frey-error">|                  qq|<pre class="frey-error$fatal">|
362                  . $self->editor_links( $error ) .                  . $self->editor_links( $error ) .
363                  qq|</pre>|                  qq|</pre>|
364                  ;                  ;
# Line 373  Called at beginning of each request Line 399  Called at beginning of each request
399  sub clean_status {  sub clean_status {
400          my ($self) = shift;          my ($self) = shift;
401          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
         my $params = { request_url => $self->request_url };  
402          @status = (          @status = (
403                  { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
404                  { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
405                  { 'INC' => Frey::INC->new( %$params )->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
406          );          );
407          $icon_html = '';          $icon_html = '';
408  }  }
# Line 462  my $multiline_markers = { Line 487  my $multiline_markers = {
487          '"' => '"',          '"' => '"',
488  };  };
489    
490    =for later
491    
492  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
493  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
494    
495    =cut
496    
497  sub log_path {  sub log_path {
498          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
499  }  }
# Line 472  sub log_path { Line 501  sub log_path {
501  our $last_log_pos  = 0;  our $last_log_pos  = 0;
502  our $last_log_line = 0;  our $last_log_line = 0;
503    
504    our $pwd = `pwd`;
505    chomp $pwd;
506    
507  sub warnings_html {  sub warnings_html {
508          my ($self,$level) = shift;          my ($self,$level) = shift;
509          $level ||= $self->debug,          $level ||= $self->debug,
# Line 528  sub warnings_html { Line 560  sub warnings_html {
560                          my $level = $1;                          my $level = $1;
561                          my $msg = $_;                          my $msg = $_;
562    
563                            # Mojo seems to expand warn messages to full path which is annoying
564                            $msg =~ s{/[^/]+/\.\./}{/}gs;
565                            $msg =~ s{$pwd/*}{}gs;
566    
567                          my $spacer = ' ';                          my $spacer = ' ';
568                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
569                          if ( length($real_msg) > $self->html_dump_width ) {                          if ( length($real_msg) > $self->html_dump_width ) {
# Line 594  sub backtrace { Line 630  sub backtrace {
630                  ) = caller($_) or last;                  ) = caller($_) or last;
631    
632                  push @backtrace,                  push @backtrace,
633                          qq|via $package at $path line $line|;                          qq|via "$package" at $path line $line|;
634          }          }
635          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
636          return @backtrace;          return @backtrace;
Legend:
Removed from v.648  
changed lines
  Added in v.677
  ViewVC Help
Powered by ViewVC 1.1.26