activeldap 1.0.9 → 1.1.0

data/README

@@ -1,12 +1,18 @@
-Ruby/ActiveLdap -- ruby library for object-oriented LDAP interction
-Copyright (C) 2004-2006 Will Drewry <will@alum.bu.edu>, Kouhei Sutou <kou@cozmixng.org>
-Contributors:
- * Dick Davies <rasputnik@hellooperator.net>
- * Nathan Kinder <quicksilver02@mac.com>
- * Patrick Cole <pac@independent.com.au>
- * Google Inc.
-
-DESCRIPTION
+= Ruby/ActiveLdap
+
+ruby library for object-oriented LDAP interction
+
+* Copyright (C) 2004-2006 Will Drewry <tt><will@alum.bu.edu></tt>
+* Copyright (C) 2006-2009 Kouhei Sutou <tt><kou@clear-code.com></tt>
+
+Contributors::
+  * Dick Davies <tt><rasputnik AT hellooperator.net></tt>
+  * Nathan Kinder <tt><quicksilver02 AT mac.com></tt>
+  * Patrick Cole <tt><pac AT independent.com.au></tt>
+  * Google Inc.
+
+== DESCRIPTION
+
 'Ruby/ActiveLdap' is a ruby extension library which provides a clean objected
 oriented interface to the Ruby/LDAP[0] library.  It was inspired by
 ActivRecord[3]. This is not nearly as clean or as flexible as ActiveRecord, but
@@ -18,49 +24,56 @@ It is also available on the web at:
 
 http://ruby-activeldap.rubyforge.org/
 
-PREREQUISITES
+== PREREQUISITES
 
-  * Ruby 1.8.x [2]
-  * Ruby/LDAP [0] or Net::LDAP [1]
-  * ActiveRecord [3]
-  * An LDAP server compatible with Ruby/LDAP: OpenLDAP, etc
+[Ruby intepreter]
+  One of them:
+  * Ruby[http://www.ruby-lang.org] (1.8.x or 1.9.1)
+  * JRuby[http://jruby.codehaus.org/]
 
+[LDAP client]
+  JRuby doesn't need to install new library because JRuby
+  has builtin LDAP support. Ruby users need one of them:
+  * Ruby/LDAP[http://rubyforge.org/projects/ruby-ldap/]
+  * Net::LDAP[http://rubyforge.org/projects/net-ldap/]
 
-NOTES
+* ActiveRecord[http://activerecord.rubyonrails.org]
 
-  * Only GSSAPI SASL support exists due to Ruby/LDAP limitations
+== NOTES
 
+* Only GSSAPI SASL support exists due to Ruby/LDAP limitations
 
-INSTALL
+== INSTALL
 
-  - Edit active_ldap/configuration.rb with your LDAP preferences
-  - Run -
-    sudo rake install
+  % sudo gem install activeldap
 
-RAILS
+== RAILS
 
-There is a small rails plugin included that allows the use of a file named
-'ldap.yml' in the config directory of your rails app. This file has a similar
-function to the 'database.yml' file that allows you to set your database
-connection settings per environment. Similarly, the ldap.yml file allows
-settings to be set for development, test, and production environments. For
-instance, the development entry would look something like the following:
+There is a small rails plugin included that allows the use
+of a file named 'config/ldap.yml' in the config directory of
+your rails app. This file has a similar function to the
+'database.yml' file that allows you to set your database
+connection settings per environment. Similarly, the ldap.yml
+file allows settings to be set for development, test, and
+production environments. For instance, the development entry
+would look something like the following:
 
-          development:
-            host: 127.0.0.1
-            port: 389
-            base: dc=localhost
-            bind_dn: cn=admin,dc=localhost
-            password: secret
+  development:
+    host: 127.0.0.1
+    port: 389
+    base: dc=localhost
+    bind_dn: cn=admin,dc=localhost
+    password: secret
 
+To install, simply add the following codes to you config/environment.rb:
 
-To install, simply copy the rails/plugin/active_ldap folder into the
-vendor/plugins directory of your rails application and create config/ldap.yml.
-When your application starts up, the plugin will call #establish_connection
-using the parameters specified for your current environment.
+  config.gem "activeldap", :lib => "active_ldap"
 
+When your application starts up, the plugin will call
+ActiveLdap::Base.setup_connection using the parameters
+specified for your current environment.
 
-LICENCE
+== LICENCE
 
 This program is free software; you can redistribute it and/or modify it.  It is
 dual licensed under Ruby's license and under the terms of the GNU General
@@ -69,16 +82,7 @@ or (at your option) any later version.
 
 Please see the file LICENSE for the terms of the licence.
 
-
-REFERENCES
-
-[0] - http://ruby-ldap.sourceforge.net
-[1] - http://rubyforge.org/projects/net-ldap/
-[2] - http://www.ruby-lang.org
-[3] - http://activerecord.rubyonrails.org
-
-
-THANKS
+== THANKS
 
 This list may not be correct. If you notice mistakes of this
 list, please point out.
@@ -129,3 +133,4 @@ list, please point out.
 * Tim Hermans: A bug report.
 * Joe Francis: A suggestion.
 * Tiago Fernandes: Bug reports.
+* achemze. A suggestion.

data/Rakefile

@@ -53,24 +53,26 @@ at_exit do
   FileUtils.rm_f("History.txt")
 end
 
-project = Hoe.new('activeldap', ActiveLdap::VERSION) do |project|
-  project.rubyforge_name = 'ruby-activeldap'
-  project.author = ['Will Drewry', 'Kouhei Sutou']
-  project.email = ['redpig@dataspill.org', 'kou@cozmixng.org']
-  project.summary = 'Ruby/ActiveLdap is a object-oriented API to LDAP'
-  project.url = 'http://rubyforge.org/projects/ruby-activeldap/'
-  project.test_globs = ['test/test_*.rb']
-  project.changes = project.paragraphs_of('CHANGES', 0..1).join("\n\n")
-  project.extra_deps = ['activerecord']
-  project.rdoc_pattern = /(?:^(?:lib|bin)|\AREADME\z)/
-  project.remote_rdoc_dir = "doc"
-  project.rsync_args += " --chmod=Dg+ws,Fg+w"
-  project.spec_extras = {
-    :requirements => ['ruby-ldap >= 0.8.2', '(Open)LDAP server'],
-    :autorequire => 'active_ldap',
-    :executables => [],
-  }
-  project.description = String.new(<<-EOF)
+ENV["VERSION"] = ActiveLdap::VERSION
+project = Hoe.spec('activeldap') do
+  self.version = ActiveLdap::VERSION
+  self.rubyforge_name = 'ruby-activeldap'
+  self.author = ['Will Drewry', 'Kouhei Sutou']
+  self.email = ['redpig@dataspill.org', 'kou@cozmixng.org']
+  self.summary = 'Ruby/ActiveLdap is a object-oriented API to LDAP'
+  self.url = 'http://rubyforge.org/projects/ruby-activeldap/'
+  self.test_globs = ['test/test_*.rb']
+  self.changes = self.paragraphs_of('CHANGES', 1..2).join("\n\n")
+  self.extra_deps = [
+                     # ['ruby-ldap', '= 0.9.9'],
+                     ['activerecord', '= 2.3.2'],
+                     ['locale', '= 2.0.4'],
+                     ['gettext', '= 2.0.4'],
+                     ['gettext_activerecord', '= 2.0.4'],
+                    ]
+  self.remote_rdoc_dir = "doc"
+  self.rsync_args += " --chmod=Dg+ws,Fg+w"
+  self.description = String.new(<<-EOF)
     'Ruby/ActiveLdap' is a ruby extension library which provides a clean
     objected oriented interface to the Ruby/LDAP library.  It was inspired
     by ActiveRecord. This is not nearly as clean or as flexible as
@@ -79,6 +81,8 @@ project = Hoe.new('activeldap', ActiveLdap::VERSION) do |project|
   EOF
 end
 
+project.spec.extra_rdoc_files = ["README", "CHANGES", "COPYING", "LICENSE"]
+
 publish_docs_actions = task(:publish_docs).instance_variable_get("@actions")
 original_project_name = nil
 before_publish_docs = Proc.new do
@@ -91,9 +95,6 @@ end
 publish_docs_actions.unshift(before_publish_docs)
 publish_docs_actions.push(after_publish_docs)
 
-# fix Hoe's incorrect guess.
-project.spec.executables.clear
-project.bin_files = project.spec.files.grep(/^bin/)
 
 rdoc_main = "lib/active_ldap.rb"
 project.spec.rdoc_options.each do |option|
@@ -101,36 +102,7 @@ project.spec.rdoc_options.each do |option|
 end
 ObjectSpace.each_object(Rake::RDocTask) do |task|
   task.main = rdoc_main if task.main == "README.txt"
-end
-
-
-# fix Hoe's install and uninstall task.
-task(:install).instance_variable_get("@actions").clear
-task(:uninstall).instance_variable_get("@actions").clear
-
-task :install do
-  [
-   [project.lib_files, "lib", Hoe::RUBYLIB, 0444],
-   [project.bin_files, "bin", File.join(Hoe::PREFIX, 'bin'), 0555]
-  ].each do |files, prefix, dest, mode|
-    FileUtils.mkdir_p dest unless test ?d, dest
-    files.each do |file|
-      base = File.dirname(file.sub(/^#{prefix}#{File::SEPARATOR}/, ''))
-      _dest = File.join(dest, base)
-      FileUtils.mkdir_p _dest unless test ?d, _dest
-      install file, _dest, :mode => mode
-    end
-  end
-end
-
-desc 'Uninstall the package.'
-task :uninstall do
-  Dir.chdir Hoe::RUBYLIB do
-    rm_f project.lib_files.collect {|f| f.sub(/^lib#{File::SEPARATOR}/, '')}
-  end
-  Dir.chdir File.join(Hoe::PREFIX, 'bin') do
-    rm_f project.bin_files.collect {|f| f.sub(/^bin#{File::SEPARATOR}/, '')}
-  end
+  task.rdoc_files = project.spec.require_paths + project.spec.extra_rdoc_files
 end
 
 desc 'Tag the repository for release.'
@@ -145,7 +117,7 @@ task :gettext => ["gettext:po:update", "gettext:mo:create"]
 namespace :gettext do
   desc "Setup environment for GetText"
   task :environment do
-    require "gettext/utils"
+    require "gettext/tools"
   end
 
   namespace :po do
@@ -176,7 +148,7 @@ namespace :gettext do
   namespace :mo do
     desc "Create *.mo from *.po (GetText)"
     task :create => "gettext:environment" do
-      GetText.create_mofiles(false)
+      GetText.create_mofiles
     end
   end
 end

data/TODO

@@ -1,3 +1,5 @@
+- [1.1.1] add :readonly option to :has_many.
+- Work as framework on Rails.
 - [1.1.x] ActiveLdap::Base#dn returns ActiveLdap::DN. [#23932] [Marc Dequènes]
 - How to support dSCorePropagationData? ignore it?
   all systemOnly == "TRUE" attribute can be ignored?

data/examples/al-admin/app/controllers/application_controller.rb

@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery # :secret => '5965eefc93d824a9c145fe8edb6d1a36'
 
-#   init_gettext "al-admin"
+  init_gettext "al-admin"
 
   include ExceptionNotifiable
 

data/examples/al-admin/app/views/_entry/_attributes_information.html.erb

@@ -13,7 +13,13 @@
 <% (entry.attribute_names(true) - ["objectClass"]).sort.each do |name| -%>
       <tr class="<%= cycle('even', 'odd') %>">
 	<th scope="row"><%= link_to_attribute(name) %></th>
-	<td><%= h(entry[name, true].join(", ")) %></td>
+	<td>
+          <%=
+	    entry[name, true].collect do |value|
+              h(value.inspect)
+            end.join("<br />")
+          %>
+        </td>
 	<td><%= h(lad_(name)) %></td>
       </tr>
 <% end -%>

data/examples/al-admin/app/views/users/_attributes_update_form.html.erb

@@ -23,7 +23,19 @@
       <span class="required-attribute-mark">*</span>
 <%   end -%>
     </th>
-    <td><%= text_field("user", name) %></td>
+    <td>
+       <%=
+          ldap_field(:text, :user, name,
+                     :ldap_options => ["lang-en"]) do |field, info|
+            ldap_options = info[:options]
+            if ldap_options.empty?
+              "#{field}<br />"
+            else
+              "#{ldap_options.join(';')}: #{field}<br />"
+            end
+          end
+       -%>
+    </td>
     <td><%= h lad_(name) %></td>
   </tr>
 <% end -%>

data/examples/al-admin/config/environment.rb

@@ -27,9 +27,8 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
-#   config.gem "locale_rails"
-#   config.gem "gettext_activerecord"
-#   config.gem "gettext_rails"
+  config.gem "locale_rails", :version => "2.0.4"
+  config.gem "gettext_rails", :version => "2.0.4"
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.

data/lib/active_ldap.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/ruby
 # = ActiveLdap
 #
-# "ActiveLdap" Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
-#              Copyright (C) 2006-2009 Kouhei Sutou <kou@cozmixng.org>
+#   Copyright (C) 2004,2005 Will Drewry mailto:will@alum.bu.edu
+#   Copyright (C) 2006-2009 Kouhei Sutou <kou@clear-code.com>
 #
 # == Introduction
 #
@@ -58,26 +58,13 @@
 #
 # === Installation
 #
-# Assuming all the requirements are installed, you can install by grabbing the latest tgz file from
-# the download site[http://rubyforge.org/frs/?group_id=381].
+# Assuming all the requirements are installed, you can install by gem.
 #
-# The following steps will get the ActiveLdap installed in no time!
-#
-#   $ tar -xzvf ruby-activeldap-current.tgz
-#   $ cd ruby-activeldap-VERSION
-#
-# Edit lib/active_ldap/configuration.rb replacing values to match what will work
-# with your LDAP servers. Please note that those variables are required, but can
-# be overridden in any program  as detailed later in this document. Also make
-# sure that "ROOT" stays all upcase.
-#
-# Now run:
-#
-#   $ (as root) rake install
+#   # gem install activeldap
 #
 # Now as a quick test, you can run:
 #
-#   $ irb
+#   $ irb -rubygems
 #   irb> require 'active_ldap'
 #   => true
 #   irb> exit
@@ -86,33 +73,6 @@
 # problem with the installation.  You may need to customize what setup.rb does on
 # install.
 #
-#
-# === Customizations
-#
-# Now that ActiveLdap is installed and working, we still have a few more
-# steps to make it useful for programming.
-#
-# Let's say that you are writing a Ruby program for managing user and group
-# accounts in LDAP. I will use this as the running example throughout the
-# document.
-#
-# You will want to make a directory called 'ldapadmin' wherever is convenient. Under this directory,
-# you'll want to make sure you have a 'lib' directory.
-#
-#   $ cd ~
-#   $ mkdir ldapadmin
-#   $ cd ldapadmin
-#   $ mkdir lib
-#   $ cd lib
-#
-# The lib directory is where we'll be making customizations. You can, of course,
-# make this changes somewhere in Ruby's default search path to make this
-# accessible to every Ruby scripts. Enough of my babbling, I'm sure you'd like to
-# know what we're going to put in lib/.
-#
-# We're going to put extension classes in there. What are extension classes you say . . .
-#
-#
 # == Usage
 #
 # This section covers using ActiveLdap from writing extension classes to
@@ -122,6 +82,11 @@
 #
 #   irb> require 'active_ldap'
 #
+# Call setup_connection method  for connect to LDAP server. In this case, LDAP server
+# is localhost, and base of LDAP tree is "dc=dataspill,dc=org".
+#
+#   irb> ActiveLdap::Base.setup_connection :host => 'localhost', :base => 'dc=dataspill,dc=org'
+#
 # Here's an extension class that maps to the LDAP Group objects:
 #
 #   irb> class Group < ActiveLdap::Base
@@ -171,7 +136,7 @@
 #
 #   class Group < ActiveLdap::Base
 #     ldap_mapping :dn_attribute => 'cn',
-#                  :prefix => 'ou=Groups', :classes => ['top', 'posixGroup']
+#                  :prefix => 'ou=Groups', :classes => ['top', 'posixGroup'],
 #                  :scope => :one
 #   end
 #
@@ -181,7 +146,7 @@
 #   * dc=dataspill,dc=org
 #   |- ou=People,dc=dataspill,dc=org
 #   |+ ou=Groups,dc=dataspill,dc=org
-#     \
+#     \ 
 #      |- cn=develop,ou=Groups,dc=dataspill,dc=org
 #      |- cn=root,ou=Groups,dc=dataspill,dc=org
 #      |- ...
@@ -198,11 +163,12 @@
 #   ^^         ^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
 #  :dn_attribute |         |
 #              :prefix     |
-#                :base from configuration.rb
+#                :base from setup_connection
 #
 # :scope tells ActiveLdap to only search under ou=Groups, and not to look deeper
 # for dn_attribute matches.
 # (e.g. cn=develop,ou=DevGroups,ou=Groups,dc=dataspill,dc=org)
+# You can choose value from between :sub, :one and :base.
 #
 # Something's missing: :classes.  :classes is used to tell ActiveLdap what
 # the minimum requirement is when creating a new object. LDAP uses objectClasses
@@ -234,7 +200,7 @@
 #
 #   * dc=dataspill,dc=org
 #   |+ ou=People,dc=dataspill,dc=org
-#    \
+#    \ 
 #    |- uid=drewry,ou=People,dc=dataspill,dc=org
 #   |- ou=Groups,dc=dataspill,dc=org
 #
@@ -251,7 +217,7 @@
 # group 'develop'. In order to remedy that, we can use belongs_to
 #
 #   irb> class User < ActiveLdap::Base
-#   irb*   ldap_mapping :dn_attribute => 'uid', :prefix => 'People', :classes => ['top','account']
+#   irb*   ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People', :classes => ['top','account']
 #   irb*   belongs_to :groups, :class_name => 'Group', :many => 'memberUid', :foreign_key => 'uid'
 #   irb* end
 #
@@ -260,7 +226,7 @@
 #
 #   irb> me = User.find('drewry')
 #   irb> me.groups
-#   => [#<Group ...>, #<Group ...>, ...]
+#   =>  #<ActiveLdap::Association::BelongsToMany...>    # Enumerable object
 #   irb> me.groups.each { |group| p group.cn };nil
 #   "cdrom"
 #   "audio"
@@ -290,7 +256,7 @@
 # mind, the above definition could become:
 #
 #   irb> class User < ActiveLdap::Base
-#   irb*   ldap_mapping :dn_attribute => 'uid', :prefix => 'People', :classes => ['top','account']
+#   irb*   ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People', :classes => ['top','account']
 #   irb*   belongs_to :groups, :class_name => 'Group', :many => 'memberUid'
 #   irb* end
 #
@@ -319,8 +285,9 @@
 #   irb> develop = Group.find('develop')
 #   => ...
 #   irb> develop.members
-#   => [#<User ...>, #<User ...>]
-#
+#   => #<ActiveLdap::Association::HasManyWrap:..> # Enumerable object
+#   irb> develop.members.map{|member| member.id}
+#   => ["drewry", "builder"]
 #
 # The arguments for has_many follow the exact same idea that belongs_to's
 # arguments followed. :wrap's contents are used to search for matching
@@ -375,10 +342,10 @@
 #                    :scope => :sub, :attributes => ['uid', 'cn'])
 #   =>  [["uid=root,ou=People,dc=dataspill,dc=org",{"cn"=>["root"], "uidNumber"=>["0"]}]
 # You can specify the :filter, :base, :scope, and :attributes, but they all have defaults --
-#  * :filter defaults to objectClass=* - usually this isn't what you want
-#  * :base defaults to the base of the class this is executed from (as set in ldap_mapping)
-#  * :scope defaults to :sub. Usually you won't need to change it
-#  * :attributes defaults to [] and is the list of attributes you want back. Empty means all of them.
+# * :filter defaults to objectClass=* - usually this isn't what you want
+# * :base defaults to the base of the class this is executed from (as set in ldap_mapping)
+# * :scope defaults to :sub. Usually you won't need to change it (You can choose value also from between :one and :base)
+# * :attributes defaults to [] and is the list of attributes you want back. Empty means all of them.
 #
 # ==== #valid?
 #
@@ -438,10 +405,9 @@
 #   )
 #
 # There are quite a few arguments, but luckily many of them have safe defaults:
-# * :host defaults to @@host from configuration.rb waaay back at the setup.rb stage.@
-# * :port defaults to @@port from configuration.rb as well
-# * :base defaults to Base.base() from configuration.rb
-# * :bind_dn defaults @@bind_format from configuration.rb
+# * :host defaults to "127.0.0.1".
+# * :port defaults to nil. 389 is applied if not specified. 
+# * :bind_dn defaults to nil. anonymous binding is applied if not specified.
 # * :logger defaults to a Logger object that prints fatal messages to stderr
 # * :password_block defaults to nil
 # * :allow_anonymous defaults to true
@@ -466,13 +432,12 @@
 #   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
-# * :method indicates whether to use :ssl, :tls, or :plain
 # * :retry_limit - indicates the number of attempts to reconnect that will be undertaken when a stale connection occurs. -1 means infinite.
 # * :retry_wait - seconds to wait before retrying a connection
 # * :scope - dictates how to find objects. (Default: :one)
 # * :timeout - time in seconds - defaults to disabled. This CAN interrupt search() requests. Be warned.
 # * :retry_on_timeout - whether to reconnect when timeouts occur. Defaults to true
-# See lib/configuration.rb for defaults for each option
+# See lib/configuration.rb(ActiveLdap::Configuration::DEFAULT_CONFIG) for defaults for each option
 #
 # Base.setup_connection just setups connection
 # configuration. A connection is connected and bound when it
@@ -518,7 +483,7 @@
 # ==== ConnectionError
 #
 # This exception is raised during Base.setup_connection if no valid
-# connection to the LDAP server could be created. Check you configuration.rb,
+# connection to the LDAP server could be created. Check you 
 # Base.setup_connection arguments, and network connectivity! Also check
 # your LDAP server logs to see if it ever saw the request.
 #
@@ -543,24 +508,28 @@
 #
 # All of the scripts here are in the package's examples/ directory.
 #
-# ==== Setting up lib/
+# ==== Setting up 
+#
+# Create directory for scripts.
+#
+#   mkdir -p ldapadmin/objects
 #
-# In ldapadmin/lib/ create the file user.rb:
-#   cat <<EOF
+# In ldapadmin/objects/ create the file user.rb:
+#
+#   require 'objects/group'
+# 
 #   class User < ActiveLdap::Base
-#     ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People', :classes => ['top', 'account', 'posixAccount']
-#     belongs_to :groups, :class_name => 'Group', :wrap => 'memberUid'
+#     ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People', :classes => ['person', 'posixAccount']
+#     belongs_to :groups, :class_name => 'Group', :many => 'memberUid'
 #   end
-#   EOF
 #
-# In ldapadmin/lib/ create the file group.rb:
-#   cat <<EOF
+# In ldapadmin/objects/ create the file group.rb:
+#
 #   class Group < ActiveLdap::Base
-#     ldap_mapping :classes => ['top', 'posixGroup'], :prefix => 'ou=Group'
-#     has_many :members, :class_name => "User", :many => "memberUid"
+#     ldap_mapping :classes => ['top', 'posixGroup'], :prefix => 'ou=Groups'
+#     has_many :members, :class_name => "User", :wrap => "memberUid"
 #     has_many :primary_members, :class_name => 'User', :foreign_key => 'gidNumber', :primary_key => 'gidNumber'
-#   end # Group
-#   EOF
+#   end
 #
 # Now, we can write some small scripts to do simple management tasks.
 #
@@ -568,10 +537,13 @@
 #
 # Now let's create a really dumb script for adding users - ldapadmin/useradd:
 #
+#   #!/usr/bin/ruby -W0
+#   
 #   base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 #   $LOAD_PATH << File.join(base, "lib")
 #   $LOAD_PATH << File.join(base, "examples")
 #   
+#   require 'rubygems'
 #   require 'active_ldap'
 #   require 'objects/user'
 #   require 'objects/group'
@@ -622,6 +594,7 @@
 #   $LOAD_PATH << File.join(base, "lib")
 #   $LOAD_PATH << File.join(base, "examples")
 #   
+#   require 'rubygems'
 #   require 'active_ldap'
 #   require 'objects/user'
 #   require 'objects/group'
@@ -659,6 +632,45 @@
 #     exit 1
 #   end
 #
+# ==== Removing LDAP entries
+# Now let's create more one for deleting users - ldapadmin/userdel:
+#
+#   #!/usr/bin/ruby -W0
+#   
+#   base = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+#   $LOAD_PATH << File.join(base, "lib")
+#   $LOAD_PATH << File.join(base, "examples")
+# 
+#   require 'rubygems'
+#   require 'active_ldap'
+#   require 'objects/user'
+#   require 'objects/group'
+# 
+#   argv, opts, options = ActiveLdap::Command.parse_options do |opts, options|
+#     opts.banner += " USER_NAME"
+#   end
+# 
+#   if argv.size == 1
+#     name = argv.shift
+#   else
+#     $stderr.puts opts
+#     exit 1
+#   end
+# 
+#   pwb = Proc.new do |user|
+#     ActiveLdap::Command.read_password("[#{user}] Password: ")
+#   end
+# 
+#   ActiveLdap::Base.setup_connection(:password_block => pwb,
+#                                     :allow_anonymous => false)
+# 
+#   unless User.exists?(name)
+#     $stderr.puts("User #{name} doesn't exist.")
+#     exit 1
+#   end
+# 
+#   User.destroy(name)
+#
 # === Advanced Topics
 #
 # Below are some situation tips and tricks to get the most out of ActiveLdap.
@@ -740,7 +752,7 @@
 #   ./myldap/group.rb:
 #   module MyLDAP
 #   class Group < ActiveLdap::Base
-#     ldap_mapping :classes => ['top', 'posixGroup'], :prefix => 'ou=Group'
+#     ldap_mapping :classes => ['top', 'posixGroup'], :prefix => 'ou=Groups'
 #     has_many :members, :class_name => 'MyLDAP::User', :wrap => 'memberUid'
 #     has_many :primary_members, :class_name => 'MyLDAP::User', :foreign_key => 'gidNumber', :primary_key => 'gidNumber'
 #   end
@@ -791,7 +803,7 @@
 #   => ...
 #   irb> auth_class = Class.new(Base)
 #   => ...
-#   irb> auth_class.setup_connection(:password_block => {'mypass'})
+#   irb> auth_class.setup_connection(:password_block => lambda{'mypass'})
 #   => ...
 #
 # This can be useful for doing authentication tests and other such tricks.
@@ -841,7 +853,10 @@
 # any methods you write might need to figure it out. I'd suggest just
 # calling self[attribname] to get the value, but if that's not good enough,
 # you can call look up the stored name by #to_real_attribute_name as follows:
-#    irb> to_real_attribute_name('commonName')
+#
+#    irb> User.find(:first).instance_eval do
+#    irb>   to_real_attribute_name('commonName')
+#    irb> end
 #    => 'cn'
 #
 # This tells you the name the attribute is stored in behind the scenes (@data).
@@ -851,8 +866,8 @@
 # Also, if you like to look up all aliases for an attribute, you can call the
 # following:
 #
-#  irb> schema.attribute_aliases('cn')
-#  => ['cn','commonName']
+#  irb> User.schema.attribute_type 'cn', 'NAME'
+#  => ["cn", "commonName"]
 #
 # This is discovered automagically from the LDAP server's schema.
 #
@@ -886,7 +901,7 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
   end
 end
 
-require_gem_if_need.call("active_support", "activesupport")
+require_gem_if_need.call("active_support", "activesupport", "= 2.3.2")
 
 if ActiveSupport.const_defined?(:Dependencies)
   dependencies = ActiveSupport::Dependencies
@@ -899,7 +914,7 @@ if dependencies.respond_to?(:load_paths)
 end
 
 module ActiveLdap
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end
 
 if RUBY_PLATFORM.match('linux')
@@ -908,21 +923,11 @@ else
   require 'active_ldap/timeout_stub'
 end
 
-require_gem_if_need.call("active_record", "activerecord")
+require_gem_if_need.call("active_record", "activerecord", "= 2.3.2")
 begin
-  raise LoadError, "GetText is disabled."
-  require_gem_if_need.call("locale")
-  require_gem_if_need.call("gettext")
-
-  require 'active_record/version'
-  active_record_version = [ActiveRecord::VERSION::MAJOR,
-                           ActiveRecord::VERSION::MINOR,
-                           ActiveRecord::VERSION::TINY]
-  if (active_record_version <=> [2, 2, 0]) < 0
-    require "gettext/active_record"
-  else
-    require_gem_if_need.call("gettext_activerecord")
-  end
+  require_gem_if_need.call("locale", nil, "= 2.0.4")
+  require_gem_if_need.call("gettext", nil, "= 2.0.4")
+  require_gem_if_need.call("gettext_activerecord", nil, "= 2.0.4")
 rescue LoadError
 end
 require 'active_ldap/get_text'