X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSetManager.pm;h=c2af0f23e68b4ad727eff17ef9a99c1c12b1abd9;hb=1c258fc1b3bc48e162b6b05e325625d6a75cb217;hp=89076a1fe213b66d154a5e918ccc82296c5c3ac3;hpb=570783b1e6693bd3b93f5b57bd5d4cc118f406c9;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/ResultSetManager.pm b/lib/DBIx/Class/ResultSetManager.pm
index 89076a1..c2af0f2 100644
--- a/lib/DBIx/Class/ResultSetManager.pm
+++ b/lib/DBIx/Class/ResultSetManager.pm
@@ -3,16 +3,18 @@ use strict;
 use base 'DBIx::Class';
 use Class::Inspector;
 
-__PACKAGE__->mk_classdata($_) for qw/ _attr_cache base_resultset_class custom_resultset_class_suffix /;
-__PACKAGE__->_attr_cache({});
+__PACKAGE__->mk_classdata($_) for qw/ base_resultset_class table_resultset_class_suffix /;
 __PACKAGE__->base_resultset_class('DBIx::Class::ResultSet');
-__PACKAGE__->custom_resultset_class_suffix('::_resultset');
+__PACKAGE__->table_resultset_class_suffix('::_resultset');
 
 sub table {
     my ($self,@rest) = @_;
-    $self->next::method(@rest);
-    $self->_register_attributes;
-    $self->_register_resultset_class;
+    my $ret = $self->next::method(@rest);
+    if (@rest) {
+        $self->_register_attributes;
+        $self->_register_resultset_class;        
+    }
+    return $ret;
 }
 
 sub load_resultset_components {
@@ -21,31 +23,26 @@ sub load_resultset_components {
     $resultset_class->load_components(@comp);
 }
 
-sub MODIFY_CODE_ATTRIBUTES {
-    my ($class,$code,@attrs) = @_;
-    $class->_attr_cache({ %{$class->_attr_cache}, $code => [@attrs] });
-    return ();
-}
-
 sub _register_attributes {
     my $self = shift;
+    return unless $self->can('_attr_cache');
+
     my $cache = $self->_attr_cache;
     foreach my $meth (@{Class::Inspector->methods($self) || []}) {
         my $attrs = $cache->{$self->can($meth)};
         next unless $attrs;
-        if ($attrs->[0] eq 'resultset') {
+        if ($attrs->[0] eq 'ResultSet') {
             no strict 'refs';
             my $resultset_class = $self->_setup_resultset_class;
-            *{"$resultset_class\::$meth"} = *{"$self\::$meth"};
-            undef *{"$self\::$meth"};
+            *{"$resultset_class\::$meth"} = $self->can($meth);
+            delete ${"${self}::"}{$meth};
         }
     }
-    $self->_attr_cache(undef);
 }
 
 sub _setup_resultset_class {
     my $self = shift;
-    my $resultset_class = $self . $self->custom_resultset_class_suffix;
+    my $resultset_class = $self . $self->table_resultset_class_suffix;
     no strict 'refs';
     unless (@{"$resultset_class\::ISA"}) {
         @{"$resultset_class\::ISA"} = ($self->base_resultset_class);
@@ -55,7 +52,7 @@ sub _setup_resultset_class {
 
 sub _register_resultset_class {
     my $self = shift;
-    my $resultset_class = $self . $self->custom_resultset_class_suffix;
+    my $resultset_class = $self . $self->table_resultset_class_suffix;
     no strict 'refs';
     if (@{"$resultset_class\::ISA"}) {
         $self->result_source_instance->resultset_class($resultset_class);        
@@ -64,4 +61,37 @@ sub _register_resultset_class {
     }
 }
 
-1;
\ No newline at end of file
+1;
+
+__END__
+
+=head1 NAME 
+
+    DBIx::Class::ResultSetManager - helpful methods for managing resultset classes (EXPERIMENTAL)
+
+=head1 SYNOPSIS
+
+    # in a table class
+    __PACKAGE__->load_components(qw/ResultSetManager/);
+    __PACKAGE__->load_resultset_components(qw/AlwaysRS/);
+    
+    # will be removed from the table class and inserted into a table-specific resultset class
+    sub foo : ResultSet { ... }
+
+=head1 DESCRIPTION
+
+This package implements two useful features for customizing resultset classes.
+C<load_resultset_components> loads components in addition to C<DBIx::Class::ResultSet>
+(or whatever you set as C<base_resultset_class>). Any methods tagged with the C<ResultSet>
+attribute will be moved into a table-specific resultset class (by default called
+C<Class::_resultset>).
+
+=head1 AUTHORS
+
+David Kamholz <dkamholz@cpan.org>
+
+=head1 LICENSE
+
+You may distribute this code under the same terms as Perl itself.
+
+=cut