/[Frey]/trunk/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 /trunk/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 835 by dpavlin, Sun Dec 14 14:13:35 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                  eval {                  $body = $self->$run;
                         $body = $self->$run;  
                 };  
                 $body = $self->error( $@, '' ) if $@;  
250          }          }
251          if ( $self->content_type !~ m{html} ) {          if ( $self->content_type !~ m{html} ) {
252                  warn "# return only $self body ", $self->content_type;                  warn "# return only $self body ", $self->content_type;
# Line 304  sub editor { Line 322  sub editor {
322          qq|>$class</a>|;          qq|>$class</a>|;
323  }  }
324    
325  =head2 editor_links  =head2 html_links
326    
327  Create HTML links to editor for perl error message  Create HTML links to editor for perl error message
328    
329    my $html = $self->editor_links( $error )    my $html = $self->html_links( $error )
330    
331  =cut  =cut
332    
333  sub editor_links {  sub html_links {
334          my ( $self, $error ) = @_;          my ( $self, $error ) = @_;
335    
336            $error = $self->strip_full_path( $error );
337    
338  #       $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
339    
340          # perl's backtrace          # perl's backtrace
341          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}          $error =~ s{at\s+(\S+)\s+line\s+(\d+)}
342                  {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;
343    
344          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}          $error =~ s{(via (?:package)\s+"?)([\w:]+)("?)}
345                  {$1<a target="$2" href="/$2">$2</a>$3}gsm;                  {$1<a target="$2" href="/$2" title="introspect $2">$2</a>$3}gsm
346            || # or anything that looks like "Class::Name"
347            $error =~ s{"(\w+(?:::\w+)+)"}
348                    {"<a target="$1" href="/$1" title="introspect $1">$1</a>"}gsm;
349    
350          # method error messages          # method error messages
351  #       $error =~ s{(method ")(\w+)"}          # FIXME replace with link to Frey::Introspect data
352  #               {$1<a target="/Frey::Shell::Grep?pattern=$2">$2</a>"}gsm; # FIXME replace with link to Frey::Introspect data          $error =~ s{(method ")(\w+)(" via)}
353                    {$1<a target="$2" href="/Frey::Shell::Grep/as_markup?pattern=$2" title="grep $2">$2</a>$3}gsm;
354    
355            # link paths to editor
356            $error =~ s{((?:lib|t)/[\S]+)\s+(\d+\s+bytes)}
357                    {<a target="editor" href="/editor+$1+1" title="vi $1 [$2]">$1</a>}gsm;
358    
359          # anything that looks like "Class::Name"          $error =~ s{(class ")([\w:]+)(")}
360          $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;  
361    
362          return $error;          return $error;
363  }  }
# Line 351  sub error { Line 378  sub error {
378          if ( $error !~ m{\n$} ) {          if ( $error !~ m{\n$} ) {
379                  if ( my @backtrace = $self->backtrace ) {                  if ( my @backtrace = $self->backtrace ) {
380                          $error .= "\n\t" . join( "\n\t", @backtrace );                          $error .= "\n\t" . join( "\n\t", @backtrace );
381                          $fatal = qq| class="fatal"|;                          $fatal = qq| frey-fatal|;
382                  }                  }
383          }          }
384    
385          warn "ERROR: $error\n";          warn "ERROR: $error\n";
386            $self->add_icon('error');
387          return          return
388                  qq|<pre class="frey-error$fatal">|                  qq|<pre class="frey-error$fatal">|
389                  . $self->editor_links( $error ) .                  . $self->html_links( $error ) .
390                  qq|</pre>|                  qq|</pre>|
391                  ;                  ;
392  }  }
# Line 399  sub clean_status { Line 427  sub clean_status {
427          my ($self) = shift;          my ($self) = shift;
428          @head = ( 'static/frey.css' );          @head = ( 'static/frey.css' );
429          @status = (          @status = (
430                  { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },                  { 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
431                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },                  { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
432                  { 'INC' => Frey::INC->new->as_markup },                  { 'INC' => Frey::INC->new->as_markup },
433          );          );
# Line 436  sub DEMOLISH { Line 464  sub DEMOLISH {
464    
465  sub icon_path {  sub icon_path {
466          my ($self,$class,$variant) = @_;          my ($self,$class,$variant) = @_;
467          my $icon = $class;  
468          $icon =~ s{::}{/}g;          sub icon_exists {
469          $icon .= "/$variant" if $variant;                  my $class = shift;
470          my $path = 'static/icons/' . $icon . '.png';                  $class =~ s{::}{/}g;
471          if ( -e $path ) {                  $class .= "/$variant" if $variant;
472                  warn "# $class from $self icon_path $path" if $self->debug;                  my $icon_path = 'static/icons/' . $class . '.png';
473                  return $path;                  return $icon_path if -e $icon_path;
474          } else {                  return;
475                  $self->TODO( "add $path icon for $class" );          }
476    
477            my $path = icon_exists( $class );
478            if ( ! $path ) {
479                    my $super_class = $class;
480                    while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
481                            $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
482                    }
483            }
484    
485            if ( ! $path ) {
486                    $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
487                  return undef;                  return undef;
488          }          }
489    
490            warn "# $class from $self icon_path $path" if $self->debug;
491            return $path;
492  }  }
493    
494  sub add_icon {  sub add_icon {
495          my ($self,$variant) = @_;          my ($self,$variant) = @_;
496    
497          my $class = ref($self);          my $class = $self->class if $self->can('class');
498          $class = $self->class if $self->can('class');          #$class ||= $self->title;
499            $class ||= ref($self);
500          my $icon_path = $self->icon_path( $class, $variant ) || return;          my $icon_path = $self->icon_path( $class, $variant ) || return;
501    
502          $icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;          $icon_html .= qq|<link rel="icon" type="image/png" href="/$icon_path">|;
# Line 497  sub log_path { Line 540  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 557  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 602  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 635  sub backtrace { Line 682  sub 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.674  
changed lines
  Added in v.835
  ViewVC Help
Powered by ViewVC 1.1.26