/[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 816 by dpavlin, Thu Dec 11 21:36:04 2008 UTC
# Line 3  use Moose::Role; Line 3  use Moose::Role;
3    
4  with 'Frey::Session';  with 'Frey::Session';
5    
 use Frey::Types;  
   
6  #use Continuity::Widget::DomNode;  #use Continuity::Widget::DomNode;
7  use Data::Dump qw/dump/;  use Data::Dump qw/dump/;
8  use Carp qw/confess cluck carp/;  use Carp qw/confess cluck carp/;
9  use File::Slurp;  use File::Slurp;
10    use Text::Tabs; # expand, unexpand
11    
12    use lib 'lib';
13    
14    use Frey::Types;
15    
16  use Frey::Bookmarklet;  use Frey::Bookmarklet;
17  use Frey::ClassBrowser;  use Frey::Class::Browser;
18  use Frey::INC;  use Frey::INC;
19    
20  use Frey::SVK;  use Frey::SVK;
21    
 use Text::Tabs; # expand, unexpand  
   
22  our @head;  our @head;
23  sub head { @head }  sub head { @head }
24    
# Line 86  sub html_dump { Line 87  sub html_dump {
87          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;          $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
88          $dump = $self->html_escape( $dump );          $dump = $self->html_escape( $dump );
89          $dump =~ s{\Q...\E}{…}gs;          $dump =~ s{\Q...\E}{…}gs;
90  #       $dump =~ $self->editor_links( $dump ); # FIXME include this  #       $dump =~ $self->html_links( $dump ); # FIXME include this
91          return "<code>$dump</code>";          return "<code>$dump</code>";
92  }  }
93    
94  sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }  sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }
95  sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }  sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
96    
97  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
98    
99  sub popup_dropdown {  sub popup_dropdown {
100          my ( $self, $type, $name, $content, $full ) = @_;          my ( $self, $type, $name, $content, $full ) = @_;
# Line 184  sub add_css { Line 185  sub add_css {
185          | );          | );
186  }  }
187    
188    sub add_js {
189            my ($self,$js) = @_;
190            my ( $package, $path, $line ) = caller;
191    
192            if ( $js =~ m{http.*\.js} ) {
193                    $self->add_head( qq|
194                            <script type="text/javascript" src="$js">
195                            /* via $package at $path line $line */
196                            </script>
197                    |);
198            } else {
199                    $self->add_head( qq|
200                            <script type="text/javascript">
201                            /* via $package at $path line $line */
202                            $js
203                            </script>
204                    | );
205            };
206    }
207    
208  our $reload_counter = 0;  our $reload_counter = 0;
209    
210    
# Line 225  sub page { Line 246  sub page {
246          if ( ! $body ) {          if ( ! $body ) {
247                  my $run = $a->{run} || 'as_markup';                  my $run = $a->{run} || 'as_markup';
248                  warn "# no body, invoke $self->$run on ", ref($self);                  warn "# no body, invoke $self->$run on ", ref($self);
249                  $body = $self->$run;                  eval {
250                            $body = $self->$run;
251                    };
252                    $body = $self->error( $@, '' ) if $@;
253          }          }
254          if ( $self->content_type !~ m{html} ) {          if ( $self->content_type !~ m{html} ) {
255                  warn "# return only $self body ", $self->content_type;                  warn "# return only $self body ", $self->content_type;
# Line 301  sub editor { Line 325  sub editor {
325          qq|>$class</a>|;          qq|>$class</a>|;
326  }  }
327    
328  =head2 editor_links  =head2 html_links
329    
330  Create HTML links to editor for perl error message  Create HTML links to editor for perl error message
331    
332    my $html = $self->editor_links( $error )    my $html = $self->html_links( $error )
333    
334  =cut  =cut
335    
336  sub editor_links {  sub html_links {
337          my ( $self, $error ) = @_;          my ( $self, $error ) = @_;
338    
339            $error = $self->strip_full_path( $error );
340    
341  #       $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
342    
343            # perl's backtrace
344          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
345                  {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;
346    
347          $error =~ s{(via (?:package) "?)([\w:]+)("?)}          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
348                  {$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
349            || # or anything that looks like "Class::Name"
350            $error =~ s{"(\w+(?:::\w+)+)"}
351                    {"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
352    
353            # method error messages
354            # FIXME replace with link to Frey::Introspect data
355            $error =~ s{(method ")(\w+)(" via)}
356                    {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
357    
358            # link paths to editor
359            $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
360                    {<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
361    
362            $error =~ s{(class ")([\w:]+)(")}
363                    {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm;
364    
365          return $error;          return $error;
366  }  }
367    
368    =head2 error
369    
370    This method will return error to browser and backtrace unless
371    error message ends with LF C<\n> just like L<warn>
372    
373    =cut
374    
375  sub error {  sub error {
376          my $self = shift;          my $self = shift;
377          my $error = join(" ", @_);          my $error = join(" ", @_);
378    
379          my @backtrace = $self->backtrace;          my $fatal = '';
380          $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;  
381            if ( $error !~ m{\n$} ) {
382                    if ( my @backtrace = $self->backtrace ) {
383                            $error .= "\n\t" . join( "\n\t", @backtrace );
384                            $fatal = qq| frey-fatal|;
385                    }
386            }
387    
388          warn "ERROR: $error\n";          warn "ERROR: $error\n";
389          return          return
390                  qq|<pre class="frey-error">|                  qq|<pre class="frey-error$fatal">|
391                  . $self->editor_links( $error ) .                  . $self->html_links( $error ) .
392                  qq|</pre>|                  qq|</pre>|
393                  ;                  ;
394  }  }
# Line 374  sub clean_status { Line 429  sub clean_status {
429          my ($self) = shift;          my ($self) = shift;
430          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
431          @status = (          @status = (
432                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
433                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
434                  { 'INC' => Frey::INC->new->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
435          );          );
# Line 411  sub DEMOLISH { Line 466  sub DEMOLISH {
466    
467  sub icon_path {  sub icon_path {
468          my ($self,$class,$variant) = @_;          my ($self,$class,$variant) = @_;
469          my $icon = $class;  #       $class ||= $self->title;
470          $icon =~ s{::}{/}g;  
471          $icon .= "/$variant" if $variant;          sub icon_exists {
472          my $path = 'static/icons/' . $icon . '.png';                  my $class = shift;
473                    $class =~ s{::}{/}g;
474                    $class .= "/$variant" if $variant;
475                    my $icon_path = 'static/icons/' . $class . '.png';
476                    return $icon_path if -e $icon_path;
477                    return;
478            }
479    
480            my $path = icon_exists( $class );
481    
482            while ( $class =~ s{::[^:]+$}{} && ! $path ) {
483                    $path = icon_exists( $class ) unless $class eq 'Frey'; # don't default on Frey icon
484            }
485    
486          if ( -e $path ) {          if ( -e $path ) {
487                  warn "# $class from $self icon_path $path" if $self->debug;                  warn "# $class from $self icon_path $path" if $self->debug;
488                  return $path;                  return $path;
489          } else {          } else {
490                  $self->TODO( "add $path icon for $class" );                  $self->TODO( "add $path icon for $class $variant" );
491                  return undef;                  return undef;
492          }          }
493  }  }
# Line 461  my $multiline_markers = { Line 529  my $multiline_markers = {
529          '"' => '"',          '"' => '"',
530  };  };
531    
532    =for later
533    
534  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';  my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
535  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";  warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
536    
537    =cut
538    
539  sub log_path {  sub log_path {
540          $Frey::Bootstrap::log_path || die "no log_path?";          $Frey::Bootstrap::log_path || die "no log_path?";
541  }  }
542    
 our $last_log_pos  = 0;  
 our $last_log_line = 0;  
   
543  our $pwd = `pwd`;  our $pwd = `pwd`;
544  chomp $pwd;  chomp $pwd;
545    
546    sub strip_full_path {
547            my ($self, $msg) = @_;
548            # Mojo seems to expand warn messages to full path which is annoying
549            $msg =~ s{/[^/]+/\.\./}{/}gs;
550            $msg =~ s{$pwd/*}{}gs;
551            return $msg;
552    }
553    
554    our $last_log_pos  = 0;
555    our $last_log_line = 0;
556    
557  sub warnings_html {  sub warnings_html {
558          my ($self,$level) = shift;          my ($self,$level) = shift;
559          $level ||= $self->debug,          $level ||= $self->debug,
# Line 528  sub warnings_html { Line 608  sub warnings_html {
608                  if ( m{^(#*)} ) {                  if ( m{^(#*)} ) {
609    
610                          my $level = $1;                          my $level = $1;
611                          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;  
612    
613                          my $spacer = ' ';                          my $spacer = ' ';
614                          my $real_msg = expand( $msg );                          my $real_msg = expand( $msg );
# Line 573  sub warnings_html { Line 649  sub warnings_html {
649          return          return
650                  # 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
651                    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>|
652                  . $self->editor_links( $warnings )                  . $self->html_links( $warnings )
653                  . qq|</code></span>|                  . qq|</code></span>|
654                  ;                  ;
655  }  }
# Line 600  sub backtrace { Line 676  sub backtrace {
676                  ) = caller($_) or last;                  ) = caller($_) or last;
677    
678                  push @backtrace,                  push @backtrace,
679                          qq|via $package at $path line $line|;                          qq|via "$package" at $path line $line|;
680          }          }
681          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;          #warn "# backtrace: ", dump( @backtrace ) if @backtrace;
682          return @backtrace;          return @backtrace;
683  }  }
684    
685    =head2 checkbox
686    
687    Generate checkbox html markup from some attribute
688    
689      my $html = $self->checkbox('attribute_name', $value);
690    
691    =cut
692    
693    sub checkbox {
694            my ($self,$name,$value) = @_;
695            my $checked = '';
696            my $all_checkboxes = eval { $self->$name };
697            warn "ERROR tried to get checkbox value for '$name' which is unknown: $@" if $@;
698            $all_checkboxes = [ $all_checkboxes ] unless ref($all_checkboxes) eq 'ARRAY'; # sigh, too chatty
699            $checked = ' checked' if grep { defined $_ && $_ eq $value } @$all_checkboxes;
700            warn "# checkbox $name $value $checked\t", $self->dump( $self->$name );
701            qq|<input name="$name" value="$value" type="checkbox"$checked>|;
702    }
703    
704    =head2 strip
705    
706    Strip whitespace around content
707    
708      my $stripped = strip('  no more whitespace around this   ');
709    
710    =cut
711    
712    sub strip {
713            my $t = shift;
714            $t =~ s{^\s+}{}gs;
715            $t =~ s{>\s+<}{><}gs;
716            $t =~ s{\s+$}{}gs;
717            return $t;
718    }
719    
720  1;  1;

Legend:
Removed from v.653  
changed lines
  Added in v.816

  ViewVC Help
Powered by ViewVC 1.1.26