--- trunk/lib/Frey/Feed.pm	2008/11/05 08:21:06	295
+++ trunk/lib/Frey/Feed.pm	2008/11/05 08:21:09	299
@@ -9,6 +9,7 @@
 
 use Data::Feed;
 use Frey::Types;
+use Data::Dump qw/dump/;
 
 with 'Frey::Storage';
 
@@ -24,29 +25,31 @@
 	lazy => 1,
 	default => sub {
 		my ($self) = @_;
+		my $path = 'var/feed/' . $self->uri->host . '/' . $self->uri->path;
+		my $data = $self->load( $path );
+		if ( defined $data ) {
+			return $data;
+		}
+
 		warn "parse ", $self->uri;
-		Data::Feed->parse( $self->uri );
+		my $feed = Data::Feed->parse( $self->uri );
+		$self->store( $path, $feed );
+		$feed;
 	},
 );
 
 has title => (
 	is => 'ro',
 	lazy => 1,
-	default => sub { $_[0]->feed->title }
+	default => sub { $_[0]->feed->title },
 );
 
-use Data::Dump qw/dump/;
+sub entries { $_[0]->feed->entries }
 
 sub data {
 	my ($self) = @_;
-	my $path = 'var/feed/' . $self->uri->host . '/' . $self->uri->path;
-	my $data = $self->load( $path );
-	return $data if $data;
-
-	warn "# fetch ",$self->uri;
-	warn "# data ", dump( $self->feed->entries );
-	$self->store( $path, $self->feed->entries );
-	return $self->feed->entries;;
+	# data should return single element!
+	[ $self->entries ];
 }
 
 1;