ruby-activeldap 0.8.0 → 0.8.1

data/CHANGES

@@ -1,3 +1,20 @@
+0.8.1:
+  * used Dependencies.load_paths.
+  * check whether attribute name is available or not.
+  * added test for find(:first, :attribute => 'xxx', :value => 'yyy').
+  * supported ActiveSupport 1.4.0.
+  * make the dual licensing of ruby-activeldap clear in the README.
+  * followed edge Rails: don't use Reloadable::Subclasses if doesn't need.
+  * added examples/.
+  * removed debug code.
+  * normalized attribute name to support wrong attribute names in MUST/MAY.
+  * supported getting dn value by Base#[].
+  * test/test_userls.rb: followed userls changes.
+  * update the doc href.
+  * provide a dumb example of how to use the old association(return_objects) style API with the new awesome API.
+  * followed new API.
+  * removed a finished task: support Reloadable::Subclasses.
+
 0.8.0:
   * Makefile/gemspec system replaced with Rakefile + Hoe
   * Bugfix: Allow base to be empty

data/README

@@ -16,7 +16,7 @@ difficulty.
 For example and usage - read the rdoc in doc/ from lib/activeldap.rb.
 It is also available on the web at:
 
-http://static.dataspill.org/projects/libraries/ruby/activeldap/rdoc/
+http://ruby-activeldap.rubyforge.org/
 
 PREREQUISITES
 
@@ -43,10 +43,10 @@ INSTALL
 
 LICENCE
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+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
+Public License as published by the Free Software Foundation; either version 2,
+or (at your option) any later version.
 
 Please see the file LICENSE for the terms of the licence.
 

data/TODO

@@ -8,9 +8,6 @@ http://api.rubyonrails.com/classes/ActiveRecord/Base.html#M000865
 - handle all exception raised from Ruby/LDAP and wrap as
   ActiveLdap exception. I think we need to develop an
   application using ActiveLdap.
-- support Reloadable::Subclasses. I think we need to
-  develop a Rails + ActiveLdap application to improve
-  Rails support.
 - support Ruby/GetText.
 - support Net::LDAP as LDAP backend after Net::LDAP
   supports START_TLS. (I made a patch and submitted to the

data/benchmark/bench-al.rb

@@ -55,7 +55,7 @@ def populate_base
     name, value = suffix.split(/=/, 2)
     next unless name == "dc"
     dc_class = Class.new(ActiveLdap::Base)
-    dc_class.ldap_mapping :dnattr => "dc",
+    dc_class.ldap_mapping :dn_attribute => "dc",
                           :prefix => "",
                           :scope => :base,
                           :classes => ["top", "dcObject", "organization"]
@@ -73,7 +73,7 @@ end
 
 def populate_users
   ou_class = Class.new(ActiveLdap::Base)
-  ou_class.ldap_mapping :dnattr => "ou",
+  ou_class.ldap_mapping :dn_attribute => "ou",
                         :prefix => "",
                         :classes => ["top", "organizationalUnit"]
   ou_class.new(LDAP_PREFIX.split(/=/)[1]).save!
@@ -109,7 +109,7 @@ def main(argv)
   do_populate = LDAP_USER && LDAP_PASSWORD
 
   if do_populate
-    config[:bind_format] = LDAP_USER
+    config[:bind_dn] = LDAP_USER
     config[:password] = LDAP_PASSWORD
   end
   ActiveLdap::Base.establish_connection(config)

data/lib/active_ldap.rb

@@ -931,6 +931,11 @@ require_gem_if_need = Proc.new do |library_name, gem_name|
 end
 
 require_gem_if_need.call("active_support", "activesupport")
+
+if Dependencies.respond_to?(:load_paths)
+  Dependencies.load_paths << File.expand_path(File.dirname(__FILE__))
+end
+
 require 'active_ldap/base'
 require 'active_ldap/associations'
 require 'active_ldap/configuration'
@@ -944,7 +949,7 @@ require 'active_ldap/validations'
 require 'active_ldap/callbacks'
 
 module ActiveLdap
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end
 
 ActiveLdap::Base.class_eval do

data/lib/active_ldap/base.rb

@@ -135,13 +135,25 @@ module ActiveLdap
   class AdapterNotSpecified < Error
   end
 
+  class UnknownAttribute < Error
+    attr_reader :name
+    def initialize(name)
+      @name = name
+      super("#{@name} is unknown attribute")
+    end
+  end
+
   # Base
   #
   # Base is the primary class which contains all of the core
   # ActiveLdap functionality. It is meant to only ever be subclassed
   # by extension classes.
   class Base
-    include Reloadable::Subclasses
+    if Reloadable.const_defined?(:Deprecated)
+      include Reloadable::Deprecated
+    else
+      include Reloadable::Subclasses
+    end
 
     VALID_LDAP_MAPPING_OPTIONS = [:dn_attribute, :prefix, :classes, :scope]
 
@@ -916,7 +928,11 @@ module ActiveLdap
     end
 
     def [](name, force_array=false)
-      get_attribute(name, force_array)
+      if name == "dn"
+        array_of(dn, force_array)
+      else
+        get_attribute(name, force_array)
+      end
     end
 
     def []=(name, value)
@@ -1033,14 +1049,20 @@ module ActiveLdap
         @musts[objc] = attributes[:must]
         @mays[objc] = attributes[:may]
       end
-      @must = @musts.values.flatten.uniq
-      @may = @mays.values.flatten.uniq
+      @must = normalize_attribute_names(@musts.values)
+      @may = normalize_attribute_names(@mays.values)
       (@must + @may).uniq.each do |attr|
         # Update attr_method with appropriate
         define_attribute_methods(attr)
       end
     end
 
+    def normalize_attribute_names(names)
+      names.flatten.uniq.collect do |may|
+        schema.attribute_aliases(may).first
+      end
+    end
+
     alias_method :base_of_class, :base
     def base
       logger.debug {"stub: called base"}
@@ -1100,6 +1122,7 @@ module ActiveLdap
 
       # Get the attr and clean up the input
       attr = to_real_attribute_name(name)
+      raise UnknownAttribute.new(name) if attr.nil?
 
       if attr == dn_attribute and value.is_a?(String)
         value = value.gsub(/,#{Regexp.escape(base_of_class)}$/, '')
@@ -1139,8 +1162,7 @@ module ActiveLdap
     def define_attribute_methods(attr)
       logger.debug {"stub: called define_attribute_methods(#{attr.inspect})"}
       return if @attr_methods.has_key? attr
-      aliases = schema.attribute_aliases(attr)
-      aliases.each do |ali|
+      schema.attribute_aliases(attr).each do |ali|
         logger.debug {"associating #{ali} --> #{attr}"}
         @attr_methods[ali] = attr
         logger.debug {"associating #{Inflector.underscore(ali)}" +

data/lib/active_ldap/connection.rb

@@ -130,7 +130,6 @@ module ActiveLdap
     # Returns the value of self.class.schema
     # This is just syntactic sugar
     def schema
-      logger.debug {"stub: called schema"}
       self.class.schema
     end
   end

data/test/al-test-utils.rb

@@ -6,6 +6,7 @@ require 'yaml'
 require 'socket'
 require 'openssl'
 require 'rbconfig'
+require 'tempfile'
 
 require 'active_ldap'
 

data/test/test_base.rb

@@ -4,6 +4,38 @@ class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_new_without_class
+    no_class_class = Class.new(ActiveLdap::Base)
+    no_class_class.ldap_mapping :dn_attribute => "dc", :prefix => "",
+                                :classes => []
+    assert_raises(ActiveLdap::UnknownAttribute) do
+      no_class_class.new("xxx")
+    end
+  end
+
+  priority :normal
+  def test_save_for_dNSDomain
+    domain_class = Class.new(ActiveLdap::Base)
+    domain_class.ldap_mapping :dn_attribute => "dc", :prefix => "",
+                              :classes => ['top', 'dcObject', 'dNSDomain']
+    name = "ftp"
+    a_record = "192.168.1.1"
+
+    domain = domain_class.new('ftp')
+    domain.a_record = a_record
+    assert(domain.save)
+    assert_equal(a_record, domain.a_record)
+    assert_equal(a_record, domain_class.find(name).a_record)
+  ensure
+    domain_class.delete(name) if domain_class.exists?(name)
+  end
+
+  def test_dn_by_index_getter
+    make_temporary_user do |user,|
+      assert_equal(user.dn, user["dn"])
+    end
+  end
+
   def test_create_multiple
     ensure_delete_user("temp-user1") do |uid1,|
       ensure_delete_user("temp-user2") do |uid2,|
@@ -52,7 +84,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_reload_of_not_exists_entry
     make_temporary_user do |user,|
       assert_nothing_raised do

data/test/test_find.rb

@@ -15,6 +15,8 @@ class TestFind < Test::Unit::TestCase
     make_temporary_user do |user, password|
       assert_equal(user.uid, @user_class.find(:first).uid)
       assert_equal(user.uid, @user_class.find(user.uid).uid)
+      options = {:attribute => "cn", :value => user.cn}
+      assert_equal(user.uid, @user_class.find(:first, options).uid)
       assert_equal(user.to_ldif, @user_class.find(:first).to_ldif)
       assert_equal([user.uid], @user_class.find(:all).collect {|u| u.uid})
 

data/test/test_userls.rb

@@ -23,14 +23,14 @@ class TestUserls < Test::Unit::TestCase
 
   def test_list_user_no_group
     make_temporary_user do |user, password|
-      assert_userls_successfully(user.uid, [])
+      assert_userls_successfully(user.uid, [], [])
     end
   end
 
   def test_list_user_have_primary_group
     make_temporary_group do |group|
       make_temporary_user(:gid_number => group.gid_number) do |user, password|
-        assert_userls_successfully(user.uid, [group])
+        assert_userls_successfully(user.uid, [group], [])
       end
     end
   end
@@ -42,7 +42,7 @@ class TestUserls < Test::Unit::TestCase
         make_temporary_user(options) do |user, password|
           user.groups << group1
           user.groups << group2
-          assert_userls_successfully(user.uid, [group1, group2])
+          assert_userls_successfully(user.uid, [], [group1, group2])
         end
       end
     end
@@ -55,7 +55,7 @@ class TestUserls < Test::Unit::TestCase
           make_temporary_group do |group3|
             user.groups << group2
             user.groups << group3
-            assert_userls_successfully(user.uid, [group1, group2, group3])
+            assert_userls_successfully(user.uid, [group1], [group2, group3])
           end
         end
       end
@@ -63,13 +63,18 @@ class TestUserls < Test::Unit::TestCase
   end
 
   private
-  def assert_userls_successfully(name, groups, *args, &block)
+  def assert_userls_successfully(name, primary_groups, groups, *args, &block)
     _wrap_assertion do
       assert(@user_class.exists?(name))
       args.concat([name])
       user = @user_class.find(name)
-      groups = groups.collect {|g| "#{g.cn}[#{g.gid_number}]"}
-      result = "#{user.to_ldif}Groups: #{groups.join(', ')}\n"
+      group_names = groups.collect {|g| "#{g.cn}"}
+      group_infos = (primary_groups + groups).collect do |g|
+        "#{g.cn}[#{g.gid_number}]"
+      end
+      result = user.to_ldif
+      result << "Groups by name only: #{group_names.join(', ')}\n"
+      result << "Groups: #{group_infos.join(', ')}\n"
       assert_equal([true, result], run_command(*args, &block))
       assert(@user_class.exists?(name))
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-activeldap
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2006-11-20 00:00:00 +00:00
+  version: 0.8.1
+date: 2007-01-28 00:00:00 +00:00
 summary: Ruby/ActiveLdap is a object-oriented API to LDAP
 require_paths: 
 - lib
@@ -92,8 +92,8 @@ test_files:
 - test/TODO
 - test/config.yaml.sample
 - test/test_reflection.rb
-- test/test_connection_per_class.rb
 - test/test_callback.rb
+- test/test_connection_per_class.rb
 - test/test_connection.rb
 - test/test_schema.rb
 - test/test_userdel.rb
@@ -102,7 +102,6 @@ test_files:
 - test/test_base.rb
 - test/test_userls.rb
 - test/test_lpasswd.rb
-- test/config.yaml
 rdoc_options: []
 
 extra_rdoc_files: []

data/test/config.yaml

@@ -1,8 +0,0 @@
-test:
-  host: 127.0.0.1
-  method: :plain
-  base: dc=localdomain
-  bind_dn: cn=admin,dc=localdomain
-  password: password
-  retry_limit: 1
-  timeout: 0