--- trunk/lib/Frey/Run.pm	2008/11/18 19:50:45	423
+++ trunk/lib/Frey/Run.pm	2008/11/19 15:28:23	455
@@ -4,6 +4,7 @@
 extends 'Frey::Action';
 with 'Frey::Web';
 with 'Frey::Escape';
+with 'Frey::Session';
 
 use Data::Dump qw/dump/;
 use Frey::Dumper;
@@ -27,8 +28,9 @@
 
 use Moose::Util::TypeConstraints;
 
-sub runnable { qw/data data.js markup sponge/ }
-enum 'Runnable' => runnable;
+subtype 'Runnable'
+	=> as 'Str',
+	=> where sub { m{^as_} };
 
 sub formats_available { qw/html js json yaml yml/ }
 enum 'Formats' => formats_available;
@@ -48,7 +50,7 @@
 has 'run' => (
 	is => 'rw',
 	isa => 'Runnable',
-	default => 'markup',
+	default => 'as_markup',
 );
 
 has 'format' => (
@@ -69,35 +71,42 @@
 			warn "got required params form for $class ", $self->run, " format: ", $self->format;
 		} else {
 
-			my $o = $class->new( %{ $self->params } );
+			$self->usage->{ $class }++;
+
+			my $o;
+			my ( $meta, $is_role, $instance ) = $self->class_meta( $class );
+			if ( $is_role ) {
+				$o = $instance;
+			} else {
+				$o = $class->new( %{ $self->params } );
+			}
+
 			$o->depends if $o->can('depends');
 
 			push @{ $self->status }, { qq|<a target="editor" href="/editor+$class+1">$class</a>| => $self->params };
 
 			if ( $self->run eq 'markup' ) {
-				warn "## using ",ref($o), "->markup";
+				warn "## using ",ref($o), "->as_markup";
 				if ( $o->can('page') ) {
-					#$html = $o->page;
-					$body = $o->markup unless $html;
-				} else {
-					$body = $o->markup;
+					$html = $o->page;
 				}
+				$body = $o->as_markup unless $html;
 
 				warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes";
 			} elsif ( $self->run eq 'sponge' ) {
-				$data = $o->sponge;
+				$data = $o->as_sponge;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
 				if ( $self->format eq 'html' ) {
 					my $rows = $#{ $data->{rows} } + 1;
 					$rows ||= 'no';
-					$body .= "<strong>$rows</strong> rows from <code>$class->new" . dump( $self->params ) . "->sponge</code>";
+					$body .= "<strong>$rows</strong> rows from <code>$class->new" . dump( $self->params ) . "->as_sponge</code>";
 					$body .= '<table>';
 					$body .= '<tr><th>' . join('</th><th>', @{$data->{NAME}} ) . '</th></tr>';
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
 				}
 			} elsif ( $self->run eq 'data' ) {
-				$data = $o->data;
+				$data = $o->as_data;
 			} else {
 				$body = $self->error( "IGNORE: $class ", $o->dump );
 			}
@@ -108,7 +117,7 @@
 				push @{ $self->status }, { 'data' => $data };
 			}
 			if ( ! $html ) {
-				$body .= Frey::Dumper->new( data => $data )->markup;
+				$body .= Frey::Dumper->new( data => $data )->as_markup;
 			}
 
 			# override our status with one from object
@@ -126,7 +135,7 @@
 		};
 	};
 
-	$html = $self->page( title => $self->class, body => dump($html) . $self->error( $@ ) ) if $@;
+	$html = $self->page( title => $self->class, body => $self->error( $@ ) ) if $@;
 
 	return $html;
 }