--- trunk/lib/Frey/Web.pm 2008/10/30 22:35:11 206
+++ trunk/lib/Frey/Web.pm 2009/01/07 19:41:48 961
@@ -1,53 +1,160 @@
package Frey::Web;
use Moose::Role;
-use Continuity::Widget::DomNode;
+with 'Frey::Session';
+
+#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess/;
+use Carp qw/confess cluck carp/;
use File::Slurp;
+use Text::Tabs; # expand, unexpand
+
+use lib 'lib';
+
+use Frey::Types;
+
+use Frey::Bookmarklet;
+use Frey::Class::Browser;
+use Frey::INC;
+
+use Frey::SVK;
+
+our @head;
+sub head { @head }
-has 'head' => (
+has 'request_url' => (
is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/frey.css' ] },
+ isa => 'Uri', coerce => 1,
+ required => 1,
+ default => sub {
+ carp "undefined request_url";
+ '/';
+ },
);
-=head2 inline_smaller_than
+has 'title' => (
+ is => 'rw',
+ isa => 'Str',
+ lazy => 1,
+ default => sub {
+ my ($self) = @_;
+ ref($self);
+ },
+);
-Inline JavaScript and CSS smaller than this size into page reducing
-round-trips to server.
+has 'content_type' => (
+ is => 'rw',
+ isa => 'Str',
+ default => 'text/html',
+ documentation => 'Content-type header',
+);
-=cut
+has 'dump_max_bytes' => (
+ is => 'rw',
+ isa => 'Int',
+ default => 4096,
+ documentation => 'maximum dump size sent to browser before truncation',
+);
has 'inline_smaller_than' => (
is => 'rw',
isa => 'Int',
default => 10240,
+ documentation => 'inline JavaScript and CSS to reduce round-trips',
+);
+
+has 'html_dump_width' => (
+ documentation => 'crop longer lines in dumps',
+ is => 'rw',
+ isa => 'Int',
+# required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them
+ default => 250,
);
-sub dom2html {
-# warn "## dom2html ",dump( @_ );
- return Continuity::Widget::DomNode->create( @_ )->to_string;
+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 ) = @_;
+ $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);
+ my $width = $self->html_dump_width;
+ $dump =~ s{(\n[^\n]{$width})([^\n]+?)([^\n]{5})}{\n$1...$3}gs;
+ $dump = $self->html_escape( $dump );
+ $dump =~ s{\Q...\E}{…}gs;
+# $dump =~ $self->html_links( $dump ); # FIXME include this
+ return "$dump
";
}
-sub _inline_path {
+sub popup { my $self = shift; $self->popup_dropdown('popup', @_); }
+sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
+
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}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; # FIXME
+
+ if ( $name =~ m{::} && $name !~ $re_html ) {
+ return qq|$name $content\n|;
+ } elsif ( $name =~ s{^\s*($name $content\n|;
+ }
+}
+
+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 {
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 ) ?
- 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;
} else {
confess "don't know how to render $path";
}
@@ -62,6 +169,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -69,25 +178,76 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( -e $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";
}
+ return -s $path;
} else {
confess "can't find $path: $!";
}
- return -s $path;
+}
+
+sub _add_css_js {
+ my ( $self, $what, $content ) = @_;
+
+ 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 ) {
+ $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) = @_;
+ $self->_add_css_js( 'css', $css );
+}
+
+sub add_js {
+ my ($self,$js) = @_;
+ $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',
@@ -95,30 +255,517 @@
=cut
-use Frey::Bookmarklet;
+our @status;
+sub status { @status };
+
+our $icon_html;
-sub page {
+sub html_page {
my $self = shift;
my $a = {@_};
$reload_counter++;
- my $html = qq||
- . $self->_head_html
- . '' . ( $a->{title} || ref($self) ) . ''
- . ( $a->{head} || '' )
- . ''
- . ( $a->{body} || '' )
- . qq|