activeldap 0.10.0 → 1.0.0

data/CHANGES

@@ -1,3 +1,9 @@
+1.0.0:
+  * Fixed GSSAPI auth failure. [#18764] (Reported by Lennon Day-Reynolds)
+  * Supported Symbol as :dn_attribute_value. [#18921] (Requested by Nobody)
+  * Improved DN attribute detection. (Reported by Iain Pople)
+  * Avoided unnecesally modify operation. (Reported by Tilo)
+
 0.10.0:
   * Implemented LDIF parser.
   * Improved validation:
@@ -15,36 +21,6 @@
             user.user_certificate # => "..."
   * Added :excluded_classed ldap_mapping option.
   * Logged operation time used for LDAP operation.
-  * Improved API:
-    * Accepted non String value for find(:value => XXX).
-      (Suggested by Marc Dequèn)
-    * Accepted DN as ActiveLdap::Base.new(XXX).
-      (Reported by Jeremy Pruitt)
-    * Treated empty password for smiple bind as anonymous bind.
-      (Suggested by Bodaniel Jeans)
-    * Ensured adding "objectClass" for find's :attribute value. [#16946]
-      (Suggested by Nobody)
-    * Fixed a GeneralizedTime type casting bug.
-      (Reported by Bodaniel Jeanes)
-
-0.9.1:
-  * Implemented LDIF parser.
-  * Improved validation:
-    * Added some validations.
-    * Fixed SINGLE-VALUE validation. [#17763]
-      (Reported by Naoto Morishima)
-  * Supported JNDI as backend.
-  * Improved auto reconnection.
-  * Supported Rails 2.0.2.
-  * Improved performance. (4x)
-  * [API CHANGE]: removed "'binary' =>" from getter result.
-      e.g.
-	before:
-	  user.user_certificate # => {"binary" => "..."}
-	now:
-	  user.user_certificate # => "..."
-  * Added :excluded_classed ldap_mapping option.
-  * Logged operation time used for LDAP operation.
   * Improved API:
     * Accepted non String value for find(:value => XXX).
       (Suggested by Marc Dequèn)

data/README

@@ -104,5 +104,7 @@ list, please point out.
 * Bodaniel Jeanes:
   * A suggestion for behavior on simple bind with empty password.
   * Bug reports.
-* Naoto Morishima:
-  * Bug reports.
+* Naoto Morishima: Bug reports.
+* David Morton: An API improvement idea.
+* Lennon Day-Reynolds: Bug reports.
+* Tilo: A bug report.

data/Rakefile

@@ -44,6 +44,13 @@ at_exit do
   FileUtils.rm_f(manifest)
 end
 
+# For Hoe's no user friendly default behavior. :<
+File.open("README.txt", "w") {|file| file << "= Dummy README\n== XXX\n"}
+FileUtils.cp("CHANGES", "History.txt")
+at_exit do
+  FileUtils.rm_f("README.txt")
+  FileUtils.rm_f("History.txt")
+end
 
 project = Hoe.new('activeldap', ActiveLdap::VERSION) do |project|
   project.rubyforge_name = 'ruby-activeldap'

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

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

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

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

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

@@ -1,12 +1,12 @@
 # translation of al-admin.po to Nederlands
 # Nederlands translations for AL Admin package.
-# Copyright (C) 2007 Ace Suares
+# 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.
+# Ace Suares <ace@suares.an>, 2007,2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: AL Admin 0.10.0\n"
+"Project-Id-Version: AL Admin 1.0.0\n"
 "POT-Creation-Date: 2008-02-09 14:25+0900\n"
 "PO-Revision-Date: 2007-08-24 22:03+0900\n"
 "Last-Translator: Ace Suares <ace@suares.an>\n"

data/lib/active_ldap/adapter/base.rb

@@ -287,8 +287,6 @@ module ActiveLdap
       end
 
       def sasl_bind(bind_dn, options={})
-        return false unless bind_dn
-
         # Get all SASL mechanisms
         mechanisms = operation(options) do
           root_dse_values("supportedSASLMechanisms")

data/lib/active_ldap/base.rb

@@ -353,6 +353,7 @@ module ActiveLdap
         validate_ldap_mapping_options(options)
 
         self.dn_attribute = options[:dn_attribute] || default_dn_attribute
+        self.dn_attribute = dn_attribute.to_s if dn_attribute.is_a?(Symbol)
         self.prefix = options[:prefix] || default_prefix
         self.scope = options[:scope]
         self.required_classes = options[:classes]
@@ -602,7 +603,8 @@ module ActiveLdap
 
     alias_method(:dn_attribute_of_class, :dn_attribute)
     def dn_attribute
-      @dn_attribute || dn_attribute_of_class
+      _dn_attribute = @dn_attribute || dn_attribute_of_class
+      to_real_attribute_name(_dn_attribute) || _dn_attribute
     end
 
     def default_search_attribute
@@ -1210,7 +1212,7 @@ module ActiveLdap
     end
 
     def collect_all_attributes(data)
-      dn_attr = to_real_attribute_name(dn_attribute)
+      dn_attr = dn_attribute
       dn_value = data[dn_attr]
 
       attributes = []

data/lib/active_ldap/get_text_support.rb

@@ -1,15 +1,7 @@
 module ActiveLdap
-  if const_defined?(:GetTextFallback)
-    class << self
-      def get_text_supported?
-        false
-      end
-    end
-  else
-    class << self
-      def get_text_supported?
-        true
-      end
+  class << self
+    def get_text_supported?
+      not const_defined?(:GetTextFallback)
     end
   end
 

data/lib/active_ldap/operations.rb

@@ -479,6 +479,7 @@ module ActiveLdap
       end
 
       def modify_entry(dn, attributes, options={})
+        return if attributes.empty?
         unnormalized_attributes = attributes.collect do |type, key, value|
           [type, key, unnormalize_attribute(key, value)]
         end

data/lib/active_ldap/schema/syntaxes.rb

@@ -391,11 +391,13 @@ module ActiveLdap
         end
       end
 
-      class TelephoneNumber < Base
+      class TelephoneNumber < PrintableString
         SYNTAXES["1.3.6.1.4.1.1466.115.121.1.50"] = self
 
-        def validate(value)
-          PrintableString.new.validate(value)
+        private
+        def validate_normalized_value(value, original_value)
+          return nil if value.blank?
+          super
         end
       end
     end

data/lib/active_ldap/validations.rb

@@ -37,12 +37,14 @@ module ActiveLdap
         validate :validate_ldap_values
 
         class << self
-          def evaluate_condition_with_active_ldap_support(condition, entry)
-            evaluate_condition_without_active_ldap_support(condition, entry)
-          rescue ActiveRecord::ActiveRecordError
-            raise Error, $!.message
+          if method_defined?(:evaluate_condition)
+            def evaluate_condition_with_active_ldap_support(condition, entry)
+              evaluate_condition_without_active_ldap_support(condition, entry)
+            rescue ActiveRecord::ActiveRecordError
+              raise Error, $!.message
+            end
+            alias_method_chain :evaluate_condition, :active_ldap_support
           end
-          alias_method_chain :evaluate_condition, :active_ldap_support
         end
 
         def save_with_active_ldap_support!
@@ -58,7 +60,15 @@ module ActiveLdap
         rescue ActiveRecord::ActiveRecordError
           raise Error, $!.message
         end
-        alias_method_chain :run_validations, :active_ldap_support
+        if private_method_defined?(:run_validations)
+          alias_method_chain :run_validations, :active_ldap_support
+        else
+          alias_method(:run_callbacks_with_active_ldap_support,
+                       :run_validations_with_active_ldap_support)
+          alias_method_chain :run_callbacks, :active_ldap_support
+          alias_method(:run_validations_without_active_ldap_support,
+                       :run_callbacks_without_active_ldap_support)
+        end
       end
     end
 
@@ -94,11 +104,13 @@ module ActiveLdap
                     "%{fn} has excluded values: %s",
                     names.size)
       else
-        format = n_("has excluded value: %s",
-                    "has excluded values: %s",
-                    names.size)
+        if names.size == 1
+          format = "has excluded value: %s"
+        else
+          format = "has excluded values: %s"
+        end
       end
-      errors.add("objectClass", format % names.join(', '))
+      errors.add("objectClass", format % names.join(", "))
     end
 
     # validate_required_ldap_values
@@ -132,11 +144,9 @@ module ActiveLdap
               args << aliases.join(', ')
             end
           else
-            if aliases.empty?
-              format = "is required attribute by objectClass '%s'"
-            else
-              format = "is required attribute by objectClass '%s'" \
-              ": aliases: %s"
+            format = "is required attribute by objectClass '%s'"
+            unless aliases.empty?
+              format << ": aliases: %s"
               args << aliases.join(', ')
             end
           end

data/lib/active_ldap.rb

@@ -922,7 +922,7 @@ if Dependencies.respond_to?(:load_paths)
 end
 
 module ActiveLdap
-  VERSION = "0.10.0"
+  VERSION = "1.0.0"
 end
 
 if RUBY_PLATFORM.match('linux')

data/po/en/active-ldap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveLdap 0.10.0\n"
+"Project-Id-Version: Ruby/ActiveLdap 1.0.0\n"
 "POT-Creation-Date: 2008-02-10 22:36+0900\n"
 "PO-Revision-Date: 2007-08-19 09:49+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/po/ja/active-ldap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveLdap 0.10.0\n"
+"Project-Id-Version: Ruby/ActiveLdap 1.0.0\n"
 "POT-Creation-Date: 2008-02-10 22:36+0900\n"
 "PO-Revision-Date: 2008-02-10 22:37+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"

data/rails/plugin/active_ldap/init.rb

@@ -1,7 +1,7 @@
 require_library_or_gem 'active_ldap'
 ActiveLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 
-required_version = ["0", "9", "1"]
+required_version = ["0", "10", "0"]
 if (ActiveLdap::VERSION.split(".") <=> required_version) < 0
   ActiveLdap::Base.class_eval do
     format = _("You need ActiveLdap %s or later")

data/test/run-test.rb

@@ -10,7 +10,9 @@ top_dir = File.expand_path(File.join(base_dir, ".."))
 $LOAD_PATH.unshift(File.join(top_dir, "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "test"))
 
+$LOAD_PATH.unshift(File.join(top_dir, "test-unit-ext", "lib"))
 require 'test-unit-ext'
+Test::Unit::TestSuite.priority_mode = true
 
 test_file = "test/test_*.rb"
 Dir.glob(test_file) do |file|

data/test/test_base.rb

@@ -1,10 +1,42 @@
 # -*- coding: utf-8 -*-
+
 require 'al-test-utils'
 
 class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_save_with_changes
+    make_temporary_user do |user, password|
+      user.cn += "!!!"
+      assert_true(detect_modify(user) {user.save})
+    end
+  end
+
+  def test_save_without_changes
+    make_temporary_user do |user, password|
+      assert_false(detect_modify(user) {user.save})
+    end
+  end
+
+  priority :normal
+  def test_normalize_dn_attribute
+    make_ou("Ous")
+    ou_class = Class.new(ActiveLdap::Base)
+    ou_class.ldap_mapping(:dn_attribute => "OU",
+                          :prefix => "ou=OUS",
+                          :classes => ["top", "organizationalUnit"])
+    ou_class.new("ou1").save!
+    ou_class.new("ou2").save!
+
+    ou1 = ou_class.find("ou1")
+    assert_equal("ou1", ou1.ou)
+    assert_equal("ou=ou1,#{ou_class.base}", ou1.dn)
+    ou2 = ou_class.find("ou2")
+    assert_equal("ou2", ou2.ou)
+    assert_equal("ou=ou2,#{ou_class.base}", ou2.dn)
+  end
+
   def test_excluded_classes
     mapping = {:classes => ["person"]}
     person_class = Class.new(@user_class)
@@ -36,7 +68,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  priority :normal
   def test_new_with_dn
     cn = "XXX"
     dn = "cn=#{cn},#{@user_class.base}"
@@ -459,6 +490,16 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  def test_ldap_mapping_symbol_dn_attribute
+    ou_class = Class.new(ActiveLdap::Base)
+    ou_class.ldap_mapping(:dn_attribute => :ou,
+                          :prefix => "",
+                          :classes => ["top", "organizationalUnit"])
+    assert_equal(["ou=Groups,#{current_configuration['base']}",
+                  "ou=Users,#{current_configuration['base']}"],
+                 ou_class.find(:all).collect(&:dn).sort)
+  end
+
   def test_ldap_mapping_validation
     ou_class = Class.new(ActiveLdap::Base)
     assert_raises(ArgumentError) do
@@ -594,4 +635,25 @@ EOX
       end
     end
   end
+
+  private
+  def detect_modify(object)
+    modify_called = false
+    singleton_class = class << object; self; end
+    singleton_class.send(:define_method, :modify_entry) do |*args|
+      dn, attributes, options = args
+      options ||= {}
+      modify_detector = Object.new
+      modify_detector.instance_variable_set("@called", false)
+      def modify_detector.modify(dn, entries, options)
+        @called = true
+      end
+      options[:connection] = modify_detector
+      result = super(dn, attributes, options)
+      modify_called = modify_detector.instance_variable_get("@called")
+      result
+    end
+    yield
+    modify_called
+  end
 end

data/test/test_syntax.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'al-test-utils'
 
 class TestSyntax < Test::Unit::TestCase
@@ -283,8 +285,7 @@ class TestSyntax < Test::Unit::TestCase
 
   def test_telephone_number_validate
     assert_valid("+1 512 305 0280", "Telephone Number")
-
-    assert_invalid(_("empty string"), "", "Telephone Number")
+    assert_valid("", "Telephone Number")
 
     value = "+1 5!2 305 0280"
     params = [value.inspect, "!"]

data/test-unit-ext/NEWS.en

@@ -0,0 +1,28 @@
+# -*- rd -*-
+
+= NEWS
+
+== 0.5.0: 2008-04-07
+
+  * Update document.
+  * Support pend.
+  * Support notify.
+
+== 0.4.0: 2008-03-17
+
+  * Changed XML report format.
+
+== 0.3.0: 2008-03-10
+
+  * Changed XML report format.
+  * Improved search method to find test result directory.
+
+== 0.2.0: 2008-03-03
+
+  * Supported XML report.
+    * Added --xml-report option.
+  * Supported diff output for assert_equal.
+
+== 0.1.0: 2008-02-21
+
+  * Initial release.

data/test-unit-ext/NEWS.ja

@@ -0,0 +1,28 @@
+# -*- rd -*-
+
+= NEWS.ja
+
+== 0.5.0: 2008-04-07
+
+  * ドキュメントの更新
+  * pend（保留）のサポート
+  * notify（通知）のサポート
+
+== 0.4.0: 2008-03-17
+
+  * XML出力形式の変更
+
+== 0.3.0: 2008-03-10
+
+  * XML出力形式の変更
+  * テスト結果を保存するディレクトリの検索処理を改良
+
+== 0.2.0: 2008-03-03
+
+  * XML出力のサポート。
+    * --xml-reportオプションの追加。
+  * assert_equal時のdiff出力のサポート。
+
+== 0.1.0: 2008-02-21
+
+  * 最初のリリース。