--- trunk/lib/Frey/SVN.pm	2008/12/09 20:31:31	770
+++ trunk/lib/Frey/SVN.pm	2008/12/17 19:40:31	875
@@ -11,6 +11,7 @@
 #with 'Frey::Storage';
 
 use XML::Simple;
+use DateTimeX::Easy;
 
 has repository => (
 	is => 'rw',
@@ -25,25 +26,9 @@
 	default => 50,
 );
 
-sub as_markup {
-	my ($self) = @_;
-
-	# extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200
-	my $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*';
-
-	sub encode {
-		my $foo = shift;
-		$foo =~ s/$svk_rev_re//gsm;
-		$foo =~ s/</&lt;/g;
-		$foo =~ s/>/&gt;/g;
-		$foo =~ s/"/&quot;/g;
-		$foo =~ s/([\n\r][\n\r]+)/<\/p>$1<p>/gis;
-		$foo =~ s/([\n\r]+)([\-\*]\s+)/$1<br\/>$2/gis;
-		$foo =~ s/([\n\r]+)(r\d+:\s+)/$1<br\/>$2/gis;
-		$foo =~ s/([\n\r]+)(\s+r\d+@)/$1<br\/>$2/gis;		# svk
-		return $foo;
-	}
-
+sub iterator {
+	my ($self,$coderef) = @_;
+	
 	sub sh_regex($$) {
 		my ($cmd,$regex) = @_;
 		open(my $sh, $cmd . ' |') || die "sh_regex failed on $cmd: $!";
@@ -105,19 +90,59 @@
 
 	my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);
 
-	our $html = '';
-	sub html {
-		$html .= join("\n", @_);
+	foreach my $e (@{$xml->{'logentry'}}) {
+		warn "# e = ",$self->dump( $e ) if $self->debug;
+		$coderef->($e);
 	}
+}
+
+sub as_markup {
+	my ($self) = @_;
+
+	# extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200
+	our $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*';
+
+	sub encode {
+		my $foo = shift;
+		$foo =~ s/$svk_rev_re//gsm;
+		$foo =~ s/</&lt;/g;
+		$foo =~ s/>/&gt;/g;
+		$foo =~ s/"/&quot;/g;
+		$foo =~ s/([\n\r][\n\r]+)/$1<br\/>/gis;
+		$foo =~ s/([\n\r]+)([\-\*]\s+)/$1<br\/>$2/gis;
+		$foo =~ s/([\n\r]+)(r\d+:\s+)/$1<br\/>$2/gis;
+		$foo =~ s/([\n\r]+)(\s+r\d+@)/$1<br\/>$2/gis;		# svk
+		return $foo;
+	}
+
+	our $html = '';
+
+	$self->add_css(qq|
+		.files { color: #888; font-family: monospace; }
+		.date, .revision { color: #666; }
+		.message { padding-bottom: 0.5em; }
+
+		ins { color: #8c8 }
+		del { color: #c88 }
+	|);
+
+	$self->iterator( sub {
+		my $e = shift;
 
-	foreach my $e (@{$xml->{'logentry'}}) {
 		my $rev = $e->{'revision'};
 		my $date = $e->{'date'};
 
 		$date =~ s/T/ /;
 		$date =~ s/\.\d+Z$//;
 
-		html '<p><tt>'.$date.'</tt> <em>',$e->{'author'},'</em> <tt style="color:#808080">r',$e->{'revision'},'</tt></p>';
+		$html .= qq|<div><span class="date">$date</span> <em>$e->{author}</em> <span class="revision">$e->{revision}</span></div>\n|;
+
+		my $msg = $e->{'msg'};
+		$msg = '' if ref($msg); # FIXME why do I need this, dammit?
+		if ( $msg ) {
+			$msg = encode( $msg );
+			$msg = qq|<div class="message">$msg</div>|;
+		}
 
 		my @files;
 
@@ -128,16 +153,46 @@
 				push @files, "<ins>$path</ins>";
 			} elsif ($action eq "D") {
 				push @files, "<del>$path</del>";
-			} else{
+			} else {
 				push @files, $path;
 			}
 		}
 
-		html '<blockquote><p><tt style="color:#808080">',join(", ",@files),':</tt> ',encode($e->{'msg'}),'</p></blockquote>';
+		$html .= qq|<blockquote>\n$msg\n<div class="files">\n| . join(",\n",@files) . qq|\n</div>\n</blockquote>|;
 
-	}
+	});
 
 	return $html;
 }
 
+sub codeswarm_as_markup {
+	my ($self) = @_;
+
+	$self->content_type('text/xml');
+
+	my $file_events = '';
+
+	$self->iterator( sub {
+		my $e = shift;
+		
+		my $rev = $e->{'revision'};
+		my $date = DateTimeX::Easy->new( $e->{'date'} )->epoch . '000'; # ms
+		my $author = $e->{'author'};
+
+		foreach my $p (@{$e->{'paths'}->{'path'}}) {
+			my ($action,$path) = ($p->{'action'},$p->{'content'});
+			$file_events .= qq|\t<event filename="$path" date="$date" author="$author" />\n|;
+		}
+
+	});
+
+	return qq|<?xml version="1.0"?>
+	<!-- One commit per day for one month by a documenter and programmer. -->
+	<file_events>
+	$file_events
+	</file_events>
+	|;
+
+}
+
 1;