X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=ab10bf5157e0ecb1436fe295b026cdb57b3aa538;hb=a47e6e743dfce14a61c2f2c4d5214d88c1c35b36;hp=c01fdbed098285441be582fc9e775584e6d98e11;hpb=d36c8734a5b871d1fe5ce3502e0dad29f4b7375b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index c01fdbe..ab10bf5 100644
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -3,9 +3,10 @@ package DBIx::Class::Schema::Loader;
 use strict;
 use warnings;
 use base qw/DBIx::Class::Schema Class::Accessor::Grouped/;
-use Carp::Clan qw/^DBIx::Class/;
 use mro 'c3';
-use Scalar::Util qw/ weaken /;
+use Carp::Clan qw/^DBIx::Class/;
+use Scalar::Util 'weaken';
+use namespace::clean;
 
 # Always remember to do all digits for the version even if they're 0
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
@@ -106,6 +107,17 @@ the road.
 
 =head1 METHODS
 
+=head2 loader
+
+The loader object, as class data on your Schema. For methods available see L<DBIx::Class::Schema::Loader::Base> and L<DBIx::Class::Schema::Loader::DBI>.
+
+=cut
+
+sub loader {
+    my $self = shift;
+    $self->_loader(@_);
+}
+
 =head2 loader_class
 
 =over 4
@@ -164,7 +176,7 @@ sub _invoke_loader {
     weaken($args->{schema}) if ref $self;
     $args->{dump_directory} ||= $self->dump_to_dir;
     $args->{naming} = $self->naming if $self->naming;
-    $args->{use_namespaces} = $self->use_namespaces if $self->use_namespaces;
+    $args->{use_namespaces} = $self->use_namespaces if defined $self->use_namespaces;
 
     # XXX this only works for relative storage_type, like ::DBI ...
     my $loader_class = $self->loader_class;
@@ -177,8 +189,8 @@ sub _invoke_loader {
     eval { $self->ensure_class_loaded($impl) };
     croak qq/Could not load loader_class "$impl": "$@"/ if $@;
 
-    $self->_loader($impl->new(%$args));
-    $self->_loader->load;
+    $self->loader($impl->new(%$args));
+    $self->loader->load;
     $self->_loader_invoked(1);
 
     $self;
@@ -409,7 +421,7 @@ Returns a list of the new monikers added.
 
 =cut
 
-sub rescan { my $self = shift; $self->_loader->rescan($self) }
+sub rescan { my $self = shift; $self->loader->rescan($self) }
 
 =head2 naming
 
@@ -488,6 +500,8 @@ arcanez: Justin Hunter <justin.d.hunter@gmail.com>
 
 ash: Ash Berlin <ash@cpan.org>
 
+btilly: Ben Tilly <btilly@gmail.com>
+
 Caelum: Rafael Kitover <rkitover@cpan.org>
 
 TSUNODA Kazuya <drk@drk7.jp>
@@ -526,7 +540,7 @@ spb: Stephen Bennett <spb@exherbo.org>
 
 Matias E. Fernandez <mfernandez@pisco.ch>
 
-mstratman: Mark A. Stratman <stratman@gmail.com>
+Al Newkirk <awncorp@cpan.org>
 
 ... and lots of other folks. If we forgot you, please write the current
 maintainer or RT.