--- trunk/lib/Frey/Web.pm 2008/11/18 00:19:22 388
+++ trunk/lib/Frey/Web.pm 2008/11/18 16:39:13 417
@@ -1,13 +1,18 @@
package Frey::Web;
use Moose::Role;
+#with 'Frey::Escape';
+
use Frey::Types;
use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess/;
use File::Slurp;
+use Frey::Bookmarklet;
+use Frey::ClassBrowser;
+
has 'head' => (
is => 'rw',
isa => 'ArrayRef[Str]',
@@ -19,12 +24,12 @@
isa => 'ArrayRef[HashRef[Str]]',
lazy => 1,
default => sub { [
- { 'Bookmarklets' => Frey::Bookmarklet->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new->markup },
] },
);
-has 'urequest_url' => (
+has 'request_url' => (
is => 'rw',
isa => 'Uri', coerce => 1,
default => '/',
@@ -113,9 +118,6 @@
=cut
-use Frey::Bookmarklet;
-use Frey::ClassBrowser;
-
sub page {
my $self = shift;
my $a = {@_};
@@ -124,9 +126,18 @@
my $status_line = '';
foreach my $part ( @{ $self->status } ) {
+ confess "part not hash ",dump( $part ) unless ref($part) eq 'HASH';
foreach my $name ( keys %$part ) {
- warn "### part [$name] = ", length( $part->{name} ), " bytes" if $self->debug;
- $status_line .= qq|$name| . $part->{$name} . qq||;
+ 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|$name $content\n|;
}
}
@@ -141,7 +152,7 @@
qq|