' . ( $self->title || $a->{title} || ref($self) ) . '

--- trunk/lib/Frey/Web.pm 2009/01/02 13:22:13 908 +++ branches/zimbardo/lib/Frey/Web.pm 2010/11/03 21:43:50 1196 @@ -1,13 +1,13 @@ package Frey::Web; use Moose::Role; -with 'Frey::Session'; +with 'Frey::Session', 'Frey::Class::Icon'; -#use Continuity::Widget::DomNode; use Data::Dump qw/dump/; use Carp qw/confess cluck carp/; use File::Slurp; use Text::Tabs; # expand, unexpand +use Digest::MD5 qw/md5/; use lib 'lib'; @@ -71,15 +71,31 @@ default => 250, ); +has 'wrap_in_page' => ( + documentation => 'wrap full html page with status bar around content', + is => 'rw', + isa => 'Bool', + default => 1, +); + my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); my $escape_re = join '|' => keys %escape; sub html_escape { my ( $self, $html ) = @_; + return '' unless defined $html; $html =~ s/($escape_re)/$escape{$1}/g; return $html; } +# from Mojo::ByteStream +sub url_escape { + my ( $self, $url, $pattern ) = @_; + $pattern ||= 'A-Za-z0-9\-\.\_\~'; + $url =~ s/([^$pattern])/sprintf('%%%02X',ord($1))/ge; + return $url; +} + sub html_dump { my ( $self, $dump ) = @_; $dump = dump( $dump ) if ref($dump); @@ -181,19 +197,22 @@ sub _add_css_js { my ( $self, $what, $content ) = @_; + my $md5 = md5( $content ); + return if $self->{_add_css_js_seen}->{$what}->{$md5}++; + my $tag = $what eq 'css' ? 'style' : 'script'; my $type = $what eq 'css' ? 'text/css' : 'text/javascript'; my $head; my ( $package, $path, $line ) = caller(1); - $content = "/$content" if -e $content; - if ( $content =~ $re_html ) { + $content = "/$content" if $content !~ m{[\n\r]} && -e $content; + if ( $content =~ $re_html && $what ne 'js' ) { $head = qq| $content |; - } elsif ( $content =~ m{^(/|https?://)} ) { + } elsif ( $content =~ m{^(/\w+|https?://)} && $content !~ m{[\n\r]} ) { if ( $what eq 'js' ) { $head = qq| <$tag type="$type" src="$content"> @@ -230,9 +249,9 @@ our $reload_counter = 0; -=head2 page +=head2 html_page - $self->page( + $self->html_page( title => 'page title', head => '', body => 'Page Body', @@ -243,9 +262,7 @@ our @status; sub status { @status }; -our $icon_html; - -sub page { +sub html_page { my $self = shift; my $a = {@_}; @@ -268,7 +285,7 @@ warn "# no body, invoke $self->$run on ", ref($self); $body = $self->$run; } - if ( $self->content_type !~ m{html} ) { + if ( $self->content_type !~ m{html} || ! $self->wrap_in_page ) { warn "# return only $self body ", $self->content_type; return $body } elsif ( ! defined $body ) { @@ -284,7 +301,7 @@ my $right = qq| - + reload $exit @@ -295,23 +312,41 @@ my $revision = $svk->info->{Revision} || ''; $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; - $self->add_icon unless $icon_html; + $status_line = $ENV{FREY_DEV} ? qq| +

+ Frey $Frey::VERSION $revision + $status_line + $right +

+ | : ''; + + $self->add_icon; + + my $title = undef + || $a->{title} + || $self->title + || ref($self) + ; + +# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes + + $self->add_css(qq| + body { + padding-bottom: 3em; /* don't overlap status line */ + } + |); my $html = join("\n", qq||, $self->_head_html, - '' . ( $self->title || $a->{title} || ref($self) ) . '', + qq|$title|, '', - ( $icon_html || '' ), + ( $self->icon_html ), ( $a->{head} || '' ), qq| $body -

- Frey $Frey::VERSION $revision - $status_line - $right -

+ $status_line |, ); @@ -400,6 +435,10 @@ my $self = shift; my $error = join(" ", @_); + if ( $error =~ m{(.+)}s ) { + return qq|

|; + } + my $fatal = ''; my $backtrace = ''; @@ -431,8 +470,8 @@ sub add_status { my ( $self, $data ) = @_; - push @status, { 'X' => [ $self->backtrace ] }; - if ( ref($data) ) { + die "no data" unless $data; + if ( ref $data ) { push @status, $data; } else { if ( defined $status[ $#status ] ) { @@ -447,19 +486,19 @@ Called at beginning of each request - $self->clean_status; + $self->setup_request; =cut -sub clean_status { +sub setup_request { my ($self) = shift; + warn "## clean_status"; @head = ( 'static/frey.css' ); @status = ( { 'ClassBrowser' => Frey::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup }, { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup }, - { 'INC' => Frey::INC->new->as_markup }, + { 'INC' => Frey::INC->new->as_markup }, ); - $icon_html = ''; } =head2 status_parts @@ -483,68 +522,6 @@ =cut -=head2 add_icon - - Frey::Foo->add_icon; # /static/icons/Frey/Foo.png - Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png - -=cut - -sub icon_path { - my ($self,$class,$variant) = @_; - - sub icon_exists { - my $class = shift; - $class =~ s{::}{/}g; - $class .= "/$variant" if $variant; - my $icon_path = 'static/icons/' . $class . '.png'; - return $icon_path if -e $icon_path; - return; - } - - my $path = icon_exists( $class ); - if ( ! $path ) { - my $super_class = $class; - while ( $super_class =~ s{::[^:]+$}{} && ! $path ) { - $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon - } - } - - if ( ! $path ) { - $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) ); - return undef; - } - - warn "# $class from $self icon_path $path" if $self->debug; - return $path; -} - -sub add_icon { - my ($self,$variant) = @_; - - my $class = $self->class if $self->can('class'); - #$class ||= $self->title; - $class ||= ref($self); - my $icon_path = $self->icon_path( $class, $variant ) || return; - - $icon_html .= qq||; - warn "# using icon $icon_path"; - -=for later - - # FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work! - my $ico_path = $icon_path; - $ico_path =~ s{png$}{ico}; - if ( ! -e $ico_path ) { - system "convert $icon_path $ico_path"; - warn "# convert $icon_path $ico_path : $@"; - } - $icon_html .= qq|| if -e $ico_path; - -=cut - -} - my $warn_colors = { '#' => '#444', '##' => '#888', @@ -565,7 +542,7 @@ =cut sub log_path { - $Frey::Bootstrap::log_path || die "no log_path?"; + $Frey::Bootstrap::log_path || die "no log_path did you load Frey::Bootstrap?"; } our $pwd = `pwd`; @@ -745,4 +722,6 @@ return $t; } +no Moose::Role; + 1;