--- branches/mojo/lib/Frey/Introspect.pm	2008/11/01 15:26:48	234
+++ branches/mojo/lib/Frey/Introspect.pm	2008/11/01 15:36:33	235
@@ -129,110 +129,104 @@
 
 =head1 OUTPUT GENERATION
 
-=head2 request
+=head2 markup
 
-  $o->request( $request );
+  $o->markup;
 
 =cut
 
-sub request {
-	my ( $self, $request ) = @_;
+sub markup {
+	my ( $self ) = @_;
 
 	$self->add_head( 'static/introspect.css' );
 
-	while (1) {
+	my ( $meta, $is_role ) = $self->load_package;
 
-		my ( $meta, $is_role ) = $self->load_package;
+	my $package = $self->package;
 
-		my $package = $self->package;
+	my @methods;
+	@methods = map { qq|<td class="m">$_</td>| } $self->methods;
 
-		my @methods;
-		@methods = map { qq|<td class="m">$_</td>| } $self->methods;
-
-		my @attributes;
-		if ( $meta->get_attribute_list ) {
-		@attributes = map {
-				my $attr = $meta->get_attribute($_);
-				my ( $before, $title, $after ) = ( '', '', '' );
-				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
+	my @attributes;
+	if ( $meta->get_attribute_list ) {
+	@attributes = map {
+			my $attr = $meta->get_attribute($_);
+			my ( $before, $title, $after ) = ( '', '', '' );
+			( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
 warn $attr->dump(3);
-				foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_trigger has_documentation has_applied_traits/ ) {
-					my $getter;
-					
-					$getter = $check;
-					$getter =~ s/^has_//;
-					
-					if ( $attr->$check ) {
-						if ( $getter eq $check ) {
-							$after .= "$check";
-						} else {
-							$after .= qq{<span class="frey-popdown">$check};
-							$after .= '<code>' . $attr->$getter->dump . '</code>' if $getter ne $check;
-							$after .= '</span>';
-						}
+			foreach my $check ( qw/has_type_constraint has_handles is_weak_ref is_required is_lazy should_coerce should_auto_deref has_trigger has_documentation has_applied_traits/ ) {
+				my $getter;
+				
+				$getter = $check;
+				$getter =~ s/^has_//;
+				
+				if ( $attr->$check ) {
+					if ( $getter eq $check ) {
+						$after .= "$check";
+					} else {
+						$after .= qq{<span class="frey-popdown">$check};
+						$after .= '<code>' . $attr->$getter->dump . '</code>' if $getter ne $check;
+						$after .= '</span>';
 					}
-					$after .= ' ';
 				}
-				qq|<td class="a">$before $_</td><td>$after</td>|
-			} sort $meta->get_attribute_list
-		}
+				$after .= ' ';
+			}
+			qq|<td class="a">$before $_</td><td>$after</td>|
+		} sort $meta->get_attribute_list
+	}
 
-		my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th class="p">Properties</th></tr>|;
-		while ( @methods || @attributes ) {
-			my ($m,$a) = ( shift @methods, shift @attributes );
-			$m ||= '<td></td>';
-			$a ||= '<td></td>';
-			$table .= qq|<tr>$m$a</tr>|;
-		}
-		$table .= qq|</table>|;
+	my $table = qq|<table class="frey-object-browser"><tr><th class="m">Methods</th><th class="a">Attributes</th><th class="p">Properties</th></tr>|;
+	while ( @methods || @attributes ) {
+		my ($m,$a) = ( shift @methods, shift @attributes );
+		$m ||= '<td></td>';
+		$a ||= '<td></td>';
+		$table .= qq|<tr>$m$a</tr>|;
+	}
+	$table .= qq|</table>|;
 
-		my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
-		if ( ! $is_role ) {
-			if ( $meta->superclasses ) {
-				$superclasses = 'Superclasses: ' .
-					join(', ',
-						map {
-							my $name = $_->meta->name;
-							qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
-						}
-						#grep { $_ ne 'Moose::Object' }
-						$meta->superclasses
-					);
-			}
+	my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
+	if ( ! $is_role ) {
+		if ( $meta->superclasses ) {
+			$superclasses = 'Superclasses: ' .
+				join(', ',
+					map {
+						my $name = $_->meta->name;
+						qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $_->meta->dump(2) . qq|</code></a>|;
+					}
+					#grep { $_ ne 'Moose::Object' }
+					$meta->superclasses
+				);
 		}
+	}
 
-		if ( $meta->can('roles') ) {
-			$roles = join(', ',
-				grep { ! m/\Q$package\E/ }	# skip me
-				map {
-					my $name = $_->name;
-					qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
-				}
-				$meta->calculate_all_roles
-			);
-			$roles = " with roles: $roles" if $roles;
-		}
+	if ( $meta->can('roles') ) {
+		$roles = join(', ',
+			grep { ! m/\Q$package\E/ }	# skip me
+			map {
+				my $name = $_->name;
+				qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
+			}
+			$meta->calculate_all_roles
+		);
+		$roles = " with roles: $roles" if $roles;
+	}
 
-		my $pod = Frey::Pod->new( class => $package )->markup;
+	my $pod = Frey::Pod->new( class => $package )->markup;
 
-		use Frey::Run;
-		my $execute = join("\n", map { qq|<a href="/$_/$package">$_</a>| } grep { $package->can($_) } Frey::Run->execute );
-		$execute = " execute: $execute" if $execute;
-
-		my $html = $self->page(
-			title => "Introspect $package",
-			body => qq|<h1>$package</h1>|
-				. qq|$superclasses\n$roles\n$execute\n|
-				. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
-				. qq|$table\n$pod|
+	use Frey::Run;
+	my $execute = join("\n", map { qq|<a href="/$_/$package">$_</a>| } grep { $package->can($_) } Frey::Run->execute );
+	$execute = " execute: $execute" if $execute;
+
+	my $html = $self->page(
+		title => "Introspect $package",
+		body => qq|<h1>$package</h1>|
+			. qq|$superclasses\n$roles\n$execute\n|
+			. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
+			. qq|$table\n$pod|
 
-		);
+	);
 
-		$request->print($html);
-		warn "# >>> html ",length($html)," bytes\n";
-		$request->next;
-	}
-	warn "# exit html";
+	return $html;
 }
 
 =head1 SEE ALSO