--- trunk/lib/Frey/ClassBrowser.pm	2008/11/18 12:55:32	408
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/19 16:53:13	457
@@ -2,17 +2,31 @@
 use Moose;
 
 extends 'Frey::ClassLoader';
+with 'Frey::Web';
+with 'Frey::Session';
 
 use Frey::Run;
+use Data::Dump qw/dump/;
 
-our $markup;
+has 'usage_on_top' => (
+	is => 'rw',
+	isa => 'Bool',
+	default => 1,
+	documentation => 'Show usage on top of list',
+);
 
-sub markup {
+sub as_markup {
 	my $self = shift;
-	return $markup if $markup;
-	my $html;
+	my $row;
+
+	my $usage = $self->session_dump( $self->usage );
+	#warn "# usage ",dump( $usage );
 	foreach my $class ( $self->classes ) {
-		$html .= qq|<tr><td><a href="/$class" title="| . $self->class_path( $class ) . qq|">$class</a></td><td>|;
+		my $html
+			= qq|<tr><td><a href="/$class" title="|
+			. $self->class_path( $class )
+			. qq|">$class</a></td><td>|
+			;
 		if ( $class->can('meta') ) {
 			if ( $class->meta->isa('Moose::Meta::Role') ) {
 				$html .= qq|role|;
@@ -23,21 +37,42 @@
 		my @run;
 		my @input;
 		push @run, qq|<a href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
-		my @methods = $self->class_methods( $class );
-		foreach my $try ( Frey::Run->runnable ) {
-			next unless $class->can($try);
-			if ( grep { /^\Q$try\E$/ } @methods ) {
-				push @run, qq|<a href="/$class/$try">$try</a>|;
-			} else {
-				push @input, $try;
-			}
-		}
-		$html .= qq|</td><td>| . join(' ', @run) . qq|</td><td>| .
-			( @input ? '&larr; ' . join(' ', @input) : '' ) .
-			qq|</td></tr>|;
+		my @class_methods = $self->class_methods( $class );
+		
+		push @run, qq|<a href="/$class/as_$_">$_</a>|
+			foreach ( map { s{^as_}{} } $self->class_runnable( $class ) );
+		push @input, $_
+			foreach $self->class_inputs( $class );
+
+		$usage->{$class} ||= 0;
+		$html
+			.= qq|</td><td>|
+			. join(' ', @run)
+			. qq|</td><td>|
+			. ( @input ? '&larr; ' . join(' ', @input) : '' )
+			. qq|</td><td>|
+			. ( $usage->{$class} || '' )
+			. qq|</td></tr>|
+			;
+		$row->{$class} = $html;
 	}
-	$html = "<table>$html</table>" if $html;
-	$markup = $html;
+
+	return 
+		qq|<table>| . join("\n",
+			map { $row->{$_} }
+			sort {
+				if ( $usage->{$a} || $usage->{$b} ) {
+					if ( $self->usage_on_top ) {
+						$usage->{$b} <=> $usage->{$a};
+					} else {
+						$usage->{$a} <=> $usage->{$b};
+					}
+				} else {
+					$a cmp $b;
+				}
+			}
+			keys %$row
+		) . qq|</table>|;
 }
 
 1;