* DN attribute change by mass assignment with :id => ... blocks.

git-svn-id: http://ruby-activeldap.googlecode.com/svn/trunk@1105 fd4f1387-ac19-0410-9179-05984c98faae

Author: koutou

lib/active_ldap/attributes.rb

@@ -157,15 +157,20 @@ def remove_attributes_protected_from_mass_assignment(targets)
         needless_attributes[to_real_attribute_name(name)] = true
       end
 
+      _dn_attribute = nil
+      begin
+        _dn_attribute = dn_attribute_with_fallback
+      rescue DistinguishedNameInvalid
+      end
       targets.collect do |key, value|
+        key = _dn_attribute if ["id", "dn"].include?(key.to_s)
         [to_real_attribute_name(key) || key, value]
       end.reject do |key, value|
         needless_attributes[key]
       end
     end
 
     def attributes_protected_by_default
-      _dn_attribute = nil
       begin
         _dn_attribute = dn_attribute_with_fallback
       rescue DistinguishedNameInvalid

test/test_base.rb

@@ -6,6 +6,15 @@ class TestBase < Test::Unit::TestCase
   include AlTestUtils
 
   priority :must
+  def test_not_rename_by_mass_update
+    make_temporary_user(:simple => true) do |user,|
+      original_id = user.id
+      assert_true(user.update_attributes(:id => "user2"))
+      assert_equal(original_id, user.id)
+    end
+  end
+
+  priority :normal
   def test_attributes
     make_temporary_group do |group|
       assert_equal({
@@ -17,7 +26,6 @@ def test_attributes
     end
   end
 
-  priority :normal
   def test_rename_with_superior
     make_ou("sub,ou=users")
     make_temporary_user(:simple => true) do |user,|