X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=fa161f185cdd37b530e8bc9a4f760468164f8900;hb=020f3c3ab66a216064907bfcee815f2d77bbb63f;hp=6d9c568dcf54d160c53529f6febc54be14785bfb;hpb=2a5dcfb30a71cc41d4edacd37d0bb6c7e2945aba;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm index 6d9c568..fa161f1 100644 --- a/lib/DBIx/Class/Schema/Loader.pm +++ b/lib/DBIx/Class/Schema/Loader.pm @@ -10,7 +10,7 @@ use Scalar::Util qw/ weaken /; # 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 # brain damage and presumably various other packaging systems too -our $VERSION = '0.05001'; +our $VERSION = '0.05003'; __PACKAGE__->mk_group_accessors('inherited', qw/ _loader_args @@ -143,45 +143,11 @@ sub loader_options { my $self = shift; my %args = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_; - $self->_validate_loader_options(\%args); $self->_loader_args(\%args); $self; } -sub _validate_loader_options { - my $self = shift; - my $args = shift; - - my @class_keys = qw( - schema_base_class result_base_class additional_base_classes - left_base_classes additional_classes components resultset_components - ); - foreach my $k ( grep { exists $args->{$_} } @class_keys ) { - my @classes = ref( $args->{$k} ) eq 'ARRAY' ? @{ $args->{$k} } : $args->{$k}; - foreach my $c (@classes) { - - # components default to being under the DBIx::Class namespace unless they - # are preceeded with a '+' - if ( $k =~ m/components$/ && $c !~ s/^\+// ) { - $c = 'DBIx::Class::' . $c; - } - - # 1 == installed, 0 == not installed, undef == invalid classname - my $installed = Class::Inspector->installed($c); - if ( defined($installed) ) { - if ( $installed == 0 ) { - croak qq/$c, as specified in the loader option "$k", is not installed/; - } - } else { - croak qq/$c, as specified in the loader option "$k", is an invalid class name/; - } - } - } - - return; -} - sub _invoke_loader { my $self = shift; my $class = ref $self || $self; @@ -529,6 +495,10 @@ acmoore: Andrew Moore bphillips: Brian Phillips +schwern: Michael G. Schwern + +hobbs: Andrew Rodland + ... and lots of other folks. If we forgot you, please write the current maintainer or RT.