add namespace::autoclean dep, fix AUTOLOAD to try method first, then column accessor

diff --git a/Makefile.PL b/Makefile.PL
index ee41b3b..66edb22 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -38,6 +38,7 @@ requires (
     'Catalyst::Model::DBIC::Schema'     => '0.18',
     'DBIx::Class'                       => '0.08',
     'Moose'                             => 0,
+    'namespace::autoclean'              => 0,
     'List::MoreUtils'                   => 0,
 );
 

diff --git a/lib/Catalyst/Authentication/Store/DBIx/Class/User.pm b/lib/Catalyst/Authentication/Store/DBIx/Class/User.pm
index fb93df1..4ae3d12 100644 (file)
--- a/lib/Catalyst/Authentication/Store/DBIx/Class/User.pm
+++ b/lib/Catalyst/Authentication/Store/DBIx/Class/User.pm
@@ -198,8 +198,8 @@ sub from_session {
 sub get {
     my ($self, $field) = @_;
 
-    if ($self->_user->can($field)) {
-        return $self->_user->$field;
+    if (my $code = $self->_user->can($field)) {
+        return $self->_user->$code;
     }
     elsif (my $accessor = $self->_user->result_source->column_info($field)->{accessor}) {
         return $self->_user->$accessor;
@@ -240,11 +240,12 @@ sub AUTOLOAD {
     (my $method) = (our $AUTOLOAD =~ /([^:]+)$/);
     return if $method eq "DESTROY";
 
-    if (my $accessor = $self->_user->result_source->column_info($method)->{accessor}) {
-        $method = $accessor;
+    if (my $code = $self->_user->can($method)) {
+        $self->_user->$code(@_);
+    }
+    elsif (my $accessor = $self->_user->result_source->column_info($method)->{accessor}) {
+        $self->_user->$accessor(@_);
     }
-
-    $self->_user->$method(@_);
 }
 
 __PACKAGE__->meta->make_immutable(inline_constructor => 0);