--- trunk/lib/Frey/Designer.pm	2008/10/28 22:13:08	201
+++ branches/no-pager/lib/Frey/Designer.pm	2008/12/09 20:28:33	762
@@ -1,9 +1,9 @@
-package Frey::Designer;
+package Frey::HTML::Designer;
 use Moose;
 
 =head1 NAME
 
-Frey::Designer - modify html (sometime in future)
+Frey::HTML::Designer - modify html (sometime in future)
 
 =cut
 
@@ -12,6 +12,7 @@
 
 extends 'Frey';
 with 'Frey::Web';
+with 'Frey::Path';
 
 has 'uri' => (
 	is => 'rw',
@@ -37,13 +38,12 @@
 use HTML::Query;
 use File::Slurp;
 use LWP::Simple qw/get/;
-use File::Path;
 use Data::Dump qw/dump/;
 use HTML::ResolveLink;
 
 sub path {
 	my $self = shift;
-	my $path = 'templates/www.carnet.hr/' . $self->uri->path;
+	my $path = join('/', ( 'templates', $self->uri->host, $self->uri->path ) );
 	$path .= '.html' if $path !~ m/\.\w+$/;
 	return $path;
 }
@@ -56,9 +56,7 @@
 
 	if ( ! -e $path && $self->mirror ) {
 
-		my $base_path = $path;
-		$base_path =~ s{/[^/]+$}{};
-		mkpath $base_path if ! -e $base_path;
+		$self->mkbasepath( $path );
 
 		my $url = $self->uri;
 		warn ">> mirror $url -> $path\n";
@@ -81,8 +79,8 @@
 	return $body;
 }
 
-sub html {
-    my ( $self, $req ) = @_;
+sub as_markup {
+    my ( $self ) = @_;
 
 	my $body = $self->get_page;
 
@@ -117,7 +115,6 @@
 
 	warn "<< ", $self->uri,
 		" ", -s $self->path,
-		" ", $req->params ? dump( $req->params ) : '',
 		"\n";
 
 =for later
@@ -141,7 +138,7 @@
 
 	warn $body;
 
-	$req->print( $self->page( title => $self->uri, body => $body ) );
+	return $self->page( title => $self->uri, body => $body );
 }
 
 1;