X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema.pm;h=d33f4d49caa82c4a60bb456bab151c5568a780c2;hb=daec44b85cffd777869c9652273670b27625e167;hp=315455568fce01d8c4d2d9dc7b32de4bbe296084;hpb=b795144302db2834acbac9551f787af38cd2ec49;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm
index 3154555..d33f4d4 100644
--- a/lib/DBIx/Class/Schema.pm
+++ b/lib/DBIx/Class/Schema.pm
@@ -4,9 +4,10 @@ use strict;
 use warnings;
 
 use base qw/Class::Data::Inheritable/;
-use DBIx::Class;
+use base qw/DBIx::Class/;
 
-__PACKAGE__->mk_classdata('_class_registrations' => {});
+__PACKAGE__->load_components(qw/Exception/);
+__PACKAGE__->mk_classdata('class_registrations' => {});
 
 =head1 NAME
 
@@ -39,7 +40,7 @@ DBIx::Class::Schema - composable schemas
 
   then in app code
 
-  my @obj = My::DB::Foo->retrieve_all; # My::DB::Foo isa My::Schema::Foo My::DB
+  my @obj = My::DB::Foo->search({}); # My::DB::Foo isa My::Schema::Foo My::DB
 
 =head1 DESCRIPTION
 
@@ -51,14 +52,25 @@ DBIx::Class::Schema - composable schemas
 
 sub register_class {
   my ($class, $name, $to_register) = @_;
-  my %reg = %{$class->_class_registrations};
+  my %reg = %{$class->class_registrations};
   $reg{$name} = $to_register;
-  $class->_class_registrations(\%reg);
+  $class->class_registrations(\%reg);
+}
+
+sub registered_classes {
+  return values %{shift->class_registrations};
 }
 
 sub load_classes {
   my $class = shift;
   my @comp = grep { $_ !~ /^#/ } @_;
+  unless (@comp) {
+    eval "require Module::Find;";
+    $class->throw("No arguments to load_classes and couldn't load".
+      " Module::Find ($@)") if $@;
+    @comp = map { substr $_, length "${class}::"  }
+              Module::Find::findallmod($class);
+  }
   foreach my $comp (@comp) {
     my $comp_class = "${class}::${comp}";
     eval "use $comp_class";
@@ -69,12 +81,25 @@ sub load_classes {
 
 sub compose_connection {
   my ($class, $target, @info) = @_;
-  $class->setup_connection_class($target, @info);
-  my %reg = %{ $class->_class_registrations };
+  my $conn_class = "${target}::_db";
+  $class->setup_connection_class($conn_class, @info);
+  my %reg = %{ $class->class_registrations };
+  my %target;
+  my %map;
   while (my ($comp, $comp_class) = each %reg) {
     my $target_class = "${target}::${comp}";
-    $class->inject_base($target_class, $comp_class, $target);
+    $class->inject_base($target_class, $conn_class, $comp_class);
+    @map{$comp, $comp_class} = ($target_class, $target_class);
+  }
+  {
+    no strict 'refs';
+    *{"${target}::class"} =
+      sub {
+        my ($class, $to_map) = @_;
+        return $map{$to_map};
+      };
   }
+  $conn_class->class_resolver($target);
 }
 
 sub setup_connection_class {
@@ -88,7 +113,7 @@ sub inject_base {
   my ($class, $target, @to_inject) = @_;
   {
     no strict 'refs';
-    unshift(@{"${target}::ISA"}, @to_inject);
+    unshift(@{"${target}::ISA"}, grep { $target ne $_ } @to_inject);
   }
 }
 
@@ -98,7 +123,7 @@ sub inject_base {
 
 =head1 AUTHORS
 
-Matt S. Trout <perl-stuff@trout.me.uk>
+Matt S. Trout <mst@shadowcatsystems.co.uk>
 
 =head1 LICENSE