activeldap 1.0.2 → 1.0.9

data/CHANGES

@@ -1,3 +1,35 @@
+1.0.9:
+  * Added documents in Japanese. [Kazuaki Takase]
+  * Supported Ruby 1.9.1.
+    * [#20] [Ruby 1.9 Support] :: Running Tests [Alexey.Chebotar]
+  * Supported Rails 2.3.2.
+    * [#18] [Rails 2.3 Support] :: Running WEBrick Hangs [Alexey.Chebotar]
+  * Bug fixes:
+    * Fixed blank values detection. [David Morton]
+    * [#22] Ruby 1.8.6 p287 :: Undefined methods [Alexey.Chebotar]
+    * Fixed gem loading. [Tiago Fernandes]
+    * Fixed DN change via #base=. [David Morton]
+    * Fixed infinite retry on timeout.
+    * Fixed needless reconnection.
+  * API improvements:
+    * Removed needless instance methods: #prefix=,
+      #dn_attribute=, #sort_by=, #order=, #required_classes=,
+      #recommended_classes= and #excluded_classes. [David Morton]
+    * Removed obsolete scafoold_al generator.
+    * Reduced default :retry_limit.
+    * Supported association as parameter. [Joe Francis]
+    * Normalized schema attribute name. [Tim Hermans]
+    * Suppressed AuthenticationError -> ConnectionError
+      conversion on reconnection. [Kazuaki Takase]
+    * Added ActiveLdap::Schema#dump.
+    * ActiveLdap::Base.establish_connection ->
+      ActiveLdap::Base.setup_connection.
+    * Supported ActiveLdap::Base.find(:last).
+    * Added convenient methods:
+      * ActiveLdap::Base.first
+      * ActiveLdap::Base.last
+      * ActiveLdap::Base.all
+
 1.0.2:
   * Removed Base64 module use.
   * Improved LDIF parser.

data/README

@@ -104,7 +104,9 @@ list, please point out.
   * A suggestion for behavior on simple bind with empty password.
   * Bug reports.
 * Naoto Morishima: Bug reports.
-* David Morton: An API improvement idea.
+* David Morton:
+  * An API improvement idea.
+  * Bug reports.
 * Lennon Day-Reynolds: Bug reports.
 * Tilo: A bug report.
 * Matt Mencel: A bug report.
@@ -122,3 +124,8 @@ list, please point out.
 * Alexey.Chebotar: Bug reports.
 * ery.lee: A bug report.
 * id:dicdak: A bug report.
+* Raiko Mitsu: A bug report.
+* Kazuaki Takase: Documents in Japanese.
+* Tim Hermans: A bug report.
+* Joe Francis: A suggestion.
+* Tiago Fernandes: Bug reports.

data/examples/al-admin/app/controllers/{application.rb → application_controller.rb}

@@ -8,13 +8,15 @@ 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
 
   include AuthenticatedSystem
   before_filter :login_from_cookie
 
+  filter_parameter_logging :password, :password_confirmation
+
   private
   def default_url_options(options)
     default_options = {}

data/examples/al-admin/app/views/account/sign_up.html.erb

@@ -1,21 +1,22 @@
 <%= error_messages_for(:user) %>
 <%= error_messages_for(:system_user) %>
 <% form_for(:user) do |f| %>
-  <p><label for="<%= @user.dn_attribute %>"><%= _("Login") %></label><br/>
+  <p><%= f.label @user.dn_attribute, _("Login") %><br/>
   <%= f.text_field(@user.dn_attribute) %></p>
 
-  <p><label for="password"><%= _("Password") %></label><br/>
+  <p><%= f.label(:password, _("Password")) %><br/>
   <%= f.password_field(:password) %></p>
 
-  <p><label for="password_confirmation"><%= _("Confirm Password") %></label><br/>
+  <p><%= f.label(:password_confirmation, _("Confirm Password")) %><br/>
   <%= f.password_field(:password_confirmation) %></p>
 
   <p><%= submit_tag(_('Sign up')) %></p>
 
-  <% names = @user.attribute_names(true) - ["objectClass", "userPassword"] %>
+  <% names = @user.attribute_names(true) -
+               ["objectClass", @user.dn_attribute, "userPassword"] %>
   <% names.sort.each do |name| %>
     <p>
-      <label for="<%= h name %>"><%=h la_(name) %>
+      <%= f.label(name, la_(name)) %>
     <% if @required_attributes.include?(name) %>
       <span class="required-attribute-mark">*</span>
     <% end %>

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

@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 

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

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -27,7 +27,9 @@ 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 "locale_rails"
+#   config.gem "gettext_activerecord"
+#   config.gem "gettext_rails"
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.

data/examples/al-admin/config.ru

@@ -0,0 +1,7 @@
+# Rack Dispatcher
+
+# Require your environment file to bootstrap Rails
+require ::File.dirname(__FILE__) + '/config/environment'
+
+# Dispatch the request
+run ActionController::Dispatcher.new

data/examples/al-admin/lib/ldap_test_helper.rb

@@ -0,0 +1,38 @@
+module LdapTestHelper
+  def setup_ldap_data
+    @ldap_dumped_data = nil
+    begin
+      @ldap_dumped_data = ActiveLdap::Base.dump(:scope => :sub)
+    rescue ActiveLdap::ConnectionError
+    end
+    ActiveLdap::Base.delete_all(nil, :scope => :sub)
+    populate_ldap_data
+  end
+
+  def teardown_ldap_data
+    if @ldap_dumped_data
+      ActiveLdap::Base.setup_connection
+      ActiveLdap::Base.delete_all(nil, :scope => :sub)
+      ActiveLdap::Base.load(@ldap_dumped_data)
+    end
+  end
+
+  def populate_ldap_data
+    populate_ldap_base
+    populate_ldap_ou
+  end
+
+  def populate_ldap_base
+    ActiveLdap::Populate.ensure_base
+  end
+
+  def populate_ldap_ou
+    %w(Users Groups).each do |name|
+      make_ou(name)
+    end
+  end
+
+  def make_ou(name)
+    ActiveLdap::Populate.ensure_ou(name)
+  end
+end

data/examples/al-admin/lib/tasks/gettext.rake

@@ -7,7 +7,8 @@ namespace :gettext do
   namespace :environment do
     desc "Setup environment for GetText"
     task :setup => :environment do
-      require "gettext/utils"
+      require 'gettext_rails/tools'
+      Locale.module_eval("@@locale_driver_module = nil")
     end
   end
 
@@ -29,7 +30,7 @@ namespace :gettext do
   namespace :mo do
     desc "Create *.mo from *.po (GetText)"
     task :create => "gettext:environment:setup" do
-      GetText.create_mofiles(false, 'po', 'locale')
+      GetText.create_mofiles
     end
   end
 end

data/examples/al-admin/lib/tasks/testing.rake

@@ -0,0 +1,10 @@
+# -*- ruby -*-
+
+namespace :test do
+  Rake::TestTask.new(:all => "db:test:prepare") do |task|
+    task.libs << "test"
+    task.verbose = false
+    task.test_files = Dir.glob("test/{unit,functional,integration}/**/*_test.rb").uniq
+  end
+  Rake::Task["test:all"].comment = "Run all tests in a test run"
+end

data/examples/al-admin/po/en/al-admin.po

@@ -1,13 +1,13 @@
 # English translations for AL Admin package.
-# Copyright (C) 2007,2008 Kouhei Sutou
+# Copyright (C) 2007-2009 Kouhei Sutou
 # This file is distributed under the same license as the AL Admin package.
-# Kouhei Sutou <kou@cozmixng.org>, 2007,2008.
+# Kouhei Sutou <kou@cozmixng.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.2\n"
+"Project-Id-Version: AL Admin 1.1.0\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
-"PO-Revision-Date: 2007-08-19 09:44+0900\n"
+"PO-Revision-Date: 2009-02-25 08:41+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"

data/examples/al-admin/po/ja/al-admin.po

@@ -1,13 +1,13 @@
 # AL Admin's translated messages for Japanese.
-# Copyright (C) 2007,2008 Kouhei Sutou
+# Copyright (C) 2007-2009 Kouhei Sutou
 # This file is distributed under the same license as the AL Admin package.
-# Kouhei Sutou <kou@cozmixng.org>, 2007,2008.
+# Kouhei Sutou <kou@cozmixng.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.2\n"
+"Project-Id-Version: AL Admin 1.1.0\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
-"PO-Revision-Date: 2007-11-04 16:02+0900\n"
+"PO-Revision-Date: 2009-02-25 08:41+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"

data/examples/al-admin/po/nl/al-admin.po

@@ -3,12 +3,12 @@
 # Copyright (C) 2007,2008 Ace Suares
 # This file is distributed under the same license as the AL Admin package.
 #
-# Ace Suares <ace@suares.an>, 2007,2008.
+# Ace Suares <ace@suares.an>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 1.0.2\n"
+"Project-Id-Version: AL Admin 1.1.0\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
-"PO-Revision-Date: 2007-08-24 22:03+0900\n"
+"PO-Revision-Date: 2009-02-25 08:42+0900\n"
 "Last-Translator: Ace Suares <ace@suares.an>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
 "MIME-Version: 1.0\n"

data/examples/al-admin/public/dispatch.cgi

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
@@ -7,4 +7,4 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 require "dispatcher"
 
 ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
-Dispatcher.dispatch
+Dispatcher.dispatch

data/examples/al-admin/public/dispatch.fcgi

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/env ruby
 #
 # You may specify the path to the FastCGI crash log (a log of unhandled
 # exceptions which forced the FastCGI instance to exit, great for debugging)

data/examples/al-admin/public/dispatch.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8
+#!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
 
@@ -7,4 +7,4 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 require "dispatcher"
 
 ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
-Dispatcher.dispatch
+Dispatcher.dispatch

data/examples/al-admin/test/functional/account_controller_test.rb

@@ -1,22 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'account_controller'
+require 'test_helper'
 
-# Re-raise errors caught by the controller.
-class AccountController; def rescue_action(e) raise e end; end
-
-class AccountControllerTest < Test::Unit::TestCase
+class AccountControllerTest < ActionController::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead
   # Then, you can remove it from this and the units test.
   include AuthenticatedTestHelper
 
-  fixtures :users
-
-  def setup
-    @controller = AccountController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/attributes_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'attributes_controller'
-
-# Re-raise errors caught by the controller.
-class AttributesController; def rescue_action(e) raise e end; end
-
-class AttributesControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = AttributesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class AttributesControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/directory_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'directory_controller'
-
-# Re-raise errors caught by the controller.
-class DirectoryController; def rescue_action(e) raise e end; end
-
-class DirectoryControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = DirectoryController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class DirectoryControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/object_classes_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'object_classes_controller'
-
-# Re-raise errors caught by the controller.
-class ObjectClassesController; def rescue_action(e) raise e end; end
-
-class ObjectClassesControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = ObjectClassesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class ObjectClassesControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/syntaxes_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'syntaxes_controller'
-
-# Re-raise errors caught by the controller.
-class SyntaxesController; def rescue_action(e) raise e end; end
-
-class SyntaxesControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = SyntaxesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class SyntaxesControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/users_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'users_controller'
-
-# Re-raise errors caught by the controller.
-class UsersController; def rescue_action(e) raise e end; end
-
-class UsersControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = UsersController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class UsersControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/functional/welcome_controller_test.rb

@@ -1,16 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'welcome_controller'
-
-# Re-raise errors caught by the controller.
-class WelcomeController; def rescue_action(e) raise e end; end
-
-class WelcomeControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = WelcomeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require 'test_helper'
 
+class WelcomeControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/examples/al-admin/test/integration/sign_up_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class SignUpTest < ActionController::IntegrationTest
+  include LdapTestHelper
+  fixtures :all
+
+  def setup
+    setup_ldap_data
+  end
+
+  def teardown
+    teardown_ldap_data
+  end
+
+  def test_sign_up
+    visit("/")
+    click_link("Sign up")
+
+    fill_in("Login", :with => "test-user")
+    fill_in("Password", :with => "test password")
+    fill_in("Confirm Password", :with => "test password")
+    fill_in("user[sn]", :with => "ser")
+    assert_difference("User.count", 1) do
+      assert_difference("LdapUser.count", 1) do
+        click_button("Sign up")
+      end
+    end
+  end
+
+  def test_sign_up_failure
+    visit("/")
+    click_link("Sign up")
+
+    fill_in("Login", :with => "test-user")
+    fill_in("Password", :with => "test password")
+    fill_in("Confirm Password", :with => "test password")
+    assert_no_difference("User.count") do
+      assert_no_difference("LdapUser.count") do
+        click_button("Sign up")
+      end
+    end
+    assert_have_selector("div.fieldWithErrors input#user_sn")
+  end
+end

data/examples/al-admin/test/run-test.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-rake test
+rake -s test:all TESTOPTS="$@"

data/examples/al-admin/test/test_helper.rb

@@ -1,8 +1,22 @@
+test_unit_dir = File.dirname(__FILE__) + "/../../../test-unit/lib"
+if File.directory?(test_unit_dir)
+  $LOAD_PATH.unshift(test_unit_dir)
+else
+  require 'rubygems'
+  gem 'test-unit'
+end
+require 'test/unit'
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 
-class Test::Unit::TestCase
+require 'webrat'
+Webrat.configure do |config|
+  config.mode = :rails
+end
+
+class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
   # in a transaction that's rolled back on completion.  This ensures that the
   # test database remains unchanged so your fixtures don't have to be reloaded
@@ -15,6 +29,10 @@ class Test::Unit::TestCase
   # in MySQL.  Turn off transactional fixtures in this case; however, if you
   # don't care one way or the other, switching from MyISAM to InnoDB tables
   # is recommended.
+  #
+  # The only drawback to using transactional fixtures is when you actually 
+  # need to test transactions.  Since your test is bracketed by a transaction,
+  # any transactions started in your code will be automatically rolled back.
   self.use_transactional_fixtures = true
 
   # Instantiated fixtures are slow, but give you @david where otherwise you
@@ -24,5 +42,11 @@ class Test::Unit::TestCase
   # then set this back to true.
   self.use_instantiated_fixtures  = false
 
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
   # Add more helper methods to be used by all tests here...
 end

data/examples/al-admin/test/unit/user_test.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < ActiveSupport::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead.
   # Then, you can remove it from this and the functional test.
   include AuthenticatedTestHelper
-  fixtures :users
 
   # Replace this with your real tests.
   def test_truth

data/examples/groupadd

@@ -23,8 +23,8 @@ pwb = Proc.new do |user|
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
 
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 if Group.exists?(name)
   $stderr.puts("Group #{name} already exists.")

data/examples/groupdel

@@ -23,8 +23,8 @@ pwb = Proc.new do |user|
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
 
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 
 unless Group.exists?(name)

data/examples/groupls

@@ -23,8 +23,8 @@ pwb = Proc.new do |user|
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
 
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 unless Group.exists?(name)
   $stderr.puts("Group #{name} doesn't exist.")

data/examples/groupmod

@@ -23,8 +23,8 @@ pwb = Proc.new do |user|
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
 
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 
 unless Group.exists?(name)

data/examples/lpasswd

@@ -23,8 +23,8 @@ pwb = Proc.new do |user|
   user ||= ENV["USER"]
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 unless User.exists?(name)
   $stderr.puts("User #{name} doesn't exist.")

data/examples/objects/group.rb

@@ -6,8 +6,8 @@ class Group < ActiveLdap::Base
   # some class |:class_name| where the attributes name is
   # |:local_key|. This means that it will call
   # :class_name.new(value_of(:local_key)) to create the objects.
-  has_many :members, :class => "User", :wrap => "memberUid"
-  has_many :primary_members, :class => 'User',
+  has_many :members, :class_name => "User", :wrap => "memberUid"
+  has_many :primary_members, :class_name => 'User',
            :foreign_key => 'gidNumber',
            :primary_key => 'gidNumber'
 end # Group

data/examples/objects/user.rb

@@ -3,7 +3,7 @@ require 'objects/group'
 class User < ActiveLdap::Base
   ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People',
                :classes => ['person', 'posixAccount']
-  belongs_to :primary_group, :class => "Group",
+  belongs_to :primary_group, :class_name => "Group",
              :foreign_key => "gidNumber", :primary_key => "gidNumber"
   belongs_to :groups, :many => 'memberUid'
 

data/examples/ouadd

@@ -22,8 +22,8 @@ pwb = Proc.new do |user|
   ActiveLdap::Command.read_password("[#{user}] Password: ")
 end
 
-ActiveLdap::Base.establish_connection(:password_block => pwb,
-                                      :allow_anonymous => false)
+ActiveLdap::Base.setup_connection(:password_block => pwb,
+                                  :allow_anonymous => false)
 
 if Ou.exists?(name)
   $stderr.puts("Ou #{name} already exists.")