ruby-activeldap 0.7.3 → 0.7.4

data/lib/activeldap.rb

@@ -932,7 +932,7 @@ require 'activeldap/configuration'
 
 
 module ActiveLDAP
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end
 
 ActiveLDAP::Base.class_eval do

data/lib/activeldap/base.rb

@@ -287,23 +287,7 @@ module ActiveLDAP
           message = exc.message unless exc.nil?
           @@logger.error(message)
           raise TimeoutError, message
-        rescue RuntimeError => e
-          @@logger.error("#{e.class} exception occurred in connection block")
-          @@logger.error("Exception message: #{e.message}")
-          @@logger.error("Exception backtrace: #{e.backtrace}")
-          @@logger.error(exc.message) unless exc.nil?
-          retry if try_reconnect and Base.reconnect()
-          raise exc unless exc.nil?
-          return nil
-        rescue LDAP::ServerDown => e
-          @@logger.error("#{e.class} exception occurred in connection block")
-          @@logger.error("Exception message: #{e.message}")
-          @@logger.error("Exception backtrace: #{e.backtrace}")
-          @@logger.error(exc.message) unless exc.nil?
-          retry if try_reconnect and Base.reconnect()
-          raise exc unless exc.nil?
-          return nil
-        rescue LDAP::ResultError => e
+        rescue LDAP::ServerDown, LDAP::ResultError, RuntimeError => e
           @@logger.error("#{e.class} exception occurred in connection block")
           @@logger.error("Exception message: #{e.message}")
           @@logger.error("Exception backtrace: #{e.backtrace}")
@@ -452,7 +436,7 @@ module ActiveLDAP
       if config.respond_to?(:has_key?)
         attr = config[:attribute] || dnattr()
         val = config[:value] || '*'
-        objects = config[:objects] || @@config[:return_objects]
+        objects = config[:objects] unless config[:objects].nil?
       end
 
       Base.connection(ConnectionError.new("Failed in #{self.class}#find(#{config.inspect})")) do |conn|
@@ -494,7 +478,7 @@ module ActiveLDAP
       if config.respond_to?(:has_key?)
         val = config[:value] || '*'
         attr = config[:attribute] || dnattr()
-        objects = config[:objects] || @@config[:return_objects]
+        objects = config[:objects] unless config[:objects].nil?
       end
 
       matches = []

data/lib/activeldap/ldap.rb

@@ -6,7 +6,7 @@
 require 'ldap'
 
 module LDAP
-  class PrettyError < RuntimeError
+  class PrettyError < LDAP::Error
   end
 
   ERRORS = [

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2006-05-30 00:00:00 +01:00
+  version: 0.7.4
+date: 2006-06-05 00:00:00 +01:00
 summary: Ruby/ActiveLDAP is a object-oriented API to LDAP
 require_paths: 
 - lib