--- trunk/lib/Frey/Server.pm 2008/07/09 13:11:26 67
+++ trunk/lib/Frey/Server.pm 2008/07/11 22:54:42 101
@@ -2,14 +2,13 @@
use Moose;
+with 'Frey::Web';
+
use Continuity;
#use Continuity::REPL;
-use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Frey;
-use Frey::Introspect;
-use Frey::ObjectBrowser;
+use Frey::ClassLoader;
my @messages; # Global (shared) list of messages
my $got_message; # Flag to indicate that there is a new message to display
@@ -27,6 +26,7 @@
debug_level => 1,
staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
);
+ Frey::ClassLoader->new->load_all_classes();
$server->loop;
}
@@ -50,7 +50,7 @@
}
if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
- my $f = Frey::ObjectBrowser->new;
+ my $f = Frey::ObjectBrowser->new( fey_class => $1 );
$f->html( $req );
}
@@ -63,21 +63,21 @@
} else {
- my $f = Frey->new;
- my $classes = Continuity::Widget::DomNode->create(
+ my $f = Frey::ClassLoader->new;
+ my $classes = dom2html(
ul => [
map {
warn dump( $_ );
- my ( $package, $path ) = %$_;
+ my $package = $_;
( li => [
a => { href => '/~/' . $package . '/' } => [ $package ],
- ' ',
- a => { href => '/ob/' . $package } => [ 'browse' ],
- " $path"
+ ' ', $f->package_path( $package ), ' ',
+ $package->can('rows') ?
+ ( a => { href => '/ob/' . $package } => [ 'browse' ] ) : '',
] )
- } @{ $f->classes }
+ } $f->classes
],
- )->to_string;
+ );
$req->print( $classes );
}