--- trunk/lib/Frey/Web.pm 2008/11/26 19:43:03 543
+++ trunk/lib/Frey/Web.pm 2008/11/28 13:16:47 581
@@ -1,9 +1,11 @@
package Frey::Web;
use Moose::Role;
+with 'Frey::Session';
+
use Frey::Types;
-use Continuity::Widget::DomNode;
+#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess cluck/;
use File::Slurp;
@@ -14,11 +16,7 @@
use Frey::SVK;
-has 'head' => (
- is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/frey.css' ] },
-);
+our @head;
has 'request_url' => (
is => 'rw',
@@ -81,12 +79,31 @@
$dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
$dump = $self->html_escape( $dump );
$dump =~ s{\Q...\E}{…}gs;
+# $dump =~ $self->editor_links( $dump ); # FIXME include this
return "$dump
";
}
-sub dom2html {
-# warn "## dom2html ",dump( @_ );
- return Continuity::Widget::DomNode->create( @_ )->to_string;
+sub popup { my $self = shift; $self->popup_dropdown('popup', @_); }
+sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
+
+our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1)>}s; # relaxed html check for one semi-valid tag
+
+sub popup_dropdown {
+ my ( $self, $type, $name, $content, $full ) = @_;
+
+ $content = $self->html_dump($content) if ref $content;
+
+ $content = qq|$content| unless $content =~ m{^\s*<(span|a|code).+?/\1>\s*};
+
+ $content =~ s{([^<]+
)}{$1} && $self->TODO("code wrapped in span");
+
+ warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
+
+ if ( $name =~ m{::} && $name !~ $re_html ) {
+ return qq|$name $content\n|;
+ } else {
+ return qq|$name $content\n|;
+ }
}
sub _inline_path {
@@ -97,7 +114,7 @@
sub _head_html {
my $self = shift;
my $out = '';
- foreach my $path ( @{ $self->head } ) {
+ foreach my $path ( @head ) {
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
$out .= $self->_inline_path( $path ) ?
@@ -132,11 +149,11 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( $path =~ m{<.*>}s ) {
- push @{ $self->head }, $path;
+ if ( $path =~ $re_html ) {
+ push @head, $path;
} elsif ( -e $path ) {
if ( $path =~ m/\.(?:js|css)$/ ) {
- push @{ $self->head }, $path;
+ push @head, $path;
} else {
confess "can't add_head( $path ) it's not js or css";
}
@@ -147,6 +164,17 @@
}
+sub add_css {
+ my ($self,$css) = @_;
+ my ( $package, $path, $line ) = caller;
+ $self->add_head( qq|
+
+ | );
+}
+
our $reload_counter = 0;
@@ -165,29 +193,6 @@
our $icon_html;
-sub popup { my $self = shift; $self->popup_dropdown('popup', @_); }
-sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
-
-sub popup_dropdown {
- my ( $self, $type, $name, $content, $full ) = @_;
-
- if ( ref($content) ) {
- $content = $self->html_dump($content);
-# my $l = length($content);
-# $content = qq|$l bytes| if ! $full && $l > $self->dump_max_bytes;
- } else {
- $content = qq|$content|;
- }
-
- warn "## $type [$name] = ", length( $content ), " bytes" if $self->debug;
-
- if ( $name =~ m{::} && ! $name =~ m{<(\w+).+?/\1>} ) {
- return qq|$name $content\n|;
- } else {
- return qq|$name $content\n|;
- }
-}
-
sub page {
my $self = shift;
my $a = {@_};
@@ -198,10 +203,6 @@
my $status_line = '';
- unshift @status, { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup };
-# unshift @status, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup };
- unshift @status, { 'INC' => Frey::INC->new->as_markup };
-
foreach my $part ( @status ) {
foreach my $name ( keys %$part ) {
$status_line .= $self->popup( $name, $part->{$name} );
@@ -235,8 +236,9 @@
|;
- my $info = Frey::SVK->info;
- my $revision = Frey::SVK->info->{Revision} || '';
+ my $svk = Frey::SVK->new;
+ my $info = $svk->info;
+ my $revision = $svk->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
$self->add_icon unless $icon_html;
@@ -300,7 +302,7 @@
$error =~ s{at\s+(\S+)\s+line\s+(\d+)}
{at $1 line $2}gsm;
- $error =~ s{(via package ")([\w:]+)(")}
+ $error =~ s{(via (?:package) "?)([\w:]+)("?)}
{$1$2$3}gsm;
return $error;
@@ -321,25 +323,70 @@
;
}
+=head1 Status line
+
+=head2 add_status
+
+ $self->add_status( { name => { some => 'data' } } );
+
+ $self->add_status( "append to last status popup" );
+
+=cut
+
sub add_status {
my ( $self, $data ) = @_;
- push @status, $data;
+ push @status, { 'X' => [ $self->backtrace ] };
+ if ( ref($data) ) {
+ push @status, $data;
+ } else {
+ if ( defined $status[ $#status ] ) {
+ $status[ $#status ]->{ '+' } = $data;
+ } else {
+ push @status, { '+' => $data };
+ }
+ }
}
+=head2 clean_status
+
+Called at beginning of each request
+
+ $self->clean_status;
+
+=cut
+
sub clean_status {
- @status = ();
+ my ($self) = shift;
+ @head = ( 'static/frey.css' );
+ @status = (
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
+ );
$icon_html = '';
}
+=head2 status_parts
+
+Dump all status line parts
+
+ $self->status_parts
+
+=cut
+
sub status_parts {
warn "## status parts ", dump( map { keys %$_ } @status );
}
+=for debug
+
sub DEMOLISH {
my ( $self ) = @_;
warn "## $self DEMOLISH status ", $#status + 1, " elements ", dump( map { keys %$_ } @status ) if @status;
}
+=cut
+
=head2 add_icon
Frey::Foo->add_icon; # /static/icons/Frey/Foo.png
@@ -354,10 +401,10 @@
$icon .= "/$variant" if $variant;
my $path = 'static/icons/' . $icon . '.png';
if ( -e $path ) {
- warn "# $class from $self icon_path $path";
+ warn "# $class from $self icon_path $path" if $self->debug;
return $path;
} else {
- warn "TODO: add $path icon for $class";
+ $self->TODO( "add $path icon for $class" );
return undef;
}
}
@@ -484,7 +531,7 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package from $path $path|;
+ qq|via $package at $path line $line|;
}
warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;