activeldap 3.2.0 → 3.2.1

data/doc/text/news.textile

@@ -1,5 +1,14 @@
 h1. News
 
+h2(#3-2-1). 3.2.1: 2012-08-31
+
+* Fixed a bug that ActiveLdap::Base#delete doesn't work.
+  [Reported by Craig White]
+
+h3. Thanks
+
+* Craig White
+
 h2(#3-2-0). 3.2.0: 2012-08-29
 
 * [GitHub:#39] Supported Rails 3.2.8. [Reported by Ben Langfeld]

data/lib/active_ldap/persistence.rb

@@ -16,12 +16,19 @@ module ActiveLdap
     #
     # Delete this entry from LDAP
     def destroy
-      self.class.delete(dn)
-      @new_entry = true
+      # TODO: support deleting relations
+      delete
     end
 
     def delete(options={})
-      super(dn, options)
+      if persisted?
+        default_options = {
+          :connection => connection,
+        }
+        self.class.delete_entry(dn, default_options.merge(options))
+      end
+      @new_entry = true
+      freeze
     end
 
     # save

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/test/test_base.rb

@@ -791,40 +791,6 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
-  def test_delete
-    make_temporary_user do |user1,|
-      make_temporary_user do |user2,|
-        make_temporary_user do |user3,|
-          assert(@user_class.exists?(user1.uid))
-          @user_class.delete(user1.dn)
-          assert(!@user_class.exists?(user1.uid))
-
-          assert(@user_class.exists?(user2.dn))
-          @user_class.delete(user2.uid)
-          assert(!@user_class.exists?(user2.dn))
-
-          assert(@user_class.exists?(user3.dn))
-          @user_class.delete("uid=#{user3.uid}")
-          assert(!@user_class.exists?(user3.dn))
-        end
-      end
-    end
-
-    make_temporary_user do |user1,|
-      make_temporary_user do |user2,|
-        make_temporary_user do |user3,|
-          assert(@user_class.exists?(user1.uid))
-          assert(@user_class.exists?(user2.uid))
-          assert(@user_class.exists?(user3.uid))
-          @user_class.delete([user1.dn, user2.uid, "uid=#{user3.uid}"])
-          assert(!@user_class.exists?(user1.uid))
-          assert(!@user_class.exists?(user2.uid))
-          assert(!@user_class.exists?(user3.uid))
-        end
-      end
-    end
-  end
-
   def test_inherit_base
     sub_user_class = Class.new(@user_class)
     sub_user_class.ldap_mapping :prefix => "ou=Sub"

data/test/test_persistence.rb

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+require 'al-test-utils'
+
+class TestPersistence < Test::Unit::TestCase
+  include AlTestUtils
+
+  class TestDestroy < self
+    class TestClass < self
+      def test_by_dn
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.uid))
+          @user_class.destroy(user.dn)
+          assert(!@user_class.exists?(user.uid))
+        end
+      end
+
+      def test_by_dn_value
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.dn))
+          @user_class.destroy(user.uid)
+          assert(!@user_class.exists?(user.dn))
+        end
+      end
+
+      def test_by_dn_attribute
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.dn))
+          @user_class.destroy("uid=#{user.uid}")
+          assert(!@user_class.exists?(user.dn))
+        end
+      end
+
+      def test_multiple
+        make_temporary_user do |user1,|
+          make_temporary_user do |user2,|
+            make_temporary_user do |user3,|
+              assert(@user_class.exists?(user1.uid))
+              assert(@user_class.exists?(user2.uid))
+              assert(@user_class.exists?(user3.uid))
+              @user_class.destroy([user1.dn, user2.uid, "uid=#{user3.uid}"])
+              assert(!@user_class.exists?(user1.uid))
+              assert(!@user_class.exists?(user2.uid))
+              assert(!@user_class.exists?(user3.uid))
+            end
+          end
+        end
+      end
+    end
+
+    class TestInstance < self
+      def test_existence
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.uid))
+          user.destroy
+          assert(!@user_class.exists?(user.uid))
+        end
+      end
+
+      def test_frozen
+        make_temporary_user do |user,|
+          assert_false(user.frozen?)
+          user.destroy
+          assert_true(user.frozen?)
+        end
+      end
+    end
+  end
+
+  class TestDelete < self
+    class TestClass < self
+      def test_by_dn
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.uid))
+          @user_class.delete(user.dn)
+          assert(!@user_class.exists?(user.uid))
+        end
+      end
+
+      def test_by_dn_value
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.dn))
+          @user_class.delete(user.uid)
+          assert(!@user_class.exists?(user.dn))
+        end
+      end
+
+      def test_by_dn_attribute
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.dn))
+          @user_class.delete("uid=#{user.uid}")
+          assert(!@user_class.exists?(user.dn))
+        end
+      end
+
+      def test_multiple
+        make_temporary_user do |user1,|
+          make_temporary_user do |user2,|
+            make_temporary_user do |user3,|
+              assert(@user_class.exists?(user1.uid))
+              assert(@user_class.exists?(user2.uid))
+              assert(@user_class.exists?(user3.uid))
+              @user_class.delete([user1.dn, user2.uid, "uid=#{user3.uid}"])
+              assert(!@user_class.exists?(user1.uid))
+              assert(!@user_class.exists?(user2.uid))
+              assert(!@user_class.exists?(user3.uid))
+            end
+          end
+        end
+      end
+    end
+
+    class TestInstance < self
+      def test_existence
+        make_temporary_user do |user,|
+          assert(@user_class.exists?(user.uid))
+          user.delete
+          assert(!@user_class.exists?(user.uid))
+        end
+      end
+
+      def test_frozen
+        make_temporary_user do |user,|
+          assert_false(user.frozen?)
+          user.delete
+          assert_true(user.frozen?)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -341,6 +341,7 @@ files:
 - test/test_load.rb
 - test/test_lpasswd.rb
 - test/test_object_class.rb
+- test/test_persistence.rb
 - test/test_reflection.rb
 - test/test_schema.rb
 - test/test_syntax.rb
@@ -371,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289272561367511573
+      hash: -4207865414253323478
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -380,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289272561367511573
+      hash: -4207865414253323478
 requirements: []
 rubyforge_project: ruby-activeldap
 rubygems_version: 1.8.23
@@ -417,6 +418,7 @@ test_files:
 - test/test_load.rb
 - test/test_lpasswd.rb
 - test/test_object_class.rb
+- test/test_persistence.rb
 - test/test_reflection.rb
 - test/test_schema.rb
 - test/test_syntax.rb