--- trunk/lib/Frey/Introspect.pm	2008/07/13 18:01:40	116
+++ trunk/lib/Frey/Introspect.pm	2008/11/05 08:20:42	269
@@ -25,14 +25,14 @@
 
 =head2 joose
 
-  my $js = $o->joose( 'Some::Package' );
+  my $js = $o->joose;
 
 =cut
 
 sub joose {
 	my ($self) = @_;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_package;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -42,15 +42,17 @@
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $class->name, 2);
+	my ( $m, $c ) = split(/::/, $self->package, 2);
 	my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
 
+	$c ||= '';
+
 	$out .= "Module(\"$m\", function (m) {\n\tClass(\"$c\", {\n\t\thas: {\n";
 
-	foreach ( $class->get_attribute_list ) {
+	foreach ( $meta->get_attribute_list ) {
 		$out .= "\t\t\t$_: {\n";
 
-		my $attr = $class->get_attribute($_);
+		my $attr = $meta->get_attribute($_);
 		my $is = $attr->_is_metadata;
 		$out .= "\t\t\t\tis: \"$is\",\n" if defined $is;
 		$out .= "\t\t\t\tlazy: true,\n" if $attr->is_lazy;
@@ -85,9 +87,9 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n";
+	$out .= "\nconsole.log( 'loaded " . $self->package . " from $filename' );\n";
 
-	warn "method_list = ",dump( $class->get_method_list ) if $self->debug;
+	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
 #	print $out;
 	my $path = "static/blib/$filename";
@@ -107,14 +109,14 @@
 sub methods {
 	my $self = shift;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_package;
 
 	my $attr;
-	$attr->{$_}++ foreach $class->get_attribute_list;
-	my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
+	$attr->{$_}++ foreach $meta->get_attribute_list;
+	my @methods = grep { ! defined($attr->{$_}) } $meta->get_method_list;
 	warn "# methods = ",dump( @methods ) if $self->debug;
 
-	return @methods;
+	return sort @methods;
 }
 
 use Frey::ClassLoader;
@@ -127,85 +129,104 @@
 
 =head1 OUTPUT GENERATION
 
-=head2 html
+=head2 markup
 
-  $o->html( $request );
+  $o->markup;
 
 =cut
 
-sub html {
-	my ( $self, $request ) = @_;
-
-	while (1) {
+sub markup {
+	my ( $self ) = @_;
 
-		my $js = $self->head_javascript;
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
+	$self->add_head( 'static/introspect.css' );
 
-function $(id) {
-	return document.getElementById(id)
-}
+	my ( $meta, $is_role ) = $self->load_package;
 
-</script>
-__END_OF_JS__
+	my $package = $self->package;
 
-		my ( $class, $meta, $is_role ) = $self->load_package;
+	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;
+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>';
+					}
+				}
+				$after .= ' ';
+			}
+			qq|<td class="a">$before $_</td><td>$after</td>|
+		} sort $meta->get_attribute_list
+	}
 
-		my $methods;
-		if ( $class->can('meta') ) {
-			$methods = dom2html(
-				ul => [
-					map { (
-						li => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ]
-					) } $self->methods
-				]
-			);
-			$methods = "<h2>Methods</h2>$methods" if $methods;
-		} else {
-			$methods = '<b>not introspectable</b>';
-		}
+	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 $attributes;
-		if ( $class->get_attribute_list ) {
-			$attributes = dom2html(
-				table => [
+	my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
+	if ( ! $is_role ) {
+		if ( $meta->superclasses ) {
+			$superclasses = 'Superclasses: ' .
+				join(', ',
 					map {
-						my $attr = $class->get_attribute($_);
-						warn "## $_ ", $attr->is_required ? 'required' : 'optional';
-						( tr => [
-							td => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ],
-							td => [ $attr->is_required ? ' <b>required</b>' : '' ],
-						] )
-					} $class->get_attribute_list
-				],
-			);
-			$attributes = "<h2>Attributes</h2>$attributes" if $attributes;
-		} else {
-			$attributes = '<b>no attributes</b>';
+						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 $html = dom2html(
-			html => [
-				head => [
-					link => { rel=>"stylesheet", href=>"/static/app.css", type=>"text/css", media=>"screen" },
-					$js,
-					title => [ 'Introspect ', $self->package ],
-				],
-				body => [
-					h1 => [ $self->package ],
-					$methods,
-					$attributes,
-				],
-			]
+	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
 		);
-
-		$request->print($html);
-		warn "# >>> html ",length($html)," bytes\n";
-		$request->next;
+		$roles = " with roles: $roles" if $roles;
 	}
-	warn "# exit html";
+
+	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|
+
+	);
+
+	return $html;
 }
 
 =head1 SEE ALSO