[Catalyst-commits] r7434 - in trunk/Catalyst-Plugin-Authentication-Store-LDAP: . lib/Catalyst/Plugin/Authentication/Store lib/Catalyst/Plugin/Authentication/Store/LDAP t

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2008-02-05 18:19:56 +0000 (Tue, 05 Feb 2008)
New Revision: 7434

Modified:
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/Changes
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP.pm
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/Backend.pm
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/User.pm
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/01-pre_realms_api.t
   trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/02-realms_api.t
Log:
mark as deprecated and back out the timeout tests

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/Changes
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/Changes	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/Changes	2008-02-05 18:19:56 UTC (rev 7434)
@@ -1,4 +1,5 @@
-0.0601  karman 16 Jan 2008 
+0.0601  karman  4 Feb 2008
+    - marked as deprecated in favor of Catalyst::Authentication::Store::LDAP
     - changed release date for 0.0600
     - added AD config suggestions from matija at serverflow.com
     - bumped req base Auth package to 0.10002

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/Backend.pm
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/Backend.pm	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/Backend.pm	2008-02-05 18:19:56 UTC (rev 7434)
@@ -3,7 +3,7 @@
 =head1 NAME
 
 Catalyst::Plugin::Authentication::Store::LDAP::Backend 
-  - LDAP authentication storage backend.
+  - LDAP authentication storage backend **DEPRECATED**
 
 =head1 SYNOPSIS
 
@@ -58,6 +58,8 @@
 
 =head1 DESCRIPTION
 
+B<This module is deprecated. Please use L<Catalyst::Authentication::Store::LDAP> instead.>
+
 You probably want L<Catalyst::Plugin::Authentication::Store::LDAP>, unless
 you are mixing several stores in a single app and one of them is LDAP.
 

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/User.pm
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/User.pm	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP/User.pm	2008-02-05 18:19:56 UTC (rev 7434)
@@ -3,7 +3,7 @@
 =head1 NAME
 
 Catalyst::Plugin::Authentication::Store::LDAP::User
- - A User object representing an LDAP object. 
+ - A User object representing an LDAP object **DEPRECATED**
 
 =head1 SYNOPSIS
 
@@ -21,6 +21,8 @@
 
 =head1 DESCRIPTION
 
+B<This module is deprecated. Please use L<Catalyst::Authentication::Store::LDAP> instead.>
+
 This wraps up an LDAP object and presents a simplified interface to it's
 contents.  It uses some AUTOLOAD magic to pass method calls it doesn't
 understand through as simple read only accessors for the LDAP entries

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP.pm
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP.pm	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/lib/Catalyst/Plugin/Authentication/Store/LDAP.pm	2008-02-05 18:19:56 UTC (rev 7434)
@@ -24,7 +24,7 @@
 =head1 NAME
 
 Catalyst::Plugin::Authentication::Store::LDAP 
-  - Authentication from an LDAP Directory.
+  - Authentication from an LDAP Directory **DEPRECATED**
 
 =head1 SYNOPSIS
 
@@ -83,6 +83,8 @@
 
 =head1 DESCRIPTION
 
+B<This module is deprecated. Please use L<Catalyst::Authentication::Store::LDAP> instead.>
+
 This plugin implements the L<Catalyst::Plugin::Authentication> v.10 API. Read that documentation first if
 you are upgrading from a previous version of this plugin.
 

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/01-pre_realms_api.t
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/01-pre_realms_api.t	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/01-pre_realms_api.t	2008-02-05 18:19:56 UTC (rev 7434)
@@ -8,31 +8,22 @@
 
 BEGIN { use_ok("Catalyst::Plugin::Authentication::Store::LDAP::Backend") }
 
-my $back = Catalyst::Plugin::Authentication::Store::LDAP::Backend->new({
-            'ldap_server' => 'ldap.openldap.org',
-            #'ldap_server_options' => { timeout => -1 },   # can test the timeout SKIP with this
-            'binddn' => 'anonymous',
-            'bindpw' => 'dontcarehow',
-            'start_tls' => 0,
-            'user_basedn' => 'ou=People,dc=OpenLDAP,dc=Org',
-            'user_filter' => '(&(objectClass=person)(uid=%s))',
-            'user_scope' => 'one',
-            'user_field' => 'uid',
-            'use_roles' => 0,
-    });
-isa_ok($back, "Catalyst::Plugin::Authentication::Store::LDAP::Backend");
-eval {
- my $user = $back->get_user('kurt');
- isa_ok($user, "Catalyst::Plugin::Authentication::Store::LDAP::User");
- my $displayname = $user->displayname;
- cmp_ok($displayname, 'eq', 'Kurt Zeilenga', 'Should be Kurt Zeilenga');
-};
+my $back = Catalyst::Plugin::Authentication::Store::LDAP::Backend->new(
+    {   'ldap_server' => 'ldap.openldap.org',
+        'binddn'      => 'anonymous',
+        'bindpw'      => 'dontcarehow',
+        'start_tls'   => 0,
+        'user_basedn' => 'ou=People,dc=OpenLDAP,dc=Org',
+        'user_filter' => '(&(objectClass=person)(uid=%s))',
+        'user_scope'  => 'one',
+        'user_field'  => 'uid',
+        'use_roles'   => 0,
+    }
+);
 
-if ($@) {
-   if ($@ =~ m/timeout/i) {
-      SKIP: {
-         skip("LDAP connection timed out", 2);
-      }
-   }
-}
+isa_ok( $back, "Catalyst::Plugin::Authentication::Store::LDAP::Backend" );
+my $user = $back->get_user('kurt');
+isa_ok( $user, "Catalyst::Plugin::Authentication::Store::LDAP::User" );
+my $displayname = $user->displayname;
+cmp_ok( $displayname, 'eq', 'Kurt Zeilenga', 'Should be Kurt Zeilenga' );
 

Modified: trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/02-realms_api.t
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/02-realms_api.t	2008-02-05 18:17:28 UTC (rev 7433)
+++ trunk/Catalyst-Plugin-Authentication-Store-LDAP/t/02-realms_api.t	2008-02-05 18:19:56 UTC (rev 7434)
@@ -21,19 +21,9 @@
     }
 );
 
-eval {
-  isa_ok( $back, "Catalyst::Plugin::Authentication::Store::LDAP::Backend" );
-  my $user = $back->find_user( { username => 'kurt' } );
-  isa_ok( $user, "Catalyst::Plugin::Authentication::Store::LDAP::User" );
-  my $displayname = $user->displayname;
-  cmp_ok( $displayname, 'eq', 'Kurt Zeilenga', 'Should be Kurt Zeilenga' );
-};
+isa_ok( $back, "Catalyst::Plugin::Authentication::Store::LDAP::Backend" );
+my $user = $back->find_user( { username => 'kurt' } );
+isa_ok( $user, "Catalyst::Plugin::Authentication::Store::LDAP::User" );
+my $displayname = $user->displayname;
+cmp_ok( $displayname, 'eq', 'Kurt Zeilenga', 'Should be Kurt Zeilenga' );
 
-if ($@) {
-   if ($@ =~ m/timeout/i) {
-      SKIP: {
-         skip("LDAP connection timed out", 3);
-      }
-   }
-}
-