--- trunk/lib/Frey/Web.pm 2008/07/17 22:26:21 163 +++ trunk/lib/Frey/Web.pm 2008/11/19 03:11:11 446 @@ -1,17 +1,55 @@ package Frey::Web; use Moose::Role; +use Frey::Types; + use Continuity::Widget::DomNode; use Data::Dump qw/dump/; use Carp qw/confess/; use File::Slurp; +use Frey::Bookmarklet; +use Frey::ClassBrowser; + has 'head' => ( is => 'rw', isa => 'ArrayRef[Str]', default => sub { [ 'static/frey.css' ] }, ); +has 'status' => ( + is => 'rw', + isa => 'ArrayRef[HashRef[Str]]', + lazy => 1, + default => sub { [ + { 'Bookmarklets' => Frey::Bookmarklet->new->markup }, + { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup }, + ] }, +); + +has 'request_url' => ( + is => 'rw', + isa => 'Uri', coerce => 1, + default => '/', +); + +has 'title' => ( + is => 'rw', + isa => 'Str', + lazy => 1, + default => sub { + my ($self) = @_; + ref($self); + }, +); + +=head2 inline_smaller_than + +Inline JavaScript and CSS smaller than this size into page reducing +round-trips to server. + +=cut + has 'inline_smaller_than' => ( is => 'rw', isa => 'Int', @@ -41,6 +79,8 @@ $out .= $self->_inline_path( $path ) ? qq|| : qq||; + } elsif ( $path =~ m{<.+>}s ) { + $out .= $path; } else { confess "don't know how to render $path"; } @@ -55,6 +95,8 @@ my $size = $o->add_head( 'path/to/external.css' ); + $o->add_head( '' ); + =cut sub add_head { @@ -62,40 +104,96 @@ return if ! defined $path || $path eq ''; $path =~ s!^/!!; - if ( -e $path ) { + if ( $path =~ m{<.*>}s ) { + push @{ $self->head }, $path; + } elsif ( -e $path ) { if ( $path =~ m/\.(?:js|css)$/ ) { push @{ $self->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; } our $reload_counter = 0; + +=head2 page + + $self->page( + title => 'page title', + head => '', + body => 'Page Body', + ); + +=cut + sub page { my $self = shift; my $a = {@_}; $reload_counter++; - my $html = qq|
| - . $self->_head_html - . '' . dump($content) . '
';
+ my $l = length($content);
+ $content = qq|$l bytes| if $l > 1024;
+ } else {
+ $content = qq|$content|;
+ }
+ warn "### part [$name] = ", length( $content ), " bytes" if $self->debug;
+ $status_line .= qq|$name $content\n|;
+ }
+ }
+
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
+ my $html = join("\n",
+ qq||,
+ $self->_head_html,
+ '$error|; +} + 1;