Restore ability to handle underdefined root (t/prefetch/incomplete.t)

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / AccessorGroup.pm

diff --git a/lib/DBIx/Class/AccessorGroup.pm b/lib/DBIx/Class/AccessorGroup.pm
index 51dd7bc..c999a6b 100644 (file)
--- a/lib/DBIx/Class/AccessorGroup.pm
+++ b/lib/DBIx/Class/AccessorGroup.pm
@@ -1,110 +1,56 @@
 package DBIx::Class::AccessorGroup;
 
-sub mk_group_accessors {
-    my($self, $group, @fields) = @_;
+use strict;
+use warnings;
 
-    $self->_mk_group_accessors('make_group_accessor', $group, @fields);
-}
-
-
-{
-    no strict 'refs';
+use base qw/Class::Accessor::Grouped/;
+use Scalar::Util qw/weaken blessed/;
+use namespace::clean;
 
-    sub _mk_group_accessors {
-        my($self, $maker, $group, @fields) = @_;
-        my $class = ref $self || $self;
+my $successfully_loaded_components;
 
-        # So we don't have to do lots of lookups inside the loop.
-        $maker = $self->can($maker) unless ref $maker;
+sub get_component_class {
+  my $class = $_[0]->get_inherited($_[1]);
 
-        foreach my $field (@fields) {
-            if( $field eq 'DESTROY' ) {
-                require Carp;
-                &Carp::carp("Having a data accessor named DESTROY  in ".
-                             "'$class' is unwise.");
-            }
-
-            my $accessor = $self->$maker($group, $field);
-            my $alias = "_${field}_accessor";
-
-            *{$class."\:\:$field"}  = $accessor
-              unless defined &{$class."\:\:$field"};
-
-            *{$class."\:\:$alias"}  = $accessor
-              unless defined &{$class."\:\:$alias"};
-        }
-    }
-}
+  # It's already an object, just go for it.
+  return $class if blessed $class;
 
-sub mk_group_ro_accessors {
-    my($self, $group, @fields) = @_;
+  if (defined $class and ! $successfully_loaded_components->{$class} ) {
+    $_[0]->ensure_class_loaded($class);
 
-    $self->_mk_group_accessors('make_group_ro_accessor', $group, @fields);
-}
+    no strict 'refs';
+    $successfully_loaded_components->{$class}
+      = ${"${class}::__LOADED__BY__DBIC__CAG__COMPONENT_CLASS__"}
+        = do { \(my $anon = 'loaded') };
+    weaken($successfully_loaded_components->{$class});
+  }
 
-sub mk_group_wo_accessors {
-    my($self, $group, @fields) = @_;
+  $class;
+};
 
-    $self->_mk_group_accessors('make_group_wo_accessor', $group, @fields);
+sub set_component_class {
+  shift->set_inherited(@_);
 }
 
-sub make_group_accessor {
-    my ($class, $group, $field) = @_;
-
-    my $set = "set_$group";
-    my $get = "get_$group";
+1;
 
-    # Build a closure around $field.
-    return sub {
-        my $self = shift;
+=head1 NAME
 
-        if(@_) {
-            return $self->set($field, @_);
-        }
-        else {
-            return $self->get($field);
-        }
-    };
-}
+DBIx::Class::AccessorGroup - See Class::Accessor::Grouped
 
-sub make_group_ro_accessor {
-    my($class, $group, $field) = @_;
+=head1 SYNOPSIS
 
-    my $get = "get_$group";
+=head1 DESCRIPTION
 
-    return sub {
-        my $self = shift;
+This class now exists in its own right on CPAN as Class::Accessor::Grouped
 
-        if(@_) {
-            my $caller = caller;
-            require Carp;
-            Carp::croak("'$caller' cannot alter the value of '$field' on ".
-                        "objects of class '$class'");
-        }
-        else {
-            return $self->get($field);
-        }
-    };
-}
+=head1 AUTHOR AND CONTRIBUTORS
 
-sub make_group_wo_accessor {
-    my($class, $group, $field) = @_;
+See L<AUTHOR|DBIx::Class/AUTHOR> and L<CONTRIBUTORS|DBIx::Class/CONTRIBUTORS> in DBIx::Class
 
-    my $set = "set_$group";
+=head1 LICENSE
 
-    return sub {
-        my $self = shift;
+You may distribute this code under the same terms as Perl itself.
 
-        unless (@_) {
-            my $caller = caller;
-            require Carp;
-            Carp::croak("'$caller' cannot access the value of '$field' on ".
-                        "objects of class '$class'");
-        }
-        else {
-            return $self->set($field, @_);
-        }
-    };
-}
+=cut
 
-1;