activeldap 7.0.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d1a0c273dff5757de13f0a8379278794a5b4f2c89a1ff60e9a7e97dd0f8867
-  data.tar.gz: ec7c5e06e7e75d46a55b5ea163f56fb85d833e82eb2d66b2f3fb9bc07ce7c7ce
+  metadata.gz: 33db0ef491f607f25580b4785e21e11b3cf6628645de7eeda2c4c38a7b47a678
+  data.tar.gz: 4033500096a9ed36152d4bb0fc9769116bfcd8602b8f8bf210785f5220da5cf0
 SHA512:
-  metadata.gz: 7b1b5e88e3d2bf65bec620b15909f882cb3d4a386b0a482f7de18e88934cce1750ddc72175033b73accbb9a83f41e4ab947c9ffe4903abbca35ec1422c612978
-  data.tar.gz: dbf5a8751b7cd7235c9211738b50bb60a1450290c630a8a6a9a5faea2d3cac1ff8897cfb11ef98d5b87cc2bdda2128642d417638580c09659185b703a7efd0a5
+  metadata.gz: 97149165e3f0cd9db4e2a5befe1834640fd19e529e31744a6185609a98e6237b1eb05f8a1be7543dd55c97a45c1015b2d9aea63094479e0974e155330855d910
+  data.tar.gz: 957711ac114db7e3fa8ecf1e53fa1b3d382dd4cc65270390cd4bc0da2e85ec6c517dd5940652f330e0ed2ec8ee6c89d9156e3cb289484f6b6a845730b71af013

data/doc/text/news.md

@@ -1,6 +1,44 @@
 # News
 
-## 7.0.0: 2024-02-23 {#release-6-1-1}
+## 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
+
+  * Added support for Active Model 7.2.
+
+  * Dropped support for Active Model 5.
+
+  * Dropped support for Active Model 6.
+
+  * Added support for Psych 4.
+    * GH-198
+    * Patch by Carlos Palhares.
+
+### Fixes
+
+  * net-ldap: Fixed paged search
+    * GH-197
+    * Patch by Patrick Marchi
+
+### Thanks
+
+  * Patrick Marchi
+
+  * Carlos Palhares
+
+## 7.0.0: 2024-02-23 {#release-7-0-0}
 
 ### Improvements
 

data/lib/active_ldap/adapter/net_ldap.rb

@@ -78,7 +78,7 @@ module ActiveLdap
             filter: search_options[:filter],
             attributes: search_options[:attributes],
             size: search_options[:limit],
-            paged_searcheds_supported: search_options[:paged_results_supported],
+            paged_searches_supported: search_options[:use_paged_results],
           }
           execute(:search, info, args) do |entry|
             attributes = {}

data/lib/active_ldap/associations.rb

@@ -67,7 +67,7 @@ module ActiveLdap
           if foreign_key_name
             message = _(":foreign_key belongs_to(:many) option is " \
                         "deprecated since 1.1.0. Use :primary_key instead.")
-            ActiveSupport::Deprecation.warn(message)
+            ActiveLdap.deprecator.warn(message)
             opts[:primary_key_name] ||= foreign_key_name
           end
           opts[:primary_key_name] ||= dn_attribute
@@ -135,7 +135,7 @@ module ActiveLdap
               !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.")
-            ActiveSupport::Deprecation.warn(message)
+            ActiveLdap.deprecator.warn(message)
             opts[:foreign_key_name] = primary_key_name
             opts[:primary_key_name] = foreign_key_name
           end

data/lib/active_ldap/base.rb

@@ -55,7 +55,7 @@ module ActiveLdap
           _("ActiveLdap::ConnectionNotEstablished has been deprecated " \
             "since 1.1.0. " \
             "Please use ActiveLdap::ConnectionNotSetup instead.")
-        ActiveSupport::Deprecation.warn(message)
+        ActiveLdap.deprecator.warn(message)
         const_set("ConnectionNotEstablished", ConnectionNotSetup)
         ConnectionNotEstablished
       else
@@ -175,7 +175,7 @@ module ActiveLdap
     NEAREST_MARK = "|@|"
     private
     def detect_nearest(line, column)
-      lines = Compatible.string_to_lines(@ldif).to_a
+      lines = @ldif.lines
       nearest = lines[line - 1] || ""
       if column - 1 == nearest.size # for JRuby 1.0.2 :<
         nearest << NEAREST_MARK
@@ -205,7 +205,7 @@ module ActiveLdap
 
     def numbered_ldif
       return @ldif if @ldif.blank?
-      lines = Compatible.string_to_lines(@ldif)
+      lines = @ldif.lines
       format = "%#{Math.log10(lines.size).truncate + 1}d: %s"
       i = 0
       lines.collect do |line|
@@ -391,7 +391,7 @@ module ActiveLdap
           _("ActiveLdap::Base.establish_connection has been deprecated " \
             "since 1.1.0. " \
             "Please use ActiveLdap::Base.setup_connection instead.")
-        ActiveSupport::Deprecation.warn(message)
+        ActiveLdap.deprecator.warn(message)
         setup_connection(config)
       end
 

data/lib/active_ldap/callbacks.rb

@@ -26,7 +26,7 @@ module ActiveLdap
       def method_added(meth)
         super
         if CALLBACKS.include?(meth.to_sym)
-          ActiveSupport::Deprecation.warn("Base##{meth} has been deprecated, please use Base.#{meth} :method instead", caller[0,1])
+          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

data/lib/active_ldap/compatible.rb

@@ -28,17 +28,5 @@ module ActiveLdap
         object
       end
     end
-
-    if "".respond_to?(:lines)
-      def string_to_lines(string)
-        string.lines.to_a
-      end
-    else
-      def string_to_lines(string)
-        ary = []
-        string.each_line{|l| ary << l}
-        ary
-      end
-    end
   end
 end

data/lib/active_ldap/configuration.rb

@@ -137,7 +137,7 @@ module ActiveLdap
             if key == :ldap_scope
               message = _(":ldap_scope configuration option is deprecated. " \
                           "Use :scope instead.")
-              ActiveSupport::Deprecation.warn(message)
+              ActiveLdap.deprecator.warn(message)
             end
             target.scope = value
             configuration[:scope] = value

data/lib/active_ldap/connection.rb

@@ -97,7 +97,7 @@ module ActiveLdap
         if config.has_key?(:ldap_scope)
           message = _(":ldap_scope connection option is deprecated. " \
                       "Use :scope instead.")
-          ActiveSupport::Deprecation.warn(message)
+          ActiveLdap.deprecator.warn(message)
           config[:scope] ||= config.delete(:ldap_scope)
         end
         config = remove_connection_related_configuration(config)
@@ -156,7 +156,7 @@ module ActiveLdap
           _("ActiveLdap::Connection.establish_connection has been deprecated " \
             "since 1.1.0. " \
             "Please use ActiveLdap::Connection.setup_connection instead.")
-        ActiveSupport::Deprecation.warn(message)
+        ActiveLdap.deprecator.warn(message)
         setup_connection(config)
       end
 
@@ -216,7 +216,7 @@ module ActiveLdap
         _("ActiveLdap::Connection#establish_connection has been deprecated " \
           "since 1.1.0. " \
           "Please use ActiveLdap::Connection#setup_connection instead.")
-      ActiveSupport::Deprecation.warn(message)
+      ActiveLdap.deprecator.warn(message)
       setup_connection(config)
     end
 

data/lib/active_ldap/deprecator.rb

@@ -0,0 +1,7 @@
+module ActiveLdap
+  class << self
+    def deprecator # :nodoc:
+      @deprecator ||= ActiveSupport::Deprecation.new
+    end
+  end
+end

data/lib/active_ldap/ldif.rb

@@ -559,7 +559,7 @@ module ActiveLdap
         _consumed_source = consumed_source
         return 1 if _consumed_source.empty?
 
-        n = Compatible.string_to_lines(_consumed_source).size
+        n = _consumed_source.lines.size
         n += 1 if _consumed_source[-1, 1] == "\n"
         n
       end

data/lib/active_ldap/operations.rb

@@ -65,7 +65,7 @@ module ActiveLdap
         if options.has_key?(:ldap_scope)
           message = _(":ldap_scope search option is deprecated. " \
                       "Use :scope instead.")
-          ActiveSupport::Deprecation.warn(message)
+          ActiveLdap.deprecator.warn(message)
           options[:scope] ||= options[:ldap_scope]
         end
         search_options = {

data/lib/active_ldap/railtie.rb

@@ -6,11 +6,14 @@ 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 if app.respond_to?(:deprecators)
+    end
+
     initializer "active_ldap.setup_connection" do
       ldap_configuration_file = Rails.root.join('config', 'ldap.yml')
       if File.exist?(ldap_configuration_file)
-        configurations = YAML::load(ERB.new(IO.read(ldap_configuration_file)).result)
-        ActiveLdap::Base.configurations = configurations
+        ActiveLdap::Base.configurations = ActiveSupport::ConfigurationFile.parse(ldap_configuration_file)
         ActiveLdap::Base.setup_connection
       else
         ActiveLdap::Base.class_eval do

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "7.0.0"
+  VERSION = "7.2.1"
 end

data/lib/active_ldap.rb

@@ -3,6 +3,8 @@ require "active_support/core_ext"
 
 require "active_ldap/version"
 
+require "active_ldap/deprecator"
+
 module ActiveLdap
   autoload :Command, "active_ldap/command"
 end

data/test/test_associations.rb

@@ -134,7 +134,7 @@ EOX
   end
 
   def test_belongs_to_foreign_key_before_1_1_0
-    ActiveSupport::Deprecation.silence do
+    ActiveLdap.deprecator.silence do
       @group_class.belongs_to :related_users, :many => "seeAlso",
                               :foreign_key => "dn"
     end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Will Drewry
 - Kouhei Sutou
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +242,7 @@ files:
 - lib/active_ldap/compatible.rb
 - lib/active_ldap/configuration.rb
 - lib/active_ldap/connection.rb
+- lib/active_ldap/deprecator.rb
 - lib/active_ldap/distinguished_name.rb
 - lib/active_ldap/entry.rb
 - lib/active_ldap/entry_attribute.rb
@@ -330,7 +330,6 @@ licenses:
 - Ruby's
 - GPLv2 or later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -345,8 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: ActiveLdap is a object-oriented API to LDAP
 test_files: