--- trunk/lib/Frey/Web.pm 2008/07/17 17:08:15 155
+++ trunk/lib/Frey/Web.pm 2008/07/17 17:55:39 156
@@ -1,29 +1,14 @@
package Frey::Web;
use Moose::Role;
-use MooseX::AttributeHelpers;
use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess/;
-has 'js' => (
- metaclass => 'Collection::Array',
+has 'head' => (
is => 'rw',
isa => 'ArrayRef[Str]',
default => sub { [] },
- provides => {
- 'push' => 'add_js',
- },
-);
-
-has 'css' => (
- metaclass => 'Collection::Array',
- is => 'rw',
- isa => 'ArrayRef[Str]',
- default => sub { [ 'static/app.css' ] },
- provides => {
- 'push' => 'add_css',
- },
);
sub dom2html {
@@ -31,14 +16,18 @@
return Continuity::Widget::DomNode->create( @_ )->to_string;
}
-sub _unroll_markup {
-# warn "## _unroll_markup ",dump( @_ );
- my ( $markup, $array ) = @_;
+sub _head_html {
+ my $self = shift;
my $out = '';
- foreach my $path ( @$array ) {
+ foreach my $path ( @{ $self->head } ) {
$path =~ s!^/!!;
- confess "can't find $path" unless -e $path;
- $out .= sprintf( $markup, $path );
+ if ( $path =~ m/\.js$/ ) {
+ $out .= qq||;
+ } elsif ( $path =~ m/\.css$/ ) {
+ $out .= qq||;
+ } else {
+ confess "don't know how to render $path";
+ }
}
return $out;
}
@@ -57,10 +46,8 @@
$path =~ s!^/!!;
if ( -e $path ) {
- if ( $path =~ m/\.js$/ ) {
- $self->add_js( $path );
- } elsif ( $path =~ m/\.css$/ ) {
- $self->add_css( $path );
+ if ( $path =~ m/\.(?:js|css)$/ ) {
+ push @{ $self->head }, $path;
} else {
confess "can't add_head( $path ) it's not js or css";
}
@@ -80,13 +67,12 @@
$reload_counter++;
my $html = qq||
- . _unroll_markup( qq||, $self->js )
- . _unroll_markup( qq||, $self->css )
+ . $self->_head_html
. '' . ( $a->{title} || ref($self) ) . ''
. ( $a->{head} || '' )
. ''
. ( $a->{body} || '' )
- . qq||
+# . qq||
. ''
;