Rename Net::LDAP::LdapError to Net::LDAP::Error

Author: Tatsuya Sato

lib/net/ldap.rb

@@ -26,6 +26,7 @@ class LDAP
 require 'net/ldap/instrumentation'
 require 'net/ldap/connection'
 require 'net/ldap/version'
+require 'net/ldap/error'
 
 # == Quick-start for the Impatient
 # === Quick Example of a user-authentication against an LDAP directory:
@@ -246,35 +247,6 @@ class LDAP
 class Net::LDAP
   include Net::LDAP::Instrumentation
 
-  class LdapError < StandardError; end
-  class AlreadyOpenedError < LdapError; end
-  class SocketError < LdapError; end
-  class ConnectionRefusedError < LdapError; end
-  class NoOpenSSLError < LdapError; end
-  class NoStartTLSResultError < LdapError; end
-  class StartTLSError < LdapError; end
-  class EncryptionUnsupportedError < LdapError; end
-  class EncMethodUnsupportedError < LdapError; end
-  class AuthMethodUnsupportedError < LdapError; end
-  class BindingInformationInvalidError < LdapError; end
-  class NoBindResultError < LdapError; end
-  class SASLChallengeOverflowError < LdapError; end
-  class SearchSizeInvalidError < LdapError; end
-  class SearchScopeInvalidError < LdapError; end
-  class ResponseTypeInvalidError < LdapError; end
-  class ResponseMissingOrInvalidError < LdapError; end
-  class EmptyDNError < LdapError; end
-  class HashTypeUnsupportedError < LdapError; end
-  class OperatorError < LdapError; end
-  class SubstringFilterError < LdapError; end
-  class SearchFilterError < LdapError; end
-  class BERInvalidError < LdapError; end
-  class SearchFilterTypeUnknownError < LdapError; end
-  class BadAttributeError < LdapError; end
-  class FilterTypeUnknownError < LdapError; end
-  class FilterSyntaxInvalidError < LdapError; end
-  class EntryOverflowError < LdapError; end
-
   SearchScope_BaseObject = 0
   SearchScope_SingleLevel = 1
   SearchScope_WholeSubtree = 2

lib/net/ldap/error.rb

@@ -0,0 +1,31 @@
+class Net::LDAP
+  class Error < StandardError; end
+
+  class AlreadyOpenedError < Error; end
+  class SocketError < Error; end
+  class ConnectionRefusedError < Error; end
+  class NoOpenSSLError < Error; end
+  class NoStartTLSResultError < Error; end
+  class StartTLSError < Error; end
+  class EncryptionUnsupportedError < Error; end
+  class EncMethodUnsupportedError < Error; end
+  class AuthMethodUnsupportedError < Error; end
+  class BindingInformationInvalidError < Error; end
+  class NoBindResultError < Error; end
+  class SASLChallengeOverflowError < Error; end
+  class SearchSizeInvalidError < Error; end
+  class SearchScopeInvalidError < Error; end
+  class ResponseTypeInvalidError < Error; end
+  class ResponseMissingOrInvalidError < Error; end
+  class EmptyDNError < Error; end
+  class HashTypeUnsupportedError < Error; end
+  class OperatorError < Error; end
+  class SubstringFilterError < Error; end
+  class SearchFilterError < Error; end
+  class BERInvalidError < Error; end
+  class SearchFilterTypeUnknownError < Error; end
+  class BadAttributeError < Error; end
+  class FilterTypeUnknownError < Error; end
+  class FilterSyntaxInvalidError < Error; end
+  class EntryOverflowError < Error; end
+end

test/test_ldap_connection.rb

@@ -2,14 +2,14 @@
 
 class TestLDAPConnection < Test::Unit::TestCase
   def test_unresponsive_host
-    assert_raise Net::LDAP::LdapError do
+    assert_raise Net::LDAP::Error do
       Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
     end
   end
 
   def test_blocked_port
     flexmock(TCPSocket).should_receive(:new).and_raise(SocketError)
-    assert_raise Net::LDAP::LdapError do
+    assert_raise Net::LDAP::Error do
       Net::LDAP::Connection.new(:host => 'test.mocked.com', :port => 636)
     end
   end