activeldap 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff0abb4ff702e766243e5ff416b5b526b4ae0f2e0269e4058f00956b27b7de8
-  data.tar.gz: 87e13372b42e5b6c8b58012597f5631ebd92d50b213382f5d6f32a90479b4f60
+  metadata.gz: 952ff57b69e61432c8d7558c5d7174c1b1624887d334af0dce219f81c3c96994
+  data.tar.gz: ea21da7bf86e6a8f0a71e95177cb8d2edaf6f7900700a2416c2d2c89438531e3
 SHA512:
-  metadata.gz: a5b69fb0534269a9fdc2b0eda2882d35a4c74cfde74b3d82af50880e83c49a350f770d18538e6b9fca119aa4ca4c59c9482ca9c447620cdbdfe5327f113a268d
-  data.tar.gz: 10c8ebcb314692ed2e2abafe1a9edd39572c617f8ffe540fcc6ca760aff3c8b7ebd6dbf3f1f2af7d0c76097a340fb2c393516629e229e212af82842d5386d3f5
+  metadata.gz: 3b52b40daf56db823378e77216af2a6673c35dd8f9d5167d01cbe1a94112aec66bb41af3367992b9f03ca48480d3e58a9a64de3d3380d4ce198937834bf78b4b
+  data.tar.gz: 4437b9bdb39f9258e50e0b5527e58b82b5241b49223df5c296e046b6841028a05076bbfa6c7033f83eb42234f58106a08e06d0491d8146a934a95c5a72fbe349

data/doc/text/news.textile

@@ -1,5 +1,16 @@
 h1. News
 
+h2(#release-5-2-1). 5.2.1: 2018-06-13
+
+h3. Fixes
+
+* Fixed a bug that configuration may be removed unexpectedly.
+  [GitHub#155][Reported by Juha Erkkilä]
+
+h3. Thanks
+
+* Juha Erkkilä
+
 h2(#release-5-2-0). 5.2.0: 2018-05-09
 
 h3. Improvements

data/lib/active_ldap/configuration.rb

@@ -91,8 +91,8 @@ module ActiveLdap
         @@defined_configurations
       end
 
-      def remove_configuration_by_configuration(config)
-        @@defined_configurations.delete_if {|key, value| value == config}
+      def remove_configuration_by_key(key)
+        @@defined_configurations.delete(key)
       end
 
       CONNECTION_CONFIGURATION_KEYS = [:uri, :base, :adapter]

data/lib/active_ldap/connection.rb

@@ -135,7 +135,7 @@ module ActiveLdap
         end
         config = configuration(key)
         conn = active_connections[key]
-        remove_configuration_by_configuration(config)
+        remove_configuration_by_key(key)
         active_connections.delete_if {|_key, value| value == conn}
         conn.disconnect! if conn
         config

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

data/test/test_connection_per_class.rb

@@ -57,6 +57,40 @@ class TestConnectionPerClass < Test::Unit::TestCase
     assert_equal([sub2_base], sub2_class.find(:all).collect(&:dn))
   end
 
+  def test_multi_same_setup_connections
+    make_ou("Sub")
+    sub_class1 = ou_class("ou=Sub")
+    sub_class2 = ou_class("ou=Sub")
+
+    configuration = current_configuration.symbolize_keys
+    configuration[:scope] = :base
+    current_base = configuration[:base]
+    sub_configuration = configuration.dup
+    sub_base = "ou=Sub,#{current_base}"
+    sub_configuration[:base] = sub_base
+
+    sub_class1.setup_connection(sub_configuration)
+    sub_class2.setup_connection(sub_configuration)
+
+    sub_configuration1 = sub_class1.configuration
+    sub_configuration2 = sub_class2.configuration
+
+    assert_not_nil(sub_configuration1)
+    assert_not_nil(sub_configuration2)
+
+    sub_class1.setup_connection(sub_configuration.dup)
+    sub_class1.prefix = nil
+
+    assert_equal([
+                   sub_configuration1,
+                   sub_configuration2,
+                 ],
+                 [
+                   sub_class1.configuration,
+                   sub_class2.configuration,
+                 ])
+  end
+
   def test_bind
     non_anon_class = ou_class("ou=NonAnonymous")
     anon_class = ou_class("ou=Anonymous")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Will Drewry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-activeldap
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP