activeldap 7.2.0 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98229dfe7a23adefa5ac97f2a5bc44d2aab7b692caa9c00ecbd6a47acc588596
-  data.tar.gz: f9dc3de4af65f6bbcbf4ce5f1a7363ec7c819cef979e76c870b673ee00362b17
+  metadata.gz: a7c3766a3d485894a01aa4b453efcb8e7e04de22c74052c0af83b15d85ee5923
+  data.tar.gz: b79b046dc24c0871b80826dd1bc04f266a56b89a78fc1e1f9f3d1306486b9722
 SHA512:
-  metadata.gz: a8b8af8dfa46f2ee5a9881d2065fad2f03773501a1b2bc38ebd529dc1476fbcc478f6f0ab07b83c8fe38fc9c63d41fbbb0e9d3eebbc9cc757b71fde89401d03b
-  data.tar.gz: a453265f81f2dd69d0cd55b4987c29087334bccba054c7ba25c5b01c19ef1f64fc85052f233f5e5de715c12792e8736e47d1143b1ccc4a2e4a9f62a84d83882f
+  metadata.gz: 576235f73ffb25c18048f603a634f80318185ae8698e48d34d03c17e01d40d616c1471ae353f251767254c09b2bc773549e56b35e1454e7101bfc0fd24477772
+  data.tar.gz: b296e277be6ce3e32c8b06db122794496d3f592aa6cb4a4ed942ac1470b22efc657dd952f8eeabe99b959cf8ec285b7f198a3e434aea9f8cc30ffc778822635a

data/doc/text/news.md

@@ -1,5 +1,61 @@
 # News
 
+## 7.2.2: 2025-06-08 {#release-7-2-2}
+
+### Improvements
+
+  * Removed deprecated `:primary_key` and `:foreign_key` on
+    `has_many`.
+    * GH-205
+    * GH-206
+    * Patch by J-Verz
+
+  * Removed deprecated `ActiveLdap::ConnectionNotEstabilished`.
+    * GH-205
+    * GH-207
+    * Patch by J-Verz
+
+  * Removed deprecated `estabilish_connection`.
+    * GH-205
+    * GH-208
+    * Patch by J-Verz
+
+  * Removed deprecated `:ldap_scope` configuration option.
+    * GH-205
+    * GH-209
+    * Patch by J-Verz
+
+  * Removed deprecated callback by instance methods on instances.
+    * GH-205
+    * GH-210
+    * Patch by J-Verz
+
+  * Removed deprecated `:foreign_key` on `belongs_to :many`.
+    * GH-205
+    * GH-211
+    * Patch by J-Verz
+
+  * Added support for multiple server configurations.
+    * GH-204
+    * GH-212
+    * Patch by J-Verz
+
+### Thanks
+
+  * J-Verz
+
+## 7.2.1: 2024-10-02 {#release-7-2-1}
+
+### Fixes
+
+  * Fixed a bug that ActiveLdap doesn't work with Rails 7.0.
+    * GH-200
+    * Patch by Carlos Palhares
+
+### Thanks
+
+  * Carlos Palhares
+
 ## 7.2.0: 2024-09-24 {#release-7-2-0}
 
 ### Improvements

data/doc/text/tutorial.md

@@ -210,19 +210,19 @@ case, it would be 'ou=Groups'.
 
 This method allows an extension class to make use of other extension classes
 tying objects together across the LDAP tree. Often, user objects will be
-members of, or belong_to, Group objects.
+members of, or belong to, `Group` objects.
 
 ```text
 * dc=dataspill,dc=org
 |+ ou=People,dc=dataspill,dc=org
- \
+\
  |- uid=drewry,ou=People,dc=dataspill,dc=org
-|- ou=Groups,dc=dataspill,dc=org
+ |- ou=Groups,dc=dataspill,dc=org
 ```
 
-
-In the above tree, one such example would be user 'drewry' who is a part of the
-group 'develop'. You can see this by looking at the 'memberUid' field of 'develop'.
+In the above tree, one such example would be user `drewry` who is a
+part of the group `develop`. You can see this by looking at the
+`memberUid` field of `develop`.
 
 ```text
 irb> develop = Group.find('develop')
@@ -231,18 +231,19 @@ irb> develop.memberUid
 => ['drewry', 'builder']
 ```
 
-If we look at the LDAP entry for 'drewry', we do not see any references to
-group 'develop'. In order to remedy that, we can use belongs_to
+If we look at the LDAP entry for `drewry`, we do not see any
+references to group `develop`. In order to remedy that, we can use
+`belongs_to`:
 
 ```text
 irb> class User < ActiveLdap::Base
 irb*   ldap_mapping :dn_attribute => 'uid', :prefix => 'ou=People', :classes => ['top','account']
-irb*   belongs_to :groups, :class_name => 'Group', :many => 'memberUid', :foreign_key => 'uid'
+irb*   belongs_to :groups, :class_name => 'Group', :many => 'memberUid', :primary_key => 'uid'
 irb* end
 ```
 
-Now, class User will have a method called 'groups' which will retrieve all
-Group objects that a user is in.
+Now, class `User` will have a method called `groups` which will
+retrieve all `Group` objects that a user is in.
 
 ```text
 irb> me = User.find('drewry')
@@ -256,8 +257,8 @@ irb> me.groups.each { |group| p group.cn };nil
 (Note: nil is just there to make the output cleaner...)
 ```
 
-TIP: If you weren't sure what the distinguished name attribute was for Group,
-you could also do the following:
+TIP: If you weren't sure what the distinguished name attribute was for
+`Group`, you could also do the following:
 
 ```text
 irb> me.groups.each { |group| p group.id };nil
@@ -267,47 +268,58 @@ irb> me.groups.each { |group| p group.id };nil
 => nil
 ```
 
-Now let's talk about the arguments of belongs_to. We use the following code that extends Group group a bit for explain:
+Now let's talk about the arguments of `belongs_to`. We use the
+following code that extends `User` a bit:
 
 ```ruby
 class User < ActiveLdap::Base
   ldap_mapping :dn_attribute => 'uid', :prefix => 'People', :classes => ['top','account']
 
+  # Associate with all belonged groups
+  belongs_to :groups, :primary_key => 'uid',
+              :class_name => 'Group', :many => 'memberUid'
+
   # Associate with primary belonged group
   belongs_to :primary_group, :foreign_key => 'gidNumber',
-               :class_name => 'Group', :primary_key => 'gidNumber'
-
-  # Associate with all belonged groups
-  belongs_to :groups,  :foreign_key => 'uid',
-               :class_name => 'Group', :many => 'memberUid',
+              :class_name => 'Group', :primary_key => 'gidNumber'
 end
 ```
 
-The first argument is the name of the method you wish to create. In this case, we created a method called primary_group and groups using the symbol :primary_group and :groups. The next collection of arguments are actually a Hash (as with ldap_mapping).
-
-`:foreign_key` tells `belongs_to` what attribute Group objects have that match the related object's attribute. If `:foreign_key` is left off of the argument list, it is assumed to be the dn_attribute.
-
-In the example, uid is used for :foreign_key. It may confuse you.
-
-ActiveLdap uses `:foreign_key` as "own attribute name". So it
-may not be "foreign key". You can consider `:foreign_key` just
-as a relation key.
-
-`:primary_key` is treated as "related object's attribute name"
-as we discussed later.
-
-`:class_name` should be a string that has the name of a class
-you've already included. If your class is inside of a module,
-be sure to put the whole name, e.g.
-`:class_name => "MyLdapModule::Group"`.
-
-`:many` and `:primary_key` are similar. Both of them specifies attribute name of related object specified by `:foreign_key`. Those values are attribute name that can be used by object of class specified by `:class_name`.
-
-Relation is resolved by searching entries of `:class_name` class with `:foreign_key` attribute value. Search target attribute for it is `:primary_key` or `:many`. primary_group method in the above example searches Group objects with User object's gidNumber value as Group object's gidNumber value. Matched Group objects are belonged objects.
-
-`:parimary_key` is used for an object just belongs to an object. The first matched object is treated as beloned object.
-
-`:many` is used for an object belongs to many objects. All of matched objects are treated as belonged objects.
+The first argument is the name of the method you wish to create. In
+this case, we created a method called `groups` and `primary_group`
+using the symbols `:groups` and `:primary_group`. The next collection
+of arguments are actually a `Hash` (as with `ldap_mapping`).
+
+To specify the `groups` association, we use the `:many` option.
+`:many` is used if an object belongs to many objects. All of matched
+objects are treated as belonged objects. `:many` sets the "related object's
+attribute name" and `:primary_key` sets the "own attribute name".
+If `:primary_key` is left off of the argument list, it is assumed to be the
+`dn_attribute`. In the example, `uid` is specified explicitly but we
+can omit it because `uid` is the default value.
+
+Relation is resolved by searching entries of `:class_name` class
+objects with `:many` attribute value. Search target attribute for it
+is `:primary_key`. The `groups` method in the above example searches
+`Group` objects with `User` object's `uid` value as `Group` object's
+`memberUid` value.
+
+
+When an object just belongs to an object, `:foreign_key` is used 
+instead of `:many` and the attributes swap meaning:
+`:primary_key` specifies the "related object's attribute name" while
+`:foreign_key` specifies the "own attribute name".
+
+Relation is resolved by searching entries of `:class_name` class
+objects with `:primary_key` attribute value. Search target attribute
+for it is `:foreign_key`. The first matched object is treated as
+the belonged object. The `primary_group` method in the above
+example searches `Group` objects with `User` object's `gidNumber`
+value as `Group` object's `gidNumber` value.
+
+`:class_name` should be a string that has the name of a class you've
+already included. If your class is inside of a module, be sure to put
+the whole name, e.g. `:class_name => "MyLdapModule::Group"`.
 
 ##### `has_many`
 
@@ -932,6 +944,32 @@ irb> auth_class.setup_connection(:password_block => lambda{'mypass'})
 
 This can be useful for doing authentication tests and other such tricks.
 
+#### Connecting to multiple different servers simultaneously
+If you use a YAML configuration file, you can also define multiple configurations there and reference them by name. Let's say that your configuration file contains the following:
+```yaml
+primary:
+  host: ldap.example.com
+  base: dc=primary,dc=com
+  bind_dn: cn=admin,dc=primary,dc=com
+my_server:
+  host: ldap.example.com
+  base: dc=example,dc=com
+  bind_dn: cn=admin,dc=example,dc=com
+  password: justanexample
+external_server:
+  host: ldap.external.com
+  base: dc=external,dc=com
+  bind_dn: cn=someone,dc=external,dc=com
+  password: thisisanexample
+```
+
+By passing a keyword argument named `:name` to `setup_connection` you can choose which configuration a certain class should use. When you don't specify a name while multiple configurations exist, the name `primary` is used.
+```ruby
+MyUser.setup_connection(:name => :my_server)
+ExternalUser.setup_connection(:name => :external_server)
+User.setup_connection # will use the configuration under 'primary'
+```
+
 #### :try_sasl
 
 If you have the Ruby/LDAP package with the SASL/GSSAPI patch from Ian

data/lib/active_ldap/associations.rb

@@ -38,8 +38,6 @@ module ActiveLdap
       #  belongs_to :groups, :class_name => "Group",
       #             :many => "memberUid" # Group#memberUid
       #             # :primary_key => "uid" # User#uid
-      #             ## deprecated since 1.1.0. Use :primary_key instead.
-      #             ## :foreign_key => "uid" # User#uid
       #             # dn attribute value is used by default
       #  belongs_to :primary_group, :class_name => "Group",
       #             :foreign_key => "gidNumber", # User#gidNumber
@@ -63,13 +61,6 @@ module ActiveLdap
         }
         if opts[:many]
           association_class = Association::BelongsToMany
-          foreign_key_name = opts[:foreign_key_name]
-          if foreign_key_name
-            message = _(":foreign_key belongs_to(:many) option is " \
-                        "deprecated since 1.1.0. Use :primary_key instead.")
-            ActiveLdap.deprecator.warn(message)
-            opts[:primary_key_name] ||= foreign_key_name
-          end
           opts[:primary_key_name] ||= dn_attribute
         else
           association_class = Association::BelongsTo
@@ -103,10 +94,6 @@ module ActiveLdap
       #   has_many :primary_members, :class_name => "User",
       #            :primary_key => "gidNumber", # Group#gidNumber
       #            :foreign_key => "gidNumber"  # User#gidNumber
-      #            ## deprecated since 1.1.0. Those options
-      #            ## are inverted.
-      #            # :primary_key => "gidNumber", # User#gidNumber
-      #            # :foreign_key => "gidNumber"  # Group#gidNumber
       #   has_many :members, :class_name => "User",
       #            :wrap => "memberUid" # Group#memberUid
       def has_many(association_id, options = {})
@@ -130,15 +117,6 @@ module ActiveLdap
           association_class = Association::HasMany
           primary_key_name = opts[:primary_key_name]
           foreign_key_name = opts[:foreign_key_name]
-          if primary_key_name != foreign_key_name and
-              primary_key_name != "dn" and
-              !new.have_attribute?(primary_key_name)
-            message = _(":primary_key and :foreign_key has_many options are " \
-                        "inverted their mean since 1.1.0. Please invert them.")
-            ActiveLdap.deprecator.warn(message)
-            opts[:foreign_key_name] = primary_key_name
-            opts[:primary_key_name] = foreign_key_name
-          end
         end
 
         association_accessor(association_id) do |target|

data/lib/active_ldap/base.rb

@@ -48,20 +48,6 @@ module ActiveLdap
 
   class << self
     include GetTextSupport
-    def const_missing(id)
-      case id
-      when :ConnectionNotEstablished
-        message =
-          _("ActiveLdap::ConnectionNotEstablished has been deprecated " \
-            "since 1.1.0. " \
-            "Please use ActiveLdap::ConnectionNotSetup instead.")
-        ActiveLdap.deprecator.warn(message)
-        const_set("ConnectionNotEstablished", ConnectionNotSetup)
-        ConnectionNotEstablished
-      else
-        super
-      end
-    end
   end
 
   class Error < StandardError
@@ -384,17 +370,6 @@ module ActiveLdap
         nil
       end
 
-      # establish_connection is deprecated since 1.1.0. Please use
-      # setup_connection() instead.
-      def establish_connection(config=nil)
-        message =
-          _("ActiveLdap::Base.establish_connection has been deprecated " \
-            "since 1.1.0. " \
-            "Please use ActiveLdap::Base.setup_connection instead.")
-        ActiveLdap.deprecator.warn(message)
-        setup_connection(config)
-      end
-
       def create(attributes=nil, &block)
         if attributes.is_a?(Array)
           attributes.collect {|attrs| create(attrs, &block)}

data/lib/active_ldap/callbacks.rb

@@ -22,16 +22,6 @@ module ActiveLdap
       define_model_callbacks :save, :create, :update, :destroy
     end
 
-    module ClassMethods
-      def method_added(meth)
-        super
-        if CALLBACKS.include?(meth.to_sym)
-          ActiveLdap.deprecator.warn("Base##{meth} has been deprecated, please use Base.#{meth} :method instead", caller[0,1])
-          send(meth.to_sym, meth.to_sym)
-        end
-      end
-    end
-
     module CallbackedInstantiatable
       def instantiate(record)
         object = super(record)

data/lib/active_ldap/configuration.rb

@@ -73,7 +73,7 @@ module ActiveLdap
           elsif defined?(Rails)
             config = Rails.env
           else
-            config = {}
+            config = configurations
           end
         end
 
@@ -133,12 +133,7 @@ module ActiveLdap
           when :base
             # Scrub before inserting
             target.base = value.gsub(/['}{#]/, '')
-          when :scope, :ldap_scope
-            if key == :ldap_scope
-              message = _(":ldap_scope configuration option is deprecated. " \
-                          "Use :scope instead.")
-              ActiveLdap.deprecator.warn(message)
-            end
+          when :scope
             target.scope = value
             configuration[:scope] = value
           else

data/lib/active_ldap/connection.rb

@@ -94,12 +94,6 @@ module ActiveLdap
         unless Adapter::Base.respond_to?(adapter_method)
           raise AdapterNotFound.new(adapter)
         end
-        if config.has_key?(:ldap_scope)
-          message = _(":ldap_scope connection option is deprecated. " \
-                      "Use :scope instead.")
-          ActiveLdap.deprecator.warn(message)
-          config[:scope] ||= config.delete(:ldap_scope)
-        end
         config = remove_connection_related_configuration(config)
         Adapter::Base.send(adapter_method, config)
       end
@@ -142,7 +136,24 @@ module ActiveLdap
       end
 
       def setup_connection(config=nil)
+        if config.is_a?(Hash) and config.size == 1 and config.key? :name
+          name = config[:name]
+          config = nil
+        else
+          name = nil
+        end
+
         config = ensure_configuration(config)
+        if name
+          config = config[name.to_s]
+        elsif config.is_a?(Hash) and config.values.all?(Hash)
+          config = config["primary"] || config.values.first
+        end
+
+        unless config
+          raise ConnectionError, _("%s connection is not configured") % (name || "primary")
+        end
+
         remove_connection
 
         clear_active_connection_name
@@ -151,15 +162,6 @@ module ActiveLdap
         define_configuration(key, merge_configuration(config))
       end
 
-      def establish_connection(config=nil)
-        message =
-          _("ActiveLdap::Connection.establish_connection has been deprecated " \
-            "since 1.1.0. " \
-            "Please use ActiveLdap::Connection.setup_connection instead.")
-        ActiveLdap.deprecator.warn(message)
-        setup_connection(config)
-      end
-
       # Return the schema object
       def schema
         connection.schema
@@ -211,15 +213,6 @@ module ActiveLdap
       self.class.define_configuration(dn, config)
     end
 
-    def establish_connection(config=nil)
-      message =
-        _("ActiveLdap::Connection#establish_connection has been deprecated " \
-          "since 1.1.0. " \
-          "Please use ActiveLdap::Connection#setup_connection instead.")
-      ActiveLdap.deprecator.warn(message)
-      setup_connection(config)
-    end
-
     def remove_connection
       self.class.remove_connection(dn)
       @connection = nil

data/lib/active_ldap/operations.rb

@@ -62,12 +62,6 @@ module ActiveLdap
         filter = [:and, filter, *object_class_filters(classes)]
         _base = options[:base] ? [options[:base]] : [prefix, base]
         _base = prepare_search_base(_base)
-        if options.has_key?(:ldap_scope)
-          message = _(":ldap_scope search option is deprecated. " \
-                      "Use :scope instead.")
-          ActiveLdap.deprecator.warn(message)
-          options[:scope] ||= options[:ldap_scope]
-        end
         search_options = {
           :base => _base,
           :scope => options[:scope] || scope,

data/lib/active_ldap/railtie.rb

@@ -7,7 +7,7 @@ Locale.init(:driver => :cgi)
 module ActiveLdap
   class Railtie < Rails::Railtie
     initializer "active_ldap.deprecator", before: :load_environment_config do |app|
-      app.deprecators[:active_ldap] = ActiveLdap.deprecator
+      app.deprecators[:active_ldap] = ActiveLdap.deprecator if app.respond_to?(:deprecators)
     end
 
     initializer "active_ldap.setup_connection" do

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "7.2.0"
+  VERSION = "7.2.2"
 end

data/po/en/active-ldap.po

@@ -3537,10 +3537,6 @@ msgstr ""
 msgid "parent must be an entry or parent DN: %s"
 msgstr ""
 
-#: lib/active_ldap/operations.rb:49
-msgid ":ldap_scope search option is deprecated. Use :scope instead."
-msgstr ""
-
 #: lib/active_ldap/operations.rb:258
 msgid "Invalid order: %s"
 msgstr ""
@@ -3569,18 +3565,6 @@ msgstr ""
 msgid "Failed to delete LDAP entry: <%s>: %s"
 msgstr ""
 
-#: lib/active_ldap/associations.rb:68
-msgid ""
-":foreign_key belongs_to(:many) option is deprecated since 1.1.0. Use :"
-"primary_key instead."
-msgstr ""
-
-#: lib/active_ldap/associations.rb:136
-msgid ""
-":primary_key and :foreign_key has_many options are inverted their mean since "
-"1.1.0. Please invert them."
-msgstr ""
-
 #: lib/active_ldap/ldif.rb:396
 msgid "version spec is missing"
 msgstr ""
@@ -3763,12 +3747,6 @@ msgstr ""
 msgid "Show version"
 msgstr ""
 
-#: lib/active_ldap/base.rb:53
-msgid ""
-"ActiveLdap::ConnectionNotEstablished has been deprecated since 1.1.0. Please "
-"use ActiveLdap::ConnectionNotSetup instead."
-msgstr ""
-
 #: lib/active_ldap/base.rb:131
 msgid "invalid distinguished name (DN) to parse: %s"
 msgstr ""
@@ -3801,12 +3779,6 @@ msgstr ""
 msgid "not implemented: %s"
 msgstr ""
 
-#: lib/active_ldap/base.rb:382
-msgid ""
-"ActiveLdap::Base.establish_connection has been deprecated since 1.1.0. "
-"Please use ActiveLdap::Base.setup_connection instead."
-msgstr ""
-
 #: lib/active_ldap/base.rb:463
 msgid "scope '%s' must be a Symbol"
 msgstr ""
@@ -3853,16 +3825,6 @@ msgstr ""
 msgid "Attribute %s: Hash must have one key-value pair only: %s"
 msgstr ""
 
-#: lib/active_ldap/connection.rb:98
-msgid ":ldap_scope connection option is deprecated. Use :scope instead."
-msgstr ""
-
-#: lib/active_ldap/connection.rb:156
-msgid ""
-"ActiveLdap::Connection.establish_connection has been deprecated since 1.1.0. "
-"Please use ActiveLdap::Connection.setup_connection instead."
-msgstr ""
-
 #: lib/active_ldap/connection.rb:236
 msgid "since 1.1.0. "
 msgstr ""
@@ -3965,10 +3927,6 @@ msgstr ""
 msgid "%s connection is not configured"
 msgstr ""
 
-#: lib/active_ldap/configuration.rb:110
-msgid ":ldap_scope configuration option is deprecated. Use :scope instead."
-msgstr ""
-
 #: lib/active_ldap/configuration.rb:131
 msgid "invalid URI: %s"
 msgstr ""

data/po/ja/active-ldap.po

@@ -3549,11 +3549,6 @@ msgstr "LDAPサーバへの再接続を諦めました。"
 msgid "parent must be an entry or parent DN: %s"
 msgstr "親はエントリかDNでなければいけません: %s"
 
-#: lib/active_ldap/operations.rb:49
-msgid ":ldap_scope search option is deprecated. Use :scope instead."
-msgstr ""
-":ldap_search検索オプションは廃止予定です。代わりに:scopeを使ってください。"
-
 #: lib/active_ldap/operations.rb:258
 msgid "Invalid order: %s"
 msgstr "不正な順序です: %s"
@@ -3582,22 +3577,6 @@ msgstr "すべての%sを見つけられませんでした: DN (%s)"
 msgid "Failed to delete LDAP entry: <%s>: %s"
 msgstr "LDAPエントリの削除に失敗しました: <%s>: %s"
 
-#: lib/active_ldap/associations.rb:68
-msgid ""
-":foreign_key belongs_to(:many) option is deprecated since 1.1.0. Use :"
-"primary_key instead."
-msgstr ""
-"1.1.0からbelongs_to(:many)の:foreign_keyオプションは非推奨になりました。代わ"
-"りに:primary_keyを使ってください。"
-
-#: lib/active_ldap/associations.rb:136
-msgid ""
-":primary_key and :foreign_key has_many options are inverted their mean since "
-"1.1.0. Please invert them."
-msgstr ""
-"1.1.0からhas_manyの:primary_keyと:foreign_keyオプションの意味が反対になりまし"
-"た。オプションの値を入れかえてください。"
-
 #: lib/active_ldap/ldif.rb:396
 msgid "version spec is missing"
 msgstr "バージョン指定がありません"
@@ -3780,14 +3759,6 @@ msgstr "このメッセージを表示します"
 msgid "Show version"
 msgstr "バージョンを表示します"
 
-#: lib/active_ldap/base.rb:53
-msgid ""
-"ActiveLdap::ConnectionNotEstablished has been deprecated since 1.1.0. Please "
-"use ActiveLdap::ConnectionNotSetup instead."
-msgstr ""
-"1.1.0からActiveLdap::ConnectionNotEstablishedは非推奨になりました。代わりに"
-"ActiveLdap::ConnectionNotSetupを使ってください。"
-
 #: lib/active_ldap/base.rb:131
 msgid "invalid distinguished name (DN) to parse: %s"
 msgstr "構文解析できない不正な識別名(DN)です: %s"
@@ -3820,14 +3791,6 @@ msgstr "%sは未知の属性です"
 msgid "not implemented: %s"
 msgstr "未実装です: %s"
 
-#: lib/active_ldap/base.rb:382
-msgid ""
-"ActiveLdap::Base.establish_connection has been deprecated since 1.1.0. "
-"Please use ActiveLdap::Base.setup_connection instead."
-msgstr ""
-"1.1.0からActiveLdap::Base.establish_connectionは非推奨になりました。代わりに"
-"ActiveLdap::Base.setup_connectionを使ってください。"
-
 #: lib/active_ldap/base.rb:463
 msgid "scope '%s' must be a Symbol"
 msgstr "スコープ'%s'はシンボルでなければいけません"
@@ -3878,19 +3841,6 @@ msgstr "属性%sは単一の値しか持てません: %s"
 msgid "Attribute %s: Hash must have one key-value pair only: %s"
 msgstr "属性 %s: ハッシュはひとつのキー・値のペアしか持ってはいけません: %s"
 
-#: lib/active_ldap/connection.rb:98
-msgid ":ldap_scope connection option is deprecated. Use :scope instead."
-msgstr ""
-":ldap_scope接続オプションは廃止予定です。代わりに:scopeを使ってください。"
-
-#: lib/active_ldap/connection.rb:156
-msgid ""
-"ActiveLdap::Connection.establish_connection has been deprecated since 1.1.0. "
-"Please use ActiveLdap::Connection.setup_connection instead."
-msgstr ""
-"1.1.0からActiveLdap::Connection.establish_connectionは非推奨になりました。代"
-"わりにActiveLdap::Connection.setup_connectionを使ってください。"
-
 #: lib/active_ldap/connection.rb:236
 msgid "since 1.1.0. "
 msgstr "1.1.0から。"
@@ -3993,11 +3943,6 @@ msgstr "'%{file}'を無視します。まず依存関係を解決してくださ
 msgid "%s connection is not configured"
 msgstr "%sの接続は設定されていません"
 
-#: lib/active_ldap/configuration.rb:110
-msgid ":ldap_scope configuration option is deprecated. Use :scope instead."
-msgstr ""
-":ldap_scope設定オプションは廃止予定です。代わりに:scopeを使ってください。"
-
 #: lib/active_ldap/configuration.rb:131
 msgid "invalid URI: %s"
 msgstr "不正なURIです: %s"

data/test/al-test-utils.rb

@@ -159,9 +159,11 @@ module AlTestUtils
   module Populate
     def setup
       @dumped_data = nil
+      @configurations_on_dump = nil
       super
       begin
         @dumped_data = ActiveLdap::Base.dump(:scope => :sub)
+        @configurations_on_dump = ActiveLdap::Base.configurations.dup
       rescue ActiveLdap::ConnectionError
       end
       ActiveLdap::Base.delete_all(nil, :scope => :sub)
@@ -170,6 +172,7 @@ module AlTestUtils
 
     def teardown
       if @dumped_data
+        ActiveLdap::Base.configurations = @configurations_on_dump
         ActiveLdap::Base.setup_connection
         ActiveLdap::Base.delete_all(nil, :scope => :sub)
         ActiveLdap::Base.load(@dumped_data)

data/test/test_associations.rb

@@ -133,23 +133,6 @@ EOX
     end
   end
 
-  def test_belongs_to_foreign_key_before_1_1_0
-    ActiveLdap.deprecator.silence do
-      @group_class.belongs_to :related_users, :many => "seeAlso",
-                              :foreign_key => "dn"
-    end
-    @group_class.set_associated_class(:related_users, @user_class)
-    make_temporary_user do |user,|
-      make_temporary_group do |group|
-        user.see_also = group.dn
-        user.save!
-
-        group = @group_class.find(group.id)
-        assert_equal([user.dn], group.related_users.collect(&:dn))
-      end
-    end
-  end
-
   def test_has_many_wrap_with_nonexistent_entry
     @user_class.has_many :references, :wrap => "seeAlso", :primary_key => "dn"
     @user_class.set_associated_class(:references, @group_class)

data/test/test_multi_configuration.rb

@@ -0,0 +1,94 @@
+require 'al-test-utils'
+
+class TestMultiConfiguration < Test::Unit::TestCase
+  include AlTestUtils
+
+  def test_configuration_with_no_key
+    assert do
+      connect(ActiveLdap::Base)
+    end
+  end
+
+  def test_configuration_with_primary_key
+    ActiveLdap::Base.configurations[LDAP_ENV] = {
+      "primary" => current_configuration
+    }
+    assert do
+      connect(ActiveLdap::Base)
+    end
+  end
+
+  def test_configuration_with_special_key
+    ActiveLdap::Base.configurations[LDAP_ENV] = {
+      "special" => current_configuration
+    }
+    assert do
+      connect(ActiveLdap::Base, {name: :special})
+    end
+  end
+
+  def test_configuration_with_special_key_as_string
+    ActiveLdap::Base.configurations[LDAP_ENV] = {
+      "special" => current_configuration
+    }
+    assert do
+      connect(ActiveLdap::Base, {name: "special"})
+    end
+  end
+
+  def test_configuration_with_special_key_without_ldap_env
+    begin
+      ActiveLdap::Base.configurations = {
+        "special" => ActiveLdap::Base.configurations[LDAP_ENV]
+      }
+
+      # temporarily undefine LDAP_ENV
+      ldap_env = LDAP_ENV
+      Object.__send__(:remove_const, :LDAP_ENV)
+
+      assert do
+        connect(ActiveLdap::Base, {name: :special})
+      end
+    ensure
+      Object.const_set(:LDAP_ENV, ldap_env)
+    end
+  end
+
+  def test_configuration_with_special_key_and_missing_config
+    message = "special connection is not configured"
+    assert_raise(ActiveLdap::ConnectionError.new(message)) do
+      connect(ActiveLdap::Base, {name: :special})
+    end
+  end
+
+  def test_configuration_per_class
+    make_ou("Primary")
+    make_ou("Sub")
+    primary_class = ou_class("ou=Primary")
+    sub_class = ou_class("ou=Sub")
+
+    configuration = current_configuration.symbolize_keys
+    configuration[:scope] = :base
+    current_base = configuration[:base]
+
+    primary_configuration = configuration.dup
+    primary_configuration[:base] = "ou=Primary,#{current_base}"
+
+    sub_configuration = configuration.dup
+    sub_configuration[:base] = "ou=Sub,#{current_base}"
+
+    ActiveLdap::Base.configurations[LDAP_ENV] = {
+      "primary" => primary_configuration,
+      "sub" => sub_configuration
+    }
+    assert do
+      connect(primary_class) and connect(sub_class, {name: :sub})
+    end
+  end
+
+  private
+  def connect(klass, config = nil)
+    klass.setup_connection(config)
+    klass.connection.connect
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.2
 platform: ruby
 authors:
 - Will Drewry
 - Kouhei Sutou
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -307,6 +307,7 @@ files:
 - test/test_ldif.rb
 - test/test_load.rb
 - test/test_lpasswd.rb
+- test/test_multi_configuration.rb
 - test/test_object_class.rb
 - test/test_persistence.rb
 - test/test_reflection.rb
@@ -327,9 +328,13 @@ files:
 - test/test_validation.rb
 homepage: http://activeldap.github.io/
 licenses:
-- Ruby's
-- GPLv2 or later
-metadata: {}
+- Ruby
+- GPL-2.0-or-later
+metadata:
+  bug_tracker_uri: https://github.com/activeldap/activeldap/issues
+  changelog_uri: https://github.com/activeldap/activeldap/blob/7.2.2/doc/text/news.md
+  homepage_uri: https://activeldap.github.io/
+  source_code_uri: https://github.com/activeldap/activeldap
 rdoc_options: []
 require_paths:
 - lib
@@ -344,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.7
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
 test_files:
@@ -380,6 +385,7 @@ test_files:
 - test/test_ldif.rb
 - test/test_load.rb
 - test/test_lpasswd.rb
+- test/test_multi_configuration.rb
 - test/test_object_class.rb
 - test/test_persistence.rb
 - test/test_reflection.rb