[Catalyst-commits] r14563 - in trunk/Catalyst-Model-LDAP: . lib/Catalyst/Model lib/Catalyst/Model/LDAP t

[ghenry at dev.catalyst.perl.org]

Author: ghenry
Date: 2017-08-31 15:04:58 +0000 (Thu, 31 Aug 2017)
New Revision: 14563

Modified:
   trunk/Catalyst-Model-LDAP/Changes
   trunk/Catalyst-Model-LDAP/dist.ini
   trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
   trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Search.pm
   trunk/Catalyst-Model-LDAP/t/unit_Connection_bind.t
Log:
Move to Module::Runtime for Perl::Critic issue.

Modified: trunk/Catalyst-Model-LDAP/Changes
===================================================================
--- trunk/Catalyst-Model-LDAP/Changes	2017-07-14 21:50:16 UTC (rev 14562)
+++ trunk/Catalyst-Model-LDAP/Changes	2017-08-31 15:04:58 UTC (rev 14563)
@@ -1,5 +1,9 @@
 Revision history for Perl extension Catalyst::Model::LDAP.
 
+0.20  Thu Aug 31 16:01:00 BST 2017
+        - Switch to Module::Runtime for
+          eval "require $class"; due to Perl::Critic 5 failures
+
 0.19  Fri Jul 14 20:22:00 BST 2017
         - Migrate to Dist::Zilla due to:
           [rt.cpan.org #122481] MYMETA must not be included 

Modified: trunk/Catalyst-Model-LDAP/dist.ini
===================================================================
--- trunk/Catalyst-Model-LDAP/dist.ini	2017-07-14 21:50:16 UTC (rev 14562)
+++ trunk/Catalyst-Model-LDAP/dist.ini	2017-08-31 15:04:58 UTC (rev 14563)
@@ -1,5 +1,5 @@
 name     = Catalyst-Model-LDAP
-version  = 0.19
+version  = 0.20
 
 [@Basic]
 
@@ -17,6 +17,7 @@
 Net::LDAP::Entry = 0
 Net::LDAP::Search = 0
 Net::LDAP::Control::ProxyAuth = 1.09
+Module::Runtime = 0.015
 
 [AutoPrereqs]
 

Modified: trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Search.pm
===================================================================
--- trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Search.pm	2017-07-14 21:50:16 UTC (rev 14562)
+++ trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP/Search.pm	2017-08-31 15:04:58 UTC (rev 14563)
@@ -4,6 +4,7 @@
 use strict;
 use warnings;
 use base qw/Net::LDAP::Search/;
+use Module::Runtime qw/ require_module /;
 
 =head1 DESCRIPTION
 
@@ -22,8 +23,7 @@
 sub init {
     my ( $self, $class ) = @_;
 
-    eval { require $class };
-    die $@ if $@;
+    require_module($class);
 
     foreach my $entry ( @{ $self->{entries} } ) {
         bless $entry, $class;

Modified: trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm
===================================================================
--- trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2017-07-14 21:50:16 UTC (rev 14562)
+++ trunk/Catalyst-Model-LDAP/lib/Catalyst/Model/LDAP.pm	2017-08-31 15:04:58 UTC (rev 14563)
@@ -5,8 +5,9 @@
 use warnings;
 use base qw/Catalyst::Model/;
 use Carp qw/croak/;
+use Module::Runtime qw/ require_module /;
 
-our $VERSION = '0.19';
+our $VERSION = '0.20';
 
 =head1 SYNOPSIS
 
@@ -129,8 +130,7 @@
     delete $args{$_} for ( grep { /^_?catalyst/ } keys %args );
 
     my $class = $args{connection_class} || 'Catalyst::Model::LDAP::Connection';
-    eval { require $class };
-    die $@ if $@;
+    require_module($class);
 
     my $conn = $class->new(%args);
     my $mesg = $conn->bind(%args);

Modified: trunk/Catalyst-Model-LDAP/t/unit_Connection_bind.t
===================================================================
--- trunk/Catalyst-Model-LDAP/t/unit_Connection_bind.t	2017-07-14 21:50:16 UTC (rev 14562)
+++ trunk/Catalyst-Model-LDAP/t/unit_Connection_bind.t	2017-08-31 15:04:58 UTC (rev 14563)
@@ -7,7 +7,7 @@
     unless $ENV{TEST_AUTHOR} and $ENV{LDAP_BINDDN} and $ENV{LDAP_PASSWORD};
 plan tests    => 7;
 
-my $UID = 'dwc';
+my $UID = 'ghenry';
 
 my $ldap = Catalyst::Model::LDAP::Connection->new(
     host => 'ldap.ufl.edu',