--- trunk/lib/Frey/ClassLoader.pm	2008/07/11 19:19:42	100
+++ trunk/lib/Frey/ClassLoader.pm	2008/07/15 18:06:27	137
@@ -6,25 +6,32 @@
 use Data::Dump qw/dump/;
 use File::Find;
 
-has 'classes' => (
-	is => 'ro',
-#	isa => 'HashRef[Str]',
-	default => sub {
-		my $self = shift;
-		# FIXME there must be better way to do this in Moose style
-		my $classes;
-		finddepth({ no_chdir => 1, wanted => sub {
-			return unless s/\.pm$//;
-			my @a = split(m!/!,$_);
-			my $package = join('::', @a[ 1 .. $#a ]);
-			warn ">> $_ ",dump( @a ), " >> $package\n" if $self->debug;
-			push @$classes, { $package => "$_.pm" };
-		} }, 'lib');
-		warn "## classes = ",dump( $classes ) if $self->debug;
-		$classes;
-	},
-	lazy => 1,
-);
+our $package_path;
+our @classes;
+
+sub classes {
+	my $self = shift;
+	return @classes if @classes;
+
+	# FIXME there must be better way to do this in Moose style
+	finddepth({ no_chdir => 1, wanted => sub {
+		return unless s/\.pm$//;
+		my @a = split(m!/!,$_);
+		my $package = join('::', @a[ 1 .. $#a ]);
+		warn ">> $_ ",dump( @a ), " >> $package\n" if $self->debug;
+		$package_path->{ $package } = "$_.pm";
+	} }, 'lib');
+	warn "## package_path = ",dump( $package_path ) if $self->debug;
+
+	@classes = sort keys %$package_path;
+}
+
+sub package_path {
+	my ( $self, $package ) = @_;
+	$self->classes unless $package_path;
+	confess "can't find path for package $package" unless defined $package_path->{$package};
+	return $package_path->{$package};
+}
 
 =head2 load_package
 
@@ -35,35 +42,36 @@
 sub load_package {
 	my ( $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 $@;
 	Class::MOP::load_class($package);
 
-	my $meta = $package->meta;
+	if ( ! $package->can('meta') ) {
+		my $class = Moose::Meta::Class->create_anon_class;
+		warn "package $package isn't Moose, faking anon class";
+		return ( $class, $class->meta, 0 );
+	}
+
+	my $is_role = 0;
+	my $class;
 
-	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);
+		$package->meta->apply( $class );
+		die $@ if $@;
 	} else {
-		#roles don't have superclasses ...
-		$class = $meta;
+		$class = $package->meta;
 	}
-	return ( $class, $meta, $is_role );
+	return ( $class, $is_role );
 }
 
+sub load_all_classes {
+	my $self = shift;
+	my $loaded = 0;
+	foreach ( $self->classes ) {
+		Class::MOP::load_class($_);
+		$loaded++;
+	}
+	$loaded;
+}
 
 1;