Skip to content

Commit

Permalink
Merge pull request #135 from GrantBirki/dependabot/bundler/prod-ruby-…
Browse files Browse the repository at this point in the history
…dependencies-845f775608

Bump activeldap from `08d8f65` to `e1181ce` in the prod-ruby-dependencies group
  • Loading branch information
GrantBirki authored Jan 14, 2025
2 parents 1b74dbf + 0ca84ae commit 112bb8e
Show file tree
Hide file tree
Showing 184 changed files with 10 additions and 175 deletions.
13 changes: 7 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: /~https://github.com/activeldap/activeldap.git
revision: 08d8f65f35f6238dcce86817e845fb76bf02d71a
revision: e1181ceff99e417c5038f26f2f09ff3ebbcc6d1b
specs:
activeldap (7.2.2)
activemodel (>= 7.0)
Expand Down Expand Up @@ -30,13 +30,13 @@ GEM
ast (2.4.2)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
builder (3.3.0)
concurrent-ruby (1.3.4)
config (5.5.2)
deep_merge (~> 1.2, >= 1.2.1)
ostruct
connection_pool (2.4.1)
connection_pool (2.5.0)
date (3.4.1)
deep_merge (1.2.2)
diff-lcs (1.5.1)
Expand All @@ -57,16 +57,17 @@ GEM
dry-inflector (~> 1.0)
dry-logic (~> 1.4)
zeitwerk (~> 2.6)
erubi (1.13.0)
fast_gettext (3.1.0)
erubi (1.13.1)
fast_gettext (4.1.0)
prime
racc
forwardable (1.3.3)
garner (0.5.3)
activesupport
json
multi_json (>= 1.3.0)
rack
gettext (3.4.9)
gettext (3.5.0)
erubi
locale (>= 2.0.5)
prime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- ruby -*-

source "https://rubygems.org"
source "http://rubygems.org"

gemspec

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |s|
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-11-25"
s.date = "2025-01-14"
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/deprecator.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]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ def belongs_to(association_id, options={})
# 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 = {})
Expand All @@ -130,15 +126,6 @@ def has_many(association_id, options = {})
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|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -384,17 +370,6 @@ def setup_connection(config=nil)
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)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ module Callbacks
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,7 @@ def merge_configuration(user_configuration, target=self)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@ def instantiate_adapter(config)
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
Expand Down Expand Up @@ -151,15 +145,6 @@ def setup_connection(config=nil)
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
Expand Down Expand Up @@ -211,15 +196,6 @@ def setup_connection(config=nil)
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ def search(options={}, &block)
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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -3575,12 +3571,6 @@ msgid ""
"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 ""
Expand Down Expand Up @@ -3763,12 +3753,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 ""
Expand Down Expand Up @@ -3801,12 +3785,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 ""
Expand Down Expand Up @@ -3853,16 +3831,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 ""
Expand Down Expand Up @@ -3965,10 +3933,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 ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -3590,14 +3585,6 @@ 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 "バージョン指定がありません"
Expand Down Expand Up @@ -3780,14 +3767,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"
Expand Down Expand Up @@ -3820,14 +3799,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'はシンボルでなければいけません"
Expand Down Expand Up @@ -3878,19 +3849,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から。"
Expand Down Expand Up @@ -3993,11 +3951,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"
Expand Down
File renamed without changes.
Binary file removed vendor/cache/bigdecimal-3.1.8.gem
Binary file not shown.
Binary file added vendor/cache/bigdecimal-3.1.9.gem
Binary file not shown.
Binary file removed vendor/cache/connection_pool-2.4.1.gem
Binary file not shown.
Binary file added vendor/cache/connection_pool-2.5.0.gem
Binary file not shown.
Binary file removed vendor/cache/erubi-1.13.0.gem
Binary file not shown.
Binary file added vendor/cache/erubi-1.13.1.gem
Binary file not shown.
Binary file removed vendor/cache/fast_gettext-3.1.0.gem
Binary file not shown.
Binary file added vendor/cache/fast_gettext-4.1.0.gem
Binary file not shown.
Binary file removed vendor/cache/gettext-3.4.9.gem
Binary file not shown.
Binary file added vendor/cache/gettext-3.5.0.gem
Binary file not shown.

0 comments on commit 112bb8e

Please sign in to comment.