--- trunk/lib/Frey/Web.pm 2008/11/18 12:02:57 407
+++ trunk/lib/Frey/Web.pm 2008/11/19 16:53:13 457
@@ -1,8 +1,6 @@
package Frey::Web;
use Moose::Role;
-#with 'Frey::Escape';
-
use Frey::Types;
use Continuity::Widget::DomNode;
@@ -10,6 +8,9 @@
use Carp qw/confess/;
use File::Slurp;
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+
has 'head' => (
is => 'rw',
isa => 'ArrayRef[Str]',
@@ -21,8 +22,8 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
] },
);
@@ -32,6 +33,22 @@
default => '/',
);
+has 'title' => (
+ is => 'rw',
+ isa => 'Str',
+ lazy => 1,
+ default => sub {
+ my ($self) = @_;
+ ref($self);
+ },
+);
+
+has 'content_type' => (
+ is => 'rw',
+ isa => 'Str',
+ default => 'text/html',
+);
+
=head2 inline_smaller_than
Inline JavaScript and CSS smaller than this size into page reducing
@@ -68,6 +85,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -82,6 +101,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -89,17 +110,19 @@
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;
@@ -115,9 +138,6 @@
=cut
-use Frey::Bookmarklet;
-use Frey::ClassBrowser;
-
sub page {
my $self = shift;
my $a = {@_};
@@ -126,7 +146,11 @@
my $status_line = '';
foreach my $part ( @{ $self->status } ) {
- confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH';
+ if ( ref($part) ne 'HASH' ) {
+ warn "part not hash ",dump( $part ) ;
+ #$self->status( $part );
+ next;
+ }
foreach my $name ( keys %$part ) {
my $content = $part->{$name};
if ( ref($content) ) {
@@ -141,18 +165,25 @@
}
}
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
+ my $body = $a->{body} || $self->as_markup;
+ return $body if $self->content_type !~ m{html};
+ $body ||= '';
+
my $html = join("\n",
qq||,
$self->_head_html,
- '' . ( $a->{title} || ref($self) ) . '',
+ '' . ( $self->title || $a->{title} || ref($self) ) . '',
'',
( $a->{head} || '' ),
- '',
- ( $a->{body} || '' ),
qq|
+
+ $body
@@ -171,6 +202,7 @@
$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;
+ $error =~ s{(via package ")([\w:]+)(")}{$1$2$3}gsm;
return qq|$error
|;
}