Merge branch 'master' into feat/modify-controls

Author: HarlemSquirrel

.github/workflows/test.yml

@@ -19,15 +19,13 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.6"
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
-          - "jruby-9.3"
+          - "3.3"
           - "jruby-9.4"
-          - "truffleruby-22"
+          - "truffleruby"
     steps:
     - uses: actions/checkout@v2
     - name: Run tests with Ruby ${{ matrix.ruby }}
-      run: docker-compose run ci-${{ matrix.ruby }}
+      run: docker compose run ci-${{ matrix.ruby }}

README.rdoc

@@ -23,7 +23,7 @@ the most recent LDAP RFCs (4510–4519, plus portions of 4520–4532).
 
 == Synopsis
 
-See {Net::LDAP on rubydoc.info}[https://www.rubydoc.info/github/ruby-ldap/ruby-net-ldap] for documentation and usage samples.
+See {Net::LDAP on rubydoc.info}[https://www.rubydoc.info/github/ruby-ldap/ruby-net-ldap/Net/LDAP] for documentation and usage samples.
 
 == Requirements
 

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 networks:
   integration_test_network:
 
@@ -24,22 +22,8 @@ services:
     volumes:
       - ./test/fixtures/ldif:/ldif:ro
 
-  ci-2.6:
-    image: ruby:2.7
-    entrypoint: /code/ci-run.sh
-    environment:
-      INTEGRATION: openldap
-      INTEGRATION_HOST: ldap.example.org
-    depends_on:
-      - openldap
-    networks:
-      integration_test_network:
-    volumes:
-      - .:/code
-    working_dir: /code
-
-  ci-2.7:
-    image: ruby:2.7
+  ci-3.0:
+    image: ruby:3.0
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -52,8 +36,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.0:
-    image: ruby:3.0
+  ci-3.1:
+    image: ruby:3.1
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -66,8 +50,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.1:
-    image: ruby:3.1
+  ci-3.2:
+    image: ruby:3.2
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -80,8 +64,8 @@ services:
       - .:/code
     working_dir: /code
 
-  ci-3.2:
-    image: ruby:3.2
+  ci-3.3:
+    image: ruby:3.3
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap
@@ -95,8 +79,8 @@ services:
     working_dir: /code
 
   # https://github.com/flavorjones/truffleruby/pkgs/container/truffleruby
-  ci-truffleruby-22:
-    image: ghcr.io/flavorjones/truffleruby:22.3.1
+  ci-truffleruby:
+    image: ghcr.io/flavorjones/truffleruby:stable
     entrypoint: /code/ci-run.sh
     environment:
       INTEGRATION: openldap

net-ldap.gemspec

@@ -26,9 +26,10 @@ the most recent LDAP RFCs (4510-4519, plutions of 4520-4532).}
   s.homepage = %q{http://github.com/ruby-ldap/ruby-net-ldap}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 3.0.0"
   s.summary = %q{Net::LDAP for Ruby (also called net-ldap) implements client access for the Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing distributed directory services}
 
+  s.add_dependency("ostruct")
   s.add_development_dependency("flexmock", "~> 1.3")
   s.add_development_dependency("rake", "~> 12.3.3")
   s.add_development_dependency("rubocop", "~> 1.48")