--- trunk/lib/Frey/Introspect.pm	2008/07/06 11:59:58	56
+++ trunk/lib/Frey/Introspect.pm	2008/11/16 16:36:53	358
@@ -2,20 +2,18 @@
 
 use Moose;
 use Carp;
-use Class::MOP;
-use Moose::Meta::Role;
-use Moose::Meta::Class;
-use Scalar::Util qw/blessed/;
+#use Moose::Meta::Role;
+#use Moose::Meta::Class;
 use Data::Dump qw/dump/;
 use File::Slurp;
 use List::Util;
 
-use Continuity::Widget::DomNode;
 use lib 'lib';
 
-extends 'Frey';
+extends 'Frey::ClassLoader';
+with 'Frey::Web';
 
-has 'package' => (
+has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
@@ -25,73 +23,36 @@
 	is => 'rw',
 );
 
-=head2 load_package
-
-  my ( $class, $meta, $is_role ) = $o->load_package( 'Some::Package' );
-
-=cut
-
-sub load_package {
-	my ( $self ) = @_;
-
-	my $package = $self->package;
-
-	#intercept role application so we can accurately generate
-	#method and attribute information for the parent class.
-	#this is fragile, but there is not better way that i am aware of
-	my $rmeta = Moose::Meta::Role->meta;
-	$rmeta->make_mutable if $rmeta->is_immutable;
-	my $original_apply = $rmeta->get_method("apply")->body;
-	$rmeta->remove_method("apply");
-	my @roles_to_apply;
-	$rmeta->add_method("apply", sub{push(@roles_to_apply, [@_])});
-	#load the package with the hacked Moose::Meta::Role
-	eval { Class::MOP::load_class($package); };
-	confess "Failed to load package ${package} $@" if $@;
-
-	my $meta = $package->meta;
-
-	my ($class, $is_role);
-	if($package->meta->isa('Moose::Meta::Role')){
-		$is_role = 1;
-		# we need to apply the role to a class to be able to properly introspect it
-		$class = Moose::Meta::Class->create_anon_class;
-		$original_apply->($meta, $class);
-	} else {
-		#roles don't have superclasses ...
-		$class = $meta;
-	}
-	return ( $class, $meta, $is_role );
-}
-
 =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->class_meta;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
 			grep { $_ ne 'Moose::Object' } $meta->superclasses;
-		warn "superclasses ",dump( @superclasses );
+		warn "superclasses ",dump( @superclasses ) if $self->debug;
 	}
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $class->name, 2);
+	my ( $m, $c ) = split(/::/, $self->class, 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;
@@ -116,7 +77,7 @@
 	$out .= "\t\t},\n\t\tmeta: Frey.HTML,
 		classMethods: {
 			renderHTML: function () {
-				return new Joose.SimpleRequest().getText(\"/~/${m}::${c}\")
+				return new Joose.SimpleRequest().getText(\"/" . $self->class . "\")
 			},\n";
 
 	$out .= "\t\t},\n";
@@ -126,12 +87,9 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $class->name . " from $filename' );\n";
-
-	warn $class->dump(2);
+	$out .= "\nconsole.log( 'loaded " . $self->class . " from $filename' );\n";
 
-	warn "method_list = ",dump( $class->get_method_list );
-  	warn dump( map{ $class->get_method($_)->name } sort $class->get_method_list );
+	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
 #	print $out;
 	my $path = "static/blib/$filename";
@@ -151,108 +109,140 @@
 sub methods {
 	my $self = shift;
 
-	my ( $class, $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->class_meta;
 
 	my $attr;
-	$attr->{$_}++ foreach $class->get_attribute_list;
-	my @methods = grep { ! defined($attr->{$_}) } $class->get_method_list;
-	warn "# methods = ",dump( @methods );
+	$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;
 }
 
 =head1 OUTPUT GENERATION
 
-=head2 html
+=head2 markup
 
-  $o->html( $request );
+  $o->markup;
 
 =cut
 
-our @javascript = ( qw'
-../lib/Joose.js
-');
+sub markup {
+	my ( $self ) = @_;
 
-sub html {
-	my ( $self, $request ) = @_;
+	$self->add_head( 'static/introspect.css' );
 
-	while (1) {
+	my ( $meta, $is_role ) = $self->class_meta;
 
-		my $js = Continuity::Widget::DomNode->create(
-			map {
-				( script => { type => 'text/javascript', src => $_ } )
-			} @javascript
-		)->to_string;
-
-		$js .= << '__END_OF_JS__';
-<script type="text/javascript">
-joose.loadComponents("../lib")
+	my $class = $self->class;
 
-function $(id) {
-	return document.getElementById(id)
-}
-
-</script>
-__END_OF_JS__
+	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
+				);
+		}
+	}
 
-		warn "# >>> js\n$js\n";
+	my $role_method;
+	my $role_attribute;
 
-		my $methods;
+	if ( $meta->can('roles') ) {
+		my $role_nr = 1;
+		$roles = join(' ',
+			grep { ! m/\Q$class\E/ }	# skip me
+			map {
+				my $name = $_->name;
+				$role_method->{    $_ }->{$name} = $role_nr foreach $_->get_method_list;
+				$role_attribute->{ $_ }->{$name} = $role_nr foreach $_->get_attribute_list;
+				qq|<a class="frey-popdown" href="/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a><sup>| . $role_nr++ . qq|</sup>|;
+			}
+			$meta->calculate_all_roles
+		);
+		$roles = qq| with roles: $roles| if $roles;
+	}
+	warn "# role_method ",dump( $role_method );
 
-		my ( $class, $meta, $is_role );
-		eval { ( $class, $meta, $is_role ) = $self->load_package(); };
-		if ( $@ ) {
-			warn "ERROR: $@";
-			$request->conn->send_status_line( 500, $@ );
-			$request->print( $@ );
-			$request->next;
-			return;
+	my @methods;
+	@methods = map {
+		my $name = $_;
+		if ( $role_method->{$name} ) {
+			my ( $role_name, $nr ) = each %{ $role_method->{$name} };
+			$name .= qq|<sup title="$role_name">$nr</sup>|;
 		}
+		qq|<td class="m">$name</td>|
+	} $self->methods;
 
-		if ( $class->can('meta') ) {
-			$methods = Continuity::Widget::DomNode->create(
-				ul => [
-					map { (
-						li => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ] ]
-					) } $self->methods
-				]
-			)->to_string;
-		} else {
-			$methods = '<b>not introspectable</b>';
-		}
+	my @attributes;
+	if ( $meta->get_attribute_list ) {
+	@attributes = map {
+			my $name = $_;
+			my $attr = $meta->get_attribute($name);
+			warn "## ref attr: ",ref( $attr );
+			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_default 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};
+						# we need dump here instead of $attr->$getter->dump because default can return scalar
+						$after .= '<code>' . dump( $attr->$getter ) . '</code>' if $getter ne $check;
+						$after .= '</span>';
+					}
+				}
+				$after .= ' ';
+			}
+			my $type = $attr->has_type_constraint ? $attr->type_constraint->name : '';
 
-		my $attributes = Continuity::Widget::DomNode->create(
-			ul => [
-				map {
-					my $attr = $class->get_attribute($_);
-					warn "## $_ ", $attr->is_required ? 'required' : 'optional';
-					( li => [ a => { href => '/~/' . $self->package . '/' . $_ } => [ $_ ], ( $attr->is_required ? ' <b>required</b>' : '' ) ] )
-				} $class->get_attribute_list
-			],
-		)->to_string;
-
-		my $doc = Continuity::Widget::DomNode->create(
-			html => [
-				head => [
-					link => { rel=>"stylesheet", href=>"/static/app.css", type=>"text/css", media=>"screen" },
-					$js,
-					title => [ 'Introspect ', $self->package ],
-				],
-				body => [
-					h1 => [ $self->package ],
-					h2 => [ 'Methods' ],
-					$methods,
-					h2 => [ 'Atrributes' ],
-					$attributes,
-				],
-			]
-		);
+			if ( $role_attribute->{$name} ) {
+				my ( $role_name, $nr ) = each %{ $role_attribute->{$name} };
+				$name .= qq|<sup title="$role_name">$nr</sup>|;
+			}
+
+			qq|<td class="a">$before $name</td><td class="t">$type</td><td>$after</td>|
+		} sort $meta->get_attribute_list
+	}
 
-		$request->print($doc->to_string);
-		warn "# >>> html\n", $doc->to_string, "\n";
-		$request->next;
+	my $table = qq|<table class="frey-introspect"><tr><th class="m">Methods</th><th class="a">Attributes</th><th>Type</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>|;
 	}
-	warn "# exit html";
+	$table .= qq|</table>|;
+
+	my $pod = Frey::Pod->new( class => $class )->markup;
+
+	use Frey::Run;
+	my $runnable = join("\n", map { qq|<a href="/$class/$_">$_</a>| } grep { $class->can($_) } Frey::Run->runnable );
+	$runnable = " runnable: $runnable" if $runnable;
+
+	my $html = {
+		title => "Introspect $class",
+		body => qq|<h1>$class</h1>|
+			. qq|<div class="frey-introspect">$superclasses\n$roles\n$runnable\n|
+			. ( $pod ? qq|<a href="#___top" title="Skip to POD" style="font-size: 80%; color: #aaa;">&darr;pod&darr</a>| : '' )
+			. qq|$table\n$pod</div>|
+
+	};
+
+	return $html;
 }
 
 =head1 SEE ALSO