r10518@t0mlaptop (orig r10517): t0m | 2009-06-12 11:27:58 +0100

diff --cc Makefile.PL
Simple merge
diff --cc lib/Catalyst/Authentication/Credential/Password.pm

index 3545849,b588c7f..8010fe3
--- 1/lib/Catalyst/Authentication/Credential/Password.pm
--- 2/lib/Catalyst/Authentication/Credential/Password.pm
+++ b/lib/Catalyst/Authentication/Credential/Password.pm
@@@ -6,16 -9,17 +6,17 @@@ use Scalar::Util        ()
  use Catalyst::Exception ();
  use Digest              ();
  
- -__PACKAGE__->mk_accessors(qw/_config realm/);
+ +has [qw/_config realm/] => ( is => 'rw' );
  
- -sub new {
+ +sub BUILDARGS {
      my ($class, $config, $app, $realm) = @_;
-     
+ 
+     # Note _config is horrible back compat hackery!
- -    my $self = { _config => $config };
- -    bless $self, $class;
- -    
- -    $self->realm($realm);
- -    
+ +    { realm => $realm, _config => $config };
+ +}
+ +
+ +sub BUILD {
+ +    my ($self, $args) = @_;    
      $self->_config->{'password_field'} ||= 'password';
      $self->_config->{'password_type'}  ||= 'clear';
      $self->_config->{'password_hash_type'} ||= 'SHA-1';
diff --cc lib/Catalyst/Authentication/Realm/Progressive.pm
Simple merge
diff --cc lib/Catalyst/Authentication/Store/Minimal.pm
Simple merge
diff --cc lib/Catalyst/Authentication/User.pm

index e4d2106,36ac802..eeff10e
--- 1/lib/Catalyst/Authentication/User.pm
--- 2/lib/Catalyst/Authentication/User.pm
+++ b/lib/Catalyst/Authentication/User.pm
@@@ -1,9 -1,12 +1,10 @@@
  package Catalyst::Authentication::User;
- -
- -use strict;
- -use warnings;
- -use base qw/Class::Accessor::Fast/;
+ +use Moose;
+ use Scalar::Util qw/refaddr/;
+ +use namespace::autoclean;
  
  ## auth_realm is the realm this user came from. 
- -__PACKAGE__->mk_accessors(qw/auth_realm store/);
+ +has [qw/auth_realm store/] => ( is => 'rw' );
  
  ## THIS IS NOT A COMPLETE CLASS! it is intended to provide base functionality only.  
  ## translation - it won't work if you try to use it directly.
@@@ -67,15 -70,19 +68,13 @@@ sub obj 
      return $self->get_object(@_);
  }
  
- ## Backwards Compatibility
- ## you probably want auth_realm, in fact.  but this does work for backwards compatibility.
- ## store should be a read-write accessor - so it was moved to mk_accessors
- ##sub store { 
- ##    my ($self) = @_;
- ##    return $self->auth_realm->{store};
- ##}
+ sub AUTOLOAD {
+     my $self = shift;
+     (my $method) = (our $AUTOLOAD =~ /([^:]+)$/);
+     return if $method eq "DESTROY";
  
- -    my $obj = $self->obj;
- -    # Don't bother unless we have a backing object
- -    return if refaddr($obj) eq refaddr($self);
- -
- -    $obj->$method(@_);
- -}
- -
+ +__PACKAGE__->meta->make_immutable;
+ __PACKAGE__;
  
  __END__
  
diff --cc lib/Catalyst/Plugin/Authentication.pm

index 2614177,a14b7ed..d78a63b
--- 1/lib/Catalyst/Plugin/Authentication.pm
--- 2/lib/Catalyst/Plugin/Authentication.pm
+++ b/lib/Catalyst/Plugin/Authentication.pm
@@@ -4,11 -11,8 +4,11 @@@ use MRO::Compat
  use Tie::RefHash;
  use Class::Inspector;
  use Catalyst::Authentication::Realm;
+ +use namespace::autoclean;
+ +
+ +has _user => ( is => 'rw' );
  
- our $VERSION = "0.10012";
+ our $VERSION = "0.10016";
  
  sub set_authenticated {
      my ( $c, $user, $realmname ) = @_;
		1	2
Makefile.PL	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Authentication/Credential/Password.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Authentication/Realm/Progressive.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Authentication/Store/Minimal.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Authentication/User.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Catalyst/Plugin/Authentication.pm	patch \|	diff1 \|	diff2 \|	blob \| history