Move registration of AuthAdapters to net/ldap

Author: satoryu

lib/net/ldap.rb

@@ -27,6 +27,12 @@ class LDAP
 require 'net/ldap/connection'
 require 'net/ldap/version'
 require 'net/ldap/error'
+require 'net/ldap/auth_adapter'
+require 'net/ldap/auth_adapter/simple'
+require 'net/ldap/auth_adapter/sasl'
+
+Net::LDAP::AuthAdapter.register([:simple, :anon, :anonymous], Net::LDAP::AuthAdapter::Simple)
+Net::LDAP::AuthAdapter.register(:sasl, Net::LDAP::AuthAdapter::Sasl)
 
 # == Quick-start for the Impatient
 # === Quick Example of a user-authentication against an LDAP directory:

lib/net/ldap/auth_adapter/gss_spnego.rb

@@ -38,5 +38,3 @@ def bind(auth)
     end
   end
 end
-
-Net::LDAP::Adapter.register(:gss_spnego, Net::LDAP::AuthAdapters::GSS_SPNEGO)

lib/net/ldap/auth_adapter/sasl.rb

@@ -2,7 +2,7 @@
 
 module Net
   class LDAP
-    module AuthAdapter
+    class AuthAdapter
       class Sasl < Net::LDAP::AuthAdapter
         #--
         # Required parameters: :mechanism, :initial_credential and
@@ -58,5 +58,3 @@ def bind(auth)
     end
   end
 end
-
-Net::LDAP::AuthAdapter.register(:sasl, Net::LDAP::AuthAdapters::Sasl)

lib/net/ldap/auth_adapter/simple.rb

@@ -32,5 +32,3 @@ def bind(auth)
     end
   end
 end
-
-Net::LDAP::AuthAdapter.register(:simple, Net::LDAP::AuthAdapters::Simple)

lib/net/ldap/connection.rb

@@ -250,7 +250,6 @@ def next_msgid
   def bind(auth)
     instrument "bind.net_ldap_connection" do |payload|
       payload[:method] = meth = auth[:method]
-      require "net/ldap/auth_adapters/#{meth}"
       adapter = Net::LDAP::AuthAdapter[meth]
       adapter.new(self).bind(auth)
     end