--- trunk/lib/Frey/Web.pm 2008/12/14 22:47:48 839
+++ trunk/lib/Frey/Web.pm 2009/01/07 17:50:03 957
@@ -71,6 +71,13 @@
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;
@@ -80,6 +87,14 @@
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 +109,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 +131,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 +144,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;
@@ -183,18 +202,23 @@
my ( $package, $path, $line ) = caller(1);
- if ( $content =~ m{\.(js|css)} ) {
- $content = "/$content" if -e $content;
+ $content = "/$content" if $content !~ m{[\n\r]} && -e $content;
+ if ( $content =~ $re_html ) {
+ $head = qq|
+ $content
+
+ |;
+ } elsif ( $content =~ m{^(/\w+|https?://)} && $content !~ m{[\n\r]} ) {
if ( $what eq 'js' ) {
$head = qq|
<$tag type="$type" src="$content">
- /* via $package at $path line $line */
+ /* $what via $package at $path line $line */
|;
} else {
$head = qq|
-
+
|;
}
} else {
@@ -240,8 +264,6 @@
my $self = shift;
my $a = {@_};
- warn "## page ",dump($a);
-
$reload_counter++;
my $status_line = '';
@@ -261,7 +283,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 ) {
@@ -290,10 +312,18 @@
$self->add_icon unless $icon_html;
+ my $title = undef
+ || $a->{title}
+ || $self->title
+ || ref($self)
+ ;
+
+# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+
my $html = join("\n",
qq||,
$self->_head_html,
- '' . ( $self->title || $a->{title} || ref($self) ) . '',
+ qq|$title|,
'',
( $icon_html || '' ),
( $a->{head} || '' ),
@@ -424,8 +454,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 ] ) {