/[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 653 by dpavlin, Sun Nov 30 23:49:32 2008 UTC revision 725 by dpavlin, Fri Dec 5 17:33:00 2008 UTC
# 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 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 412  sub DEMOLISH { Line 446  sub DEMOLISH {
446  sub icon_path {  sub icon_path {
447          my ($self,$class,$variant) = @_;          my ($self,$class,$variant) = @_;
448          my $icon = $class;          my $icon = $class;
449            $icon ||= $self->title;
450          $icon =~ s{::}{/}g;          $icon =~ s{::}{/}g;
451          $icon .= "/$variant" if $variant;          $icon .= "/$variant" if $variant;
452          my $path = 'static/icons/' . $icon . '.png';          my $path = 'static/icons/' . $icon . '.png';
# Line 461  my $multiline_markers = { Line 496  my $multiline_markers = {
496          '"' => '"',          '"' => '"',
497  };  };
498    
499    =for later
500    
501  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
502  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
503    
504    =cut
505    
506  sub log_path {  sub log_path {
507          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
508  }  }
509    
 our $last_log_pos  = 0;  
 our $last_log_line = 0;  
   
510  our $pwd = `pwd`;  our $pwd = `pwd`;
511  chomp $pwd;  chomp $pwd;
512    
513    sub strip_full_path {
514            my ($self, $msg) = @_;
515            # Mojo seems to expand warn messages to full path which is annoying
516            $msg =~ s{/[^/]+/\.\./}{/}gs;
517            $msg =~ s{$pwd/*}{}gs;
518            return $msg;
519    }
520    
521    our $last_log_pos  = 0;
522    our $last_log_line = 0;
523    
524  sub warnings_html {  sub warnings_html {
525          my ($self,$level) = shift;          my ($self,$level) = shift;
526          $level ||= $self->debug,          $level ||= $self->debug,
# Line 528  sub warnings_html { Line 575  sub warnings_html {
575                  if ( m{^(#*)} ) {                  if ( m{^(#*)} ) {
576    
577                          my $level = $1;                          my $level = $1;
578                          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;  
579    
580                          my $spacer = ' ';                          my $spacer = ' ';
581                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
# Line 573  sub warnings_html { Line 616  sub warnings_html {
616          return          return
617                  # 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
618                    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>|
619                  . $self->editor_links( $warnings )                  . $self->html_links( $warnings )
620                  . qq|</code></span>|                  . qq|</code></span>|
621                  ;                  ;
622  }  }
# Line 600  sub backtrace { Line 643  sub backtrace {
643                  ) = caller($_) or last;                  ) = caller($_) or last;
644    
645                  push @backtrace,                  push @backtrace,
646                          qq|via $package at $path line $line|;                          qq|via "$package" at $path line $line|;
647          }          }
648          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
649          return @backtrace;          return @backtrace;
650  }  }
651    
652    =head2 checkbox
653    
654    Generate checkbox html markup from some attribute
655    
656      my $html = $self->checkbox('attribute_name', $value);
657    
658    =cut
659    
660    sub checkbox {
661            my ($self,$name,$value) = @_;
662            my $checked = '';
663            my $all_checkboxes = eval { $self->$name };
664            warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
665            $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
666            $checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
667            warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
668            qq|<input name="$name" value="$value" type="checkbox"$checked>|;
669    }
670    
671  1;  1;
Legend:
Removed from v.653  
changed lines
  Added in v.725
  ViewVC Help
Powered by ViewVC 1.1.26