--- trunk/lib/Frey/Web.pm 2008/12/14 15:13:55 837
+++ trunk/lib/Frey/Web.pm 2009/06/30 15:10:55 1133
@@ -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);
@@ -94,7 +110,7 @@
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
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
sub popup_dropdown {
my ( $self, $type, $name, $content, $full ) = @_;
@@ -116,9 +132,11 @@
}
}
-sub _inline_path {
+sub _inline {
my ( $self, $path ) = @_;
- -s $path < $self->inline_smaller_than;
+ return unless defined $path;
+ warn "# _inline $path";
+ -e $path && -s $path < $self->inline_smaller_than && -s $path;
}
sub _head_html {
@@ -127,12 +145,14 @@
foreach my $path ( @head ) {
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m/\.css$/ ) {
- $out .= $self->_inline_path( $path ) ?
- qq|| :
+ my $size;
+ $out .= $size = _inline( $path ) ?
+ qq|| :
qq||;
} elsif ( $path =~ m{<.+>}s ) {
$out .= $path;
@@ -174,43 +194,64 @@
}
+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 $content !~ m{[\n\r]} && -e $content;
+ if ( $content =~ $re_html && $what ne 'js' ) {
+ $head = qq|
+ $content
+
+ |;
+ } elsif ( $content =~ m{^(/\w+|https?://)} && $content !~ m{[\n\r]} ) {
+ if ( $what eq 'js' ) {
+ $head = qq|
+ <$tag type="$type" src="$content">
+ /* $what via $package at $path line $line */
+ $tag>
+ |;
+ } else {
+ $head = qq|
+
+
+ |;
+ }
+ } else {
+ $head = qq|
+ <$tag type="$type">
+ /* via $package at $path line $line */
+ $content
+ $tag>
+ |;
+ };
+ $self->add_head( $head );
+}
+
sub add_css {
my ($self,$css) = @_;
- my ( $package, $path, $line ) = caller;
- $self->add_head( qq|
-
- | );
+ $self->_add_css_js( 'css', $css );
}
sub add_js {
my ($self,$js) = @_;
- my ( $package, $path, $line ) = caller;
-
- if ( $js =~ m{http.*\.js} ) {
- $self->add_head( qq|
-
- |);
- } else {
- $self->add_head( qq|
-
- | );
- };
+ $self->_add_css_js( 'js', $js );
}
our $reload_counter = 0;
-=head2 page
+=head2 html_page
- $self->page(
+ $self->html_page(
title => 'page title',
head => '',
body => 'Page Body',
@@ -221,14 +262,10 @@
our @status;
sub status { @status };
-our $icon_html;
-
-sub page {
+sub html_page {
my $self = shift;
my $a = {@_};
- warn "## page ",dump($a);
-
$reload_counter++;
my $status_line = '';
@@ -248,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 ) {
@@ -264,7 +301,7 @@
my $right =
qq|
-
+
reload
$exit
@@ -275,14 +312,28 @@
my $revision = $svk->info->{Revision} || '';
$revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)};
- $self->add_icon unless $icon_html;
+ $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|
@@ -411,8 +462,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 ] ) {
@@ -433,13 +484,13 @@
sub clean_status {
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
@@ -463,68 +514,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',
@@ -725,4 +714,6 @@
return $t;
}
+no Moose::Role;
+
1;