Skip to content

Periodic maintenance 2025-02 #18

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.

Sign up for GitHub

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

Merged
moseshll merged 10 commits into from
Feb 27, 2025
Merged

Periodic maintenance 2025-02 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7870dfa
Get rid of deprecated docker compose version tag
moseshll Feb 3, 2025
b102663
Update all gem dependencies to latest
moseshll Feb 3, 2025
2e2eafa
Address Ruby 3.3 conventions from updated standardrb
moseshll Feb 3, 2025
49dfbee
rackup-puma musical chairs
moseshll Feb 3, 2025
19ee8b7
Remove -o flag from Dockerfile puma command; set docker compose comma…
moseshll Feb 3, 2025
4d7c5ae
Restore rackup as default command for web service
moseshll Feb 3, 2025
dafe1e5
Merge branch 'main' into periodic_maint
moseshll Feb 25, 2025
6089711
Merge branch 'main' into periodic_maint
moseshll Feb 25, 2025
cce9068
Merge branch 'main' into periodic_maint
moseshll Feb 25, 2025
c0f95e4
Merge branch 'main' into periodic_maint
moseshll Feb 25, 2025
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
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ gem "climate_control"
gem "json"
gem "mysql2"
gem "puma"
gem "rackup"
gem "sequel"
gem "sinatra"
gem "sinatra-contrib"
Expand Down
106 changes: 54 additions & 52 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,114 +2,115 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
base64 (0.1.1)
bigdecimal (3.1.4)
base64 (0.2.0)
bigdecimal (3.1.9)
canister (0.9.2)
climate_control (1.2.0)
coderay (1.1.3)
diff-lcs (1.5.0)
docile (1.4.0)
json (2.6.3)
language_server-protocol (3.17.0.3)
diff-lcs (1.5.1)
docile (1.4.1)
json (2.9.1)
language_server-protocol (3.17.0.4)
lint_roller (1.1.0)
logger (1.6.6)
method_source (1.0.0)
method_source (1.1.0)
multi_json (1.15.0)
mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
mysql2 (0.5.5)
mysql2 (0.5.6)
nio4r (2.7.4)
parallel (1.23.0)
parser (3.2.2.4)
parallel (1.26.3)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
pry (0.14.2)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
puma (6.4.3)
puma (6.6.0)
nio4r (~> 2.0)
racc (1.7.1)
racc (1.8.1)
rack (3.1.10)
rack-protection (4.1.0)
rack-protection (4.1.1)
base64 (>= 0.1.0)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
rainbow (3.1.1)
regexp_parser (2.8.2)
regexp_parser (2.10.0)
rexml (3.3.9)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.56.4)
base64 (~> 0.1.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.2)
rubocop (1.70.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
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.28.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.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
parser (>= 3.3.1.0)
rubocop-performance (1.23.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sequel (5.73.0)
sequel (5.89.0)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov-html (0.13.1)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
sinatra (4.1.0)
sinatra (4.1.1)
logger (>= 1.6.0)
mustermann (~> 3.0)
rack (>= 3.0.0, < 4)
rack-protection (= 4.1.0)
rack-protection (= 4.1.1)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
sinatra-contrib (4.1.0)
sinatra-contrib (4.1.1)
multi_json (>= 0.0.2)
mustermann (~> 3.0)
rack-protection (= 4.1.0)
sinatra (= 4.1.0)
rack-protection (= 4.1.1)
sinatra (= 4.1.1)
tilt (~> 2.0)
standard (1.31.2)
standard (1.44.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.56.4)
rubocop (~> 1.70.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.2)
standard-performance (~> 1.6)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
standard-performance (1.2.1)
standard-performance (1.6.0)
lint_roller (~> 1.1)
rubocop-performance (~> 1.19.1)
rubocop-performance (~> 1.23.0)
tilt (2.6.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)

PLATFORMS
aarch64-linux
Expand All @@ -123,6 +124,7 @@ DEPENDENCIES
pry
puma
rack-test
rackup
rspec
sequel
simplecov
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
version: '3'

x-condition-healthy: &healthy
condition: service_healthy

Expand Down
2 changes: 1 addition & 1 deletion lib/rights_api/models/access_statement_map.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def self.default_key
# @return [Sequel::SQL::Expression]
def self.query_for_field(field:)
return Sequel.join [:a_attr, :a_access_profile], "." if field.to_sym == :attr_access_id
super field: field
super
end

def to_h
Expand Down
2 changes: 1 addition & 1 deletion lib/rights_api/models/rights_current.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def self.query_for_field(field:)
if field.to_sym == :htid
return Sequel.join [qualify(field: :namespace), qualify(field: :id)], "."
end
super field: field
super
end

# rights_current and rights_log should order by timestamp
Expand Down
2 changes: 1 addition & 1 deletion lib/rights_api/models/rights_log.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def self.query_for_field(field:)
if field.to_sym == :htid
return Sequel.join [qualify(field: :namespace), qualify(field: :id)], "."
end
super field: field
super
end

# rights_current and rights_log should order by timestamp
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/support_table_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
it "has valid #{table} data" do
response = parse_json(last_response.body)
response[:data].each do |row|
validator = "validate_#{table}_row".to_sym
validator = :"validate_#{table}_row"
send validator, row
end
end
Expand Down