--- trunk/lib/Frey/Web.pm 2008/11/18 13:57:52 410
+++ trunk/lib/Frey/Web.pm 2008/11/19 19:11:52 465
@@ -1,7 +1,7 @@
package Frey::Web;
use Moose::Role;
-#with 'Frey::Escape';
+with 'Frey::Backtrace';
use Frey::Types;
@@ -24,8 +24,8 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->new->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->new->markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
] },
);
@@ -35,6 +35,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
@@ -71,6 +87,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -85,6 +103,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -92,17 +112,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;
@@ -126,7 +148,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 +167,31 @@
}
}
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
+ my $body = $a->{body};
+ $body ||= $self->as_markup if $self->can('as_markup');
+ if ( $self->content_type !~ m{html} ) {
+ warn "# return only $self body ", $self->content_type;
+ return $body
+ } elsif ( ! defined $body ) {
+ warn "# no body";
+ $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
@@ -167,10 +206,16 @@
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;
+
+ my @backtrace = $self->backtrace;
+ $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+
+ warn "ERROR: $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
|;
}