--- trunk/lib/Frey/Web.pm 2008/07/17 17:04:21 154
+++ trunk/lib/Frey/Web.pm 2008/11/18 02:14:40 398
@@ -1,29 +1,48 @@
package Frey::Web;
use Moose::Role;
-use MooseX::AttributeHelpers;
+
+#with 'Frey::Escape';
+
+use Frey::Types;
use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess/;
+use File::Slurp;
-has 'js' => (
- metaclass => 'Collection::Array',
+has 'head' => (
is => 'rw',
isa => 'ArrayRef[Str]',
- default => sub { [] },
- provides => {
- 'push' => 'add_js',
- },
+ default => sub { [ 'static/frey.css' ] },
);
-has 'css' => (
- metaclass => 'Collection::Array',
+has 'status' => (
is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/app.css' ] },
- provides => {
- 'push' => 'add_css',
- },
+ isa => 'ArrayRef[HashRef[Str]]',
+ lazy => 1,
+ default => sub { [
+ { 'Bookmarklets' => Frey::Bookmarklet->markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->markup },
+ ] },
+);
+
+has 'request_url' => (
+ is => 'rw',
+ isa => 'Uri', coerce => 1,
+ default => '/',
+);
+
+=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',
+ default => 10240,
);
sub dom2html {
@@ -31,14 +50,28 @@
return Continuity::Widget::DomNode->create( @_ )->to_string;
}
-sub _unroll_markup {
-# warn "## _unroll_markup ",dump( @_ );
- my ( $markup, $array ) = @_;
+sub _inline_path {
+ my ( $self, $path ) = @_;
+ -s $path < $self->inline_smaller_than;
+}
+
+sub _head_html {
+ my $self = shift;
my $out = '';
- foreach my $path ( @$array ) {
+ foreach my $path ( @{ $self->head } ) {
$path =~ s!^/!!;
- confess "can't find $path" unless -e $path;
- $out .= sprintf( $markup, $path );
+ if ( $path =~ m/\.js$/ ) {
+ $out .= $self->_inline_path( $path ) ?
+ qq|| :
+ qq||;
+ } elsif ( $path =~ m/\.css$/ ) {
+ $out .= $self->_inline_path( $path ) ?
+ qq|| :
+ qq||;
+ } else {
+ confess "don't know how to render $path";
+ }
+ $out .= "\n";
}
return $out;
}
@@ -57,10 +90,8 @@
$path =~ s!^/!!;
if ( -e $path ) {
- if ( $path =~ m/\.js$/ ) {
- $self->add_js( $path );
- } elsif ( $path =~ m/\.css$/ ) {
- $self->add_css( $path );
+ if ( $path =~ m/\.(?:js|css)$/ ) {
+ push @{ $self->head }, $path;
} else {
confess "can't add_head( $path ) it's not js or css";
}
@@ -73,26 +104,74 @@
our $reload_counter = 0;
+
+=head2 page
+
+ $self->page(
+ title => 'page title',
+ head => '',
+ body => 'Page Body',
+ );
+
+=cut
+
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+
sub page {
my $self = shift;
my $a = {@_};
$reload_counter++;
- my $html = qq||
- . _unroll_markup( qq||, $self->js )
- . _unroll_markup( qq||, $self->css )
- . '' . ( $a->{title} || ref($self) ) . ''
- . ( $a->{head} || '' )
- . ''
- . ( $a->{body} || '' )
- . qq||
- . ''
- ;
+ my $status_line = '';
+ foreach my $part ( @{ $self->status } ) {
+ confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH';
+ foreach my $name ( keys %$part ) {
+ my $content = $part->{$name};
+ if ( ref($content) ) {
+ $content = '' . 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|\n|;
+ }
+ }
+
+ my $html = join("\n",
+ qq||,
+ $self->_head_html,
+ '' . ( $a->{title} || ref($self) ) . '',
+ '',
+ ( $a->{head} || '' ),
+ '',
+ ( $a->{body} || '' ),
+ qq|
+
+
+ |,
+ );
warn "## >>> page ",length($html), " bytes\n" if $self->debug;
return $html;
}
+sub error {
+ my $self = shift;
+ my $error = join(" ", @_);
+ my ($package, $filename, $line) = caller;
+ $error .= " at $filename line $line" if $error !~ m{ at };
+ warn "WARN: $error\n";
+ $error =~ s{at\s+(\S+)\s+line\s+(\d+)}{at $1 line $2}gsm;
+ return qq|$error
|;
+}
+
1;