Merge branch 'main' into dependabot/github_actions/github-actions-88f…

…6ebb865

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/activeldap/activeldap.git
-  revision: 888812e59b9b470bd349d24d3fc9c11d2b336875
+  revision: 81295053c1db67f4cd744465d5d289051b5a81e1
   specs:
-    activeldap (6.1.1)
+    activeldap (7.0.1)
       activemodel (>= 5.2)
       builder
       gettext
@@ -12,9 +12,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activesupport (7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -107,7 +107,7 @@ GEM
     language_server-protocol (3.17.0.3)
     locale (2.1.3)
     logger (1.6.0)
-    minitest (5.22.0)
+    minitest (5.22.2)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
@@ -129,7 +129,7 @@ GEM
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (3.0.9)
+    rack (3.0.9.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rackup (2.1.0)

vendor/cache/activeldap-81295053c1db/.github/workflows/release.yaml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  github:
+    name: GitHub
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v4
+      - name: Extract release note
+        run: |
+          ruby \
+            -e 'print("## ActiveLdap "); \
+                puts(ARGF.read.split(/^## /)[1]. \
+                       gsub(/ {.+?}/, ""). \
+                       gsub(/\[(.+?)\]\[.+?\]/) {$1})' \
+            doc/text/news.md > release-note.md
+      - name: Upload to release
+        run: |
+          title=$(head -n1 release-note.md | sed -e 's/^## //')
+          tail -n +2 release-note.md > release-note-without-version.md
+          gh release create ${GITHUB_REF_NAME} \
+            --discussion-category Announcements \
+            --notes-file release-note-without-version.md \
+            --title "${title}"
+        env:
+          GH_TOKEN: ${{ github.token }}

vendor/cache/activeldap-888812e59b9b/.github/workflows/test.yaml → vendor/cache/activeldap-81295053c1db/.github/workflows/test.yaml

@@ -79,12 +79,18 @@ jobs:
           - activemodel: "7"
             adapter: "net-ldap"
             ruby: "3.1"
+          # - activemodel: "7"
+          #   adapter: "ldap"
+          #   ruby: "3.2"
           - activemodel: "7"
-            adapter: "ldap"
+            adapter: "net-ldap"
             ruby: "3.2"
+          # - activemodel: "7"
+          #   adapter: "ldap"
+          #   ruby: "3.3"
           - activemodel: "7"
             adapter: "net-ldap"
-            ruby: "3.2"
+            ruby: "3.3"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -102,8 +108,8 @@ jobs:
         jruby:
           - 9
         activemodel:
-          - "5"
           - "6"
+          - "7"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

vendor/cache/activeldap-888812e59b9b/Gemfile → vendor/cache/activeldap-81295053c1db/Gemfile

@@ -7,7 +7,7 @@ gemspec
 group :test do
   gem "net-ldap"
   platforms :mri do
-    gem "ruby-ldap"
+    gem "ruby-ldap" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2.0")
   end
   platforms :jruby do
     gem "jruby-openssl"

vendor/cache/activeldap-888812e59b9b/activeldap.gemspec → vendor/cache/activeldap-81295053c1db/activeldap.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: activeldap 6.1.1 ruby lib
+# stub: activeldap 7.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activeldap".freeze
-  s.version = "6.1.1"
+  s.version = "7.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Will Drewry".freeze, "Kouhei Sutou".freeze]
-  s.date = "2024-01-10"
+  s.date = "2024-02-26"
   s.description = "    'ActiveLdap' is a ruby library which provides a clean\n    objected oriented interface to the Ruby/LDAP library.  It was inspired\n    by ActiveRecord. This is not nearly as clean or as flexible as\n    ActiveRecord, but it is still trivial to define new objects and manipulate\n    them with minimal difficulty.\n".freeze
   s.email = ["redpig@dataspill.org".freeze, "kou@cozmixng.org".freeze]
   s.files = [".yardopts".freeze, "COPYING".freeze, "Gemfile".freeze, "LICENSE".freeze, "TODO".freeze, "benchmark/README.md".freeze, "benchmark/bench-backend.rb".freeze, "benchmark/bench-instantiate.rb".freeze, "benchmark/config.yaml.sample".freeze, "doc/text/development.md".freeze, "doc/text/news.md".freeze, "doc/text/rails.md".freeze, "doc/text/tutorial.md".freeze, "examples/config.yaml.example".freeze, "examples/example.der".freeze, "examples/example.jpg".freeze, "examples/groupadd".freeze, "examples/groupdel".freeze, "examples/groupls".freeze, "examples/groupmod".freeze, "examples/lpasswd".freeze, "examples/objects".freeze, "examples/objects/group.rb".freeze, "examples/objects/ou.rb".freeze, "examples/objects/user.rb".freeze, "examples/ouadd".freeze, "examples/useradd".freeze, "examples/useradd-binary".freeze, "examples/userdel".freeze, "examples/userls".freeze, "examples/usermod".freeze, "examples/usermod-binary-add".freeze, "examples/usermod-binary-add-time".freeze, "examples/usermod-binary-del".freeze, "examples/usermod-lang-add".freeze, "lib/active_ldap".freeze, "lib/active_ldap.rb".freeze, "lib/active_ldap/acts".freeze, "lib/active_ldap/acts/tree.rb".freeze, "lib/active_ldap/adapter".freeze, "lib/active_ldap/adapter/base.rb".freeze, "lib/active_ldap/adapter/jndi.rb".freeze, "lib/active_ldap/adapter/jndi_connection.rb".freeze, "lib/active_ldap/adapter/ldap.rb".freeze, "lib/active_ldap/adapter/ldap_ext.rb".freeze, "lib/active_ldap/adapter/net_ldap.rb".freeze, "lib/active_ldap/adapter/net_ldap_ext.rb".freeze, "lib/active_ldap/association".freeze, "lib/active_ldap/association/belongs_to.rb".freeze, "lib/active_ldap/association/belongs_to_many.rb".freeze, "lib/active_ldap/association/children.rb".freeze, "lib/active_ldap/association/collection.rb".freeze, "lib/active_ldap/association/has_many.rb".freeze, "lib/active_ldap/association/has_many_utils.rb".freeze, "lib/active_ldap/association/has_many_wrap.rb".freeze, "lib/active_ldap/association/proxy.rb".freeze, "lib/active_ldap/associations.rb".freeze, "lib/active_ldap/attribute_methods".freeze, "lib/active_ldap/attribute_methods.rb".freeze, "lib/active_ldap/attribute_methods/before_type_cast.rb".freeze, "lib/active_ldap/attribute_methods/dirty.rb".freeze, "lib/active_ldap/attribute_methods/query.rb".freeze, "lib/active_ldap/attribute_methods/read.rb".freeze, "lib/active_ldap/attribute_methods/write.rb".freeze, "lib/active_ldap/attributes.rb".freeze, "lib/active_ldap/base.rb".freeze, "lib/active_ldap/callbacks.rb".freeze, "lib/active_ldap/command.rb".freeze, "lib/active_ldap/compatible.rb".freeze, "lib/active_ldap/configuration.rb".freeze, "lib/active_ldap/connection.rb".freeze, "lib/active_ldap/distinguished_name.rb".freeze, "lib/active_ldap/entry.rb".freeze, "lib/active_ldap/entry_attribute.rb".freeze, "lib/active_ldap/escape.rb".freeze, "lib/active_ldap/get_text".freeze, "lib/active_ldap/get_text.rb".freeze, "lib/active_ldap/get_text/parser.rb".freeze, "lib/active_ldap/helper.rb".freeze, "lib/active_ldap/human_readable.rb".freeze, "lib/active_ldap/ldap_controls.rb".freeze, "lib/active_ldap/ldap_error.rb".freeze, "lib/active_ldap/ldif.rb".freeze, "lib/active_ldap/log_subscriber.rb".freeze, "lib/active_ldap/object_class.rb".freeze, "lib/active_ldap/operations.rb".freeze, "lib/active_ldap/persistence.rb".freeze, "lib/active_ldap/populate.rb".freeze, "lib/active_ldap/railtie.rb".freeze, "lib/active_ldap/railties".freeze, "lib/active_ldap/railties/controller_runtime.rb".freeze, "lib/active_ldap/schema".freeze, "lib/active_ldap/schema.rb".freeze, "lib/active_ldap/schema/syntaxes.rb".freeze, "lib/active_ldap/supported_control.rb".freeze, "lib/active_ldap/user_password.rb".freeze, "lib/active_ldap/validations.rb".freeze, "lib/active_ldap/version.rb".freeze, "lib/active_ldap/xml.rb".freeze, "lib/rails".freeze, "lib/rails/generators".freeze, "lib/rails/generators/active_ldap".freeze, "lib/rails/generators/active_ldap/model".freeze, "lib/rails/generators/active_ldap/model/USAGE".freeze, "lib/rails/generators/active_ldap/model/model_generator.rb".freeze, "lib/rails/generators/active_ldap/model/templates".freeze, "lib/rails/generators/active_ldap/model/templates/model_active_ldap.rb".freeze, "lib/rails/generators/active_ldap/scaffold".freeze, "lib/rails/generators/active_ldap/scaffold/scaffold_generator.rb".freeze, "lib/rails/generators/active_ldap/scaffold/templates".freeze, "lib/rails/generators/active_ldap/scaffold/templates/ldap.yml".freeze, "po/en".freeze, "po/en/active-ldap.po".freeze, "po/ja".freeze, "po/ja/active-ldap.po".freeze, "test/add-phonetic-attribute-options-to-slapd.ldif".freeze, "test/al-test-utils.rb".freeze, "test/command.rb".freeze, "test/config.yaml.sample".freeze, "test/enable-dynamic-groups.ldif".freeze, "test/enable-start-tls.ldif".freeze, "test/fixtures/lower_case_object_class_schema.rb".freeze, "test/run-test.rb".freeze, "test/test_acts_as_tree.rb".freeze, "test/test_adapter.rb".freeze, "test/test_associations.rb".freeze, "test/test_attributes.rb".freeze, "test/test_base.rb".freeze, "test/test_base_per_instance.rb".freeze, "test/test_bind.rb".freeze, "test/test_callback.rb".freeze, "test/test_configuration.rb".freeze, "test/test_connection.rb".freeze, "test/test_connection_per_class.rb".freeze, "test/test_connection_per_dn.rb".freeze, "test/test_dirty.rb".freeze, "test/test_dn.rb".freeze, "test/test_entry.rb".freeze, "test/test_entry_attribute.rb".freeze, "test/test_find.rb".freeze, "test/test_groupadd.rb".freeze, "test/test_groupdel.rb".freeze, "test/test_groupls.rb".freeze, "test/test_groupmod.rb".freeze, "test/test_ldif.rb".freeze, "test/test_load.rb".freeze, "test/test_lpasswd.rb".freeze, "test/test_object_class.rb".freeze, "test/test_persistence.rb".freeze, "test/test_reflection.rb".freeze, "test/test_schema.rb".freeze, "test/test_supported_control.rb".freeze, "test/test_syntax.rb".freeze, "test/test_user.rb".freeze, "test/test_user_password.rb".freeze, "test/test_useradd-binary.rb".freeze, "test/test_useradd.rb".freeze, "test/test_userdel.rb".freeze, "test/test_userls.rb".freeze, "test/test_usermod-binary-add-time.rb".freeze, "test/test_usermod-binary-add.rb".freeze, "test/test_usermod-binary-del.rb".freeze, "test/test_usermod-lang-add.rb".freeze, "test/test_usermod.rb".freeze, "test/test_validation.rb".freeze]

vendor/cache/activeldap-888812e59b9b/doc/text/news.md → vendor/cache/activeldap-81295053c1db/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 7.0.0: 2024-02-23 {#release-6-1-1}
+
+### Improvements
+
+  * Added support for Active Model 7.
+    * GH-193
+    * GH-194
+    * GH-195
+    * Patch by J-Verz.
+
+### Thanks
+
+  * J-Verz
+
 ## 6.1.0: 2020-12-24 {#release-6-1-0}
 
 ### Improvements

vendor/cache/activeldap-888812e59b9b/docker-compose.yml → vendor/cache/activeldap-81295053c1db/docker-compose.yml

@@ -146,13 +146,13 @@ services:
     volumes:
       - .:/source:delegated
 
-  jruby-9-activemodel-5:
+  ruby-3.3-activemodel-7:
     build:
       context: .
       dockerfile: dockerfiles/ruby.dockerfile
       args:
-        FROM: jruby:9
-        GEMFILE: Gemfile.activemodel5
+        FROM: ruby:3.3
+        GEMFILE: Gemfile.activemodel7
     depends_on:
       - openldap-prepare
     volumes:
@@ -169,3 +169,15 @@ services:
       - openldap-prepare
     volumes:
       - .:/source:delegated
+
+  jruby-9-activemodel-7:
+    build:
+      context: .
+      dockerfile: dockerfiles/ruby.dockerfile
+      args:
+        FROM: jruby:9
+        GEMFILE: Gemfile.activemodel7
+    depends_on:
+      - openldap-prepare
+    volumes:
+      - .:/source:delegated

vendor/cache/activeldap-888812e59b9b/lib/active_ldap/attribute_methods.rb → vendor/cache/activeldap-81295053c1db/lib/active_ldap/attribute_methods.rb

@@ -7,8 +7,17 @@ def methods(singleton_methods = true)
       target_names = entry_attribute.all_names
       target_names -= ['objectClass', 'objectClass'.underscore]
       super + target_names.uniq.collect do |attr|
-        self.class.attribute_method_matchers.collect do |matcher|
-          :"#{matcher.prefix}#{attr}#{matcher.suffix}"
+        method_patterns = 
+          if self.class.respond_to?(:attribute_method_patterns)
+            # Support for ActiveModel >= 7.1.0
+            self.class.attribute_method_patterns
+          else
+            # Support for ActiveModel < 7.1.0
+            self.class.attribute_method_matchers
+          end
+
+        method_patterns.collect do |pattern|
+          pattern.method_name(attr).to_sym
         end
       end.flatten
     end

vendor/cache/activeldap-888812e59b9b/lib/active_ldap/version.rb → vendor/cache/activeldap-81295053c1db/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "6.1.1"
+  VERSION = "7.0.1"
 end