--- trunk/lib/Frey/Introspect.pm	2008/11/05 08:20:42	269
+++ trunk/lib/Frey/Introspect.pm	2008/11/05 08:20:44	270
@@ -13,7 +13,7 @@
 extends 'Frey';
 with 'Frey::Web';
 
-has 'package' => (
+has 'class' => (
 	is => 'rw',
 	isa => 'Str',
 	required => 1,
@@ -32,7 +32,7 @@
 sub joose {
 	my ($self) = @_;
 
-	my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_class;
 
 	if ( ! $is_role ) {
 		my @superclasses = map{ $_->meta->name }
@@ -42,7 +42,7 @@
 
 	my $out;
 
-	my ( $m, $c ) = split(/::/, $self->package, 2);
+	my ( $m, $c ) = split(/::/, $self->class, 2);
 	my $filename = $m . '.' . ( $c ? "$c." : '' ) . 'js';
 
 	$c ||= '';
@@ -77,7 +77,7 @@
 	$out .= "\t\t},\n\t\tmeta: Frey.HTML,
 		classMethods: {
 			renderHTML: function () {
-				return new Joose.SimpleRequest().getText(\"/~/" . $self->package . "\")
+				return new Joose.SimpleRequest().getText(\"/~/" . $self->class . "\")
 			},\n";
 
 	$out .= "\t\t},\n";
@@ -87,7 +87,7 @@
 	$out =~ s/,\n$/\n/;
 	$out .= "});\n";
 
-	$out .= "\nconsole.log( 'loaded " . $self->package . " from $filename' );\n";
+	$out .= "\nconsole.log( 'loaded " . $self->class . " from $filename' );\n";
 
 	warn "method_list = ",dump( $meta->get_method_list ) if $self->debug;
 
@@ -109,7 +109,7 @@
 sub methods {
 	my $self = shift;
 
-	my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_class;
 
 	my $attr;
 	$attr->{$_}++ foreach $meta->get_attribute_list;
@@ -121,9 +121,9 @@
 
 use Frey::ClassLoader;
 
-sub load_package {
+sub load_class {
 	my $self = shift;
-	return Frey::ClassLoader->load_package( $self->package );
+	return Frey::ClassLoader->load_package( $self->class );
 }
 
 
@@ -140,9 +140,9 @@
 
 	$self->add_head( 'static/introspect.css' );
 
-	my ( $meta, $is_role ) = $self->load_package;
+	my ( $meta, $is_role ) = $self->load_class;
 
-	my $package = $self->package;
+	my $class = $self->class;
 
 	my @methods;
 	@methods = map { qq|<td class="m">$_</td>| } $self->methods;
@@ -201,7 +201,7 @@
 
 	if ( $meta->can('roles') ) {
 		$roles = join(', ',
-			grep { ! m/\Q$package\E/ }	# skip me
+			grep { ! m/\Q$class\E/ }	# skip me
 			map {
 				my $name = $_->name;
 				qq|<a class="frey-popdown" href="/~/$name">$name<code>| . $name->meta->dump(2) . qq|</code></a>|;
@@ -211,15 +211,15 @@
 		$roles = " with roles: $roles" if $roles;
 	}
 
-	my $pod = Frey::Pod->new( class => $package )->markup;
+	my $pod = Frey::Pod->new( class => $class )->markup;
 
 	use Frey::Run;
-	my $execute = join("\n", map { qq|<a href="/$_/$package">$_</a>| } grep { $package->can($_) } Frey::Run->execute );
+	my $execute = join("\n", map { qq|<a href="/$_/$class">$_</a>| } grep { $class->can($_) } Frey::Run->execute );
 	$execute = " execute: $execute" if $execute;
 
 	my $html = $self->page(
-		title => "Introspect $package",
-		body => qq|<h1>$package</h1>|
+		title => "Introspect $class",
+		body => qq|<h1>$class</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|