activeldap.rb in ruby-activeldap-0.7.0

- old
+ new

@@ -467,28 +467,31 @@
 # 
 # 
 # Most of these are obvious, but I'll step through them for completeness:
 # * :host defines the LDAP server hostname to connect to.
 # * :port defines the LDAP server port to connect to.
+# * :method defines the type of connection - :tls, :ssl, :plain
 # * :base specifies the LDAP search base to use with the prefixes defined in all
 #   subclasses.
 # * :bind_format specifies what your server expects when attempting to bind with
 #   credentials.
 # * :logger accepts a custom log4r object to integrate with any other logging
 #   your application uses.
 # * :user gives the username to substitute into bind_format for binding with
 #   credentials
 # * :password_block, if defined, give the Proc block for acquiring the password
+# * :password, if defined, give the user's password as a String
+# * :store_password indicates whether the password should be stored, or if used
+#   whether the :password_block should be called on each reconnect.
 # * :allow_anonymous determines whether anonymous binding is allowed if other
 #   bind methods fail
+# * :try_sasl, when true, tells ActiveLDAP to attempt a SASL-GSSAPI bind
+# * :sasl_quiet, when true, tells the SASL libraries to not spew messages to STDOUT
 # 
 # Base.connect both connects and binds in one step. It follows roughly the following approach:
 # 
-# * Connect to host:port.
-# * Try TLS.
-# * If that fails try SSL.
-# * If that fails try no encryption.
+# * Connect to host:port using :method
 # 
 # * If user and password_block, attempt to bind with credentials.
 # * If that fails or no password_block and anonymous allowed, attempt to bind
 #   anonymously.
 # * If that fails, error out.
@@ -544,11 +547,11 @@
 # in the schema.
 # 
 # === Others
 # 
 # Other exceptions may be raised by the Ruby/LDAP module, or by other subsystems.
-# If you get one of these exceptions and thing it should be wrapped, write me an
+# If you get one of these exceptions and think it should be wrapped, write me an
 # email and let me know where it is and what you expected. For faster results,
 # email a patch!
 # 
 # === Putting it all together
 # 
@@ -900,17 +903,18 @@
 #
 
 # Blanket warning hiding. Remove for debugging
 $VERBOSE, verbose = false, $VERBOSE
 
+require 'activeldap/ldap'
+require 'activeldap/schema2'
 require 'activeldap/base'
 require 'activeldap/associations'
 require 'activeldap/configuration'
-require 'activeldap/schema2'
 
 
 module ActiveLDAP
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end
 
 ActiveLDAP::Base.class_eval do
   include ActiveLDAP::Configuration
   include ActiveLDAP::Associations