Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger error on CI #866

Merged
merged 3 commits into from
Feb 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
dynamoid (3.10.0)
dynamoid (3.11.0)
activemodel (>= 4)
aws-sdk-dynamodb (~> 1.0)
concurrent-ruby (>= 1.0)
Expand Down Expand Up @@ -55,7 +55,7 @@ GEM
concurrent-ruby (~> 1.0)
iniparse (1.5.0)
jmespath (1.6.2)
json (2.7.2)
json (2.9.1)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
minitest (5.21.1)
Expand All @@ -64,8 +64,8 @@ GEM
childprocess (>= 0.6.3, < 6)
iniparse (~> 1.4)
rexml (~> 3.2)
parallel (1.25.1)
parser (3.3.3.0)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
pry (0.14.2)
Expand All @@ -74,12 +74,11 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
racc (1.8.0)
racc (1.8.1)
rainbow (3.1.1)
rake (13.1.0)
regexp_parser (2.9.2)
rexml (3.3.1)
strscan
regexp_parser (2.10.0)
rexml (3.4.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand All @@ -93,18 +92,17 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.64.1)
rubocop (1.70.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-md (1.2.2)
rubocop (>= 1.0)
Expand All @@ -117,8 +115,8 @@ GEM
rubocop (~> 1.0)
rubocop-rspec (3.0.2)
rubocop (~> 1.61)
rubocop-thread_safety (0.5.1)
rubocop (>= 0.90.0)
rubocop-thread_safety (0.6.0)
rubocop (>= 1.48.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
simplecov (0.21.2)
Expand All @@ -134,11 +132,12 @@ GEM
simplecov
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
strscan (3.1.0)
thor (1.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
yard (0.9.34)

PLATFORMS
Expand Down
4 changes: 2 additions & 2 deletions lib/dynamoid/persistence/save.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def conditions_for_write
# Add an optimistic locking check if the lock_version column exists
# Uses the original lock_version value from Dirty API
# in case user changed 'lock_version' manually
if @model.class.attributes[:lock_version] && (@model.changes[:lock_version][0])
if @model.class.attributes[:lock_version] && @model.changes[:lock_version][0]
conditions[:if] ||= {}
conditions[:if][:lock_version] = @model.changes[:lock_version][0]
end
Expand All @@ -96,7 +96,7 @@ def options_to_update_item
# Add an optimistic locking check if the lock_version column exists
# Uses the original lock_version value from Dirty API
# in case user changed 'lock_version' manually
if @model.class.attributes[:lock_version] && (@model.changes[:lock_version][0])
if @model.class.attributes[:lock_version] && @model.changes[:lock_version][0]
conditions[:if] ||= {}
conditions[:if][:lock_version] = @model.changes[:lock_version][0]
end
Expand Down
7 changes: 6 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# frozen_string_literal: true

# Standard Libs
# N/A

# Explicit requiring the "logger" library is needed for Rails 6.0-7.0
# See the following for details:
# - https://github.com/rails/rails/issues/54260
# - https://github.com/rails/rails/pull/49372
require 'logger'

# Third Party Libs
# https://guides.rubyonrails.org/active_support_core_extensions.html#stand-alone-active-support
Expand Down
Loading