/[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 674 by dpavlin, Tue Dec 2 01:49:49 2008 UTC revision 796 by dpavlin, Wed Dec 10 18:47:14 2008 UTC
# Line 11  use Carp qw/confess cluck carp/; Line 11  use Carp qw/confess cluck carp/;
11  use File::Slurp;  use File::Slurp;
12    
13  use Frey::Bookmarklet;  use Frey::Bookmarklet;
14  use Frey::ClassBrowser;  use Frey::Class::Browser;
15  use Frey::INC;  use Frey::INC;
16    
17  use Frey::SVK;  use Frey::SVK;
# 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    
93  sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }  sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }
94  sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }  sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
95    
96  our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1|[^>]+/)>}s; # relaxed html check for one semi-valid tag  our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1|[^>]+/?)>}s; # relaxed html check for one semi-valid tag
97    
98  sub popup_dropdown {  sub popup_dropdown {
99          my ( $self, $type, $name, $content, $full ) = @_;          my ( $self, $type, $name, $content, $full ) = @_;
# Line 184  sub add_css { Line 184  sub add_css {
184          | );          | );
185  }  }
186    
187    sub add_js {
188            my ($self,$css) = @_;
189            my ( $package, $path, $line ) = caller;
190            $self->add_head( qq|
191            <script type="text/javascript">
192            /* via $package at $path line $line */
193            $css
194            </script>
195            | );
196    }
197    
198  our $reload_counter = 0;  our $reload_counter = 0;
199    
200    
# Line 304  sub editor { Line 315  sub editor {
315          qq|>$class</a>|;          qq|>$class</a>|;
316  }  }
317    
318  =head2 editor_links  =head2 html_links
319    
320  Create HTML links to editor for perl error message  Create HTML links to editor for perl error message
321    
322    my $html = $self->editor_links( $error )    my $html = $self->html_links( $error )
323    
324  =cut  =cut
325    
326  sub editor_links {  sub html_links {
327          my ( $self, $error ) = @_;          my ( $self, $error ) = @_;
328    
329            $error = $self->strip_full_path( $error );
330    
331  #       $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
332    
333          # perl's backtrace          # perl's backtrace
334          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
335                  {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;
336    
337          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
338                  {$1<a target="$2" href="/$2">$2</a>$3}gsm;                  {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm
339            || # or anything that looks like "Class::Name"
340            $error =~ s{"(\w+(?:::\w+)+)"}
341                    {"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
342    
343          # method error messages          # method error messages
344  #       $error =~ s{(method ")(\w+)"}          # FIXME replace with link to Frey::Introspect data
345  #               {$1<a target="/Frey::Shell::Grep?pattern=$2">$2</a>"}gsm; # FIXME replace with link to Frey::Introspect data          $error =~ s{(method ")(\w+)(" via)}
346                    {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
347    
348            # link paths to editor
349            $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
350                    {<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
351    
352          # anything that looks like "Class::Name"          $error =~ s{(class ")([\w:]+)(")}
353          $error =~ s{"(\w+(?:::\w+)+)"}                  {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
                 {"<a target="$1" href="/$1">$1</a>"}gsm;  
354    
355          return $error;          return $error;
356  }  }
# Line 351  sub error { Line 371  sub error {
371          if ( $error !~ m{\n$} ) {          if ( $error !~ m{\n$} ) {
372                  if ( my @backtrace = $self->backtrace ) {                  if ( my @backtrace = $self->backtrace ) {
373                          $error .= "\n\t" . join( "\n\t", @backtrace );                          $error .= "\n\t" . join( "\n\t", @backtrace );
374                          $fatal = qq| class="fatal"|;                          $fatal = qq| frey-fatal|;
375                  }                  }
376          }          }
377    
378          warn "ERROR: $error\n";          warn "ERROR: $error\n";
379          return          return
380                  qq|<pre class="frey-error$fatal">|                  qq|<pre class="frey-error$fatal">|
381                  . $self->editor_links( $error ) .                  . $self->html_links( $error ) .
382                  qq|</pre>|                  qq|</pre>|
383                  ;                  ;
384  }  }
# Line 399  sub clean_status { Line 419  sub clean_status {
419          my ($self) = shift;          my ($self) = shift;
420          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
421          @status = (          @status = (
422                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
423                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
424                  { 'INC' => Frey::INC->new->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
425          );          );
# Line 437  sub DEMOLISH { Line 457  sub DEMOLISH {
457  sub icon_path {  sub icon_path {
458          my ($self,$class,$variant) = @_;          my ($self,$class,$variant) = @_;
459          my $icon = $class;          my $icon = $class;
460            $icon ||= $self->title;
461          $icon =~ s{::}{/}g;          $icon =~ s{::}{/}g;
462          $icon .= "/$variant" if $variant;          $icon .= "/$variant" if $variant;
463          my $path = 'static/icons/' . $icon . '.png';          my $path = 'static/icons/' . $icon . '.png';
# Line 497  sub log_path { Line 518  sub log_path {
518          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
519  }  }
520    
 our $last_log_pos  = 0;  
 our $last_log_line = 0;  
   
521  our $pwd = `pwd`;  our $pwd = `pwd`;
522  chomp $pwd;  chomp $pwd;
523    
524    sub strip_full_path {
525            my ($self, $msg) = @_;
526            # Mojo seems to expand warn messages to full path which is annoying
527            $msg =~ s{/[^/]+/\.\./}{/}gs;
528            $msg =~ s{$pwd/*}{}gs;
529            return $msg;
530    }
531    
532    our $last_log_pos  = 0;
533    our $last_log_line = 0;
534    
535  sub warnings_html {  sub warnings_html {
536          my ($self,$level) = shift;          my ($self,$level) = shift;
537          $level ||= $self->debug,          $level ||= $self->debug,
# Line 557  sub warnings_html { Line 586  sub warnings_html {
586                  if ( m{^(#*)} ) {                  if ( m{^(#*)} ) {
587    
588                          my $level = $1;                          my $level = $1;
589                          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;  
590    
591                          my $spacer = ' ';                          my $spacer = ' ';
592                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
# Line 602  sub warnings_html { Line 627  sub warnings_html {
627          return          return
628                  # 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
629                    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>|
630                  . $self->editor_links( $warnings )                  . $self->html_links( $warnings )
631                  . qq|</code></span>|                  . qq|</code></span>|
632                  ;                  ;
633  }  }
# Line 635  sub backtrace { Line 660  sub backtrace {
660          return @backtrace;          return @backtrace;
661  }  }
662    
663    =head2 checkbox
664    
665    Generate checkbox html markup from some attribute
666    
667      my $html = $self->checkbox('attribute_name', $value);
668    
669    =cut
670    
671    sub checkbox {
672            my ($self,$name,$value) = @_;
673            my $checked = '';
674            my $all_checkboxes = eval { $self->$name };
675            warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
676            $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
677            $checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
678            warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
679            qq|<input name="$name" value="$value" type="checkbox"$checked>|;
680    }
681    
682    =head2 strip
683    
684    Strip whitespace around content
685    
686      my $stripped = strip('  no more whitespace around this   ');
687    
688    =cut
689    
690    sub strip {
691            my $t = shift;
692            $t =~ s{^\s+}{}gs;
693            $t =~ s{>\s+<}{><}gs;
694            $t =~ s{\s+$}{}gs;
695            return $t;
696    }
697    
698  1;  1;
Legend:
Removed from v.674  
changed lines
  Added in v.796
  ViewVC Help
Powered by ViewVC 1.1.26