--- trunk/lib/Frey/Introspect.pm	2008/07/15 14:56:28	134
+++ trunk/lib/Frey/Introspect.pm	2008/07/15 18:06:27	137
@@ -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,11 +109,11 @@
 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 sort @methods;
@@ -138,21 +140,21 @@
 
 	while (1) {
 
-		my ( $class, $meta, $is_role ) = $self->load_package;
+		my ( $meta, $is_role ) = $self->load_package;
 
 		my $package = $self->package;
 
 		my @methods;
-		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods if $class->can('meta');
+		@methods = map { qq|<td><a href="/~/$package/$_">$_</a></td>| } $self->methods;
 
 		my @attributes;
-		if ( $class->get_attribute_list ) {
+		if ( $meta->get_attribute_list ) {
 		@attributes = map {
-				my $attr = $class->get_attribute($_);
+				my $attr = $meta->get_attribute($_);
 				my ( $before, $title, $after ) = ( '', '', '' );
-				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->can('is_required') && $attr->is_required;
+				( $before, $title, $after ) = ( '<b>', ' title="required"', '</b>' ) if $attr->is_required;
 				qq|<td>$before<a href="/~/$package/$_?"$title>$_</a>$after</td>|
-			} sort $class->get_attribute_list
+			} sort $meta->get_attribute_list
 		}
 
 		my $table = qq|<table><tr><th>Methods</th><th>Attributes</th></tr>|;