Skip to content
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
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ jobs:

runs-on: ubuntu-latest
steps:
- name: "Install Dependent libraries"
run: |
sudo apt-get update
sudo apt-get -yqq install libpq-dev libvips libvips-dev
- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libpq-dev libvips libvips-dev
version: 1.0

- name: "Checkout code"
uses: actions/checkout@v1

- name: "Install Ruby 3.4.4"
- name: "Install Ruby"
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 3.4.4
ruby-version: 3.4.7

- name: "Run Rubocop"
env:
Expand Down Expand Up @@ -61,19 +61,19 @@ jobs:
options: --entrypoint redis-server

steps:
- name: "Install Dependent libraries"
run: |
sudo apt-get update
sudo apt-get -yqq install libpq-dev libvips libvips-dev
- uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libpq-dev libvips libvips-dev
version: 1.0

- name: "Checkout code"
uses: actions/checkout@v1

- name: "Install Ruby 3.4.4"
- name: "Install Ruby"
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
ruby-version: 3.4.4
ruby-version: 3.4.7

- name: "Run API specs"
env:
Expand Down
11 changes: 11 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,11 @@ Rails/EnvLocal:
Rails/ExpandedDateRange:
Enabled: true

Rails/Exit:
Exclude:
- spec/spec_helper.rb
- spec/rails_helper.rb

Rails/FilePath:
Enabled: false

Expand Down Expand Up @@ -489,6 +494,12 @@ Rails/MultipleRoutePaths:
Rails/NegateInclude:
Enabled: false

Rails/Output:
Exclude:
- "lib/tasks/**/*.rake"
- spec/rails_helper.rb
- spec/spec_helper.rb

# That's what html_safe is for.
Rails/OutputSafety:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.4
3.4.7
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN --mount=type=secret,id=maxmind_account_id \
GEOIPUPDATE_LICENSE_KEY_FILE=/run/secrets/maxmind_license_key \
/usr/bin/geoipupdate

FROM ruby:3.4.4-bookworm
FROM ruby:3.4.7-bookworm

ENV DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -79,4 +79,4 @@ COPY --from=maxmind /usr/share/GeoIP /usr/share/GeoIP

EXPOSE 8080

CMD ["bin/puma", "-C", "config/puma.rb"]
CMD ["bin/pitchfork", "-c", "config/pitchfork.rb"]
70 changes: 33 additions & 37 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@

source "https://rubygems.org"

ruby "3.4.4"
ruby "3.4.7"

# stdlib
gem "csv", "~> 3.3.5"
gem "fiddle", "~> 1.1.8"
gem "ostruct", "~> 0.6.2", require: false
gem "set", "~> 1.1.2"
gem "sorted_set", "~> 1.0.3"
gem "stringio", "~> 3.1.7"
gem "stringio", "~> 3.1.8"
gem "syslog", "~> 0.3.0", require: false

gem "activesupport", "~> 7.2"
gem "activerecord", "~> 7.2"

# Rails / database
gem "rails", "7.2.2.2"
gem "rails", "7.2.3"
gem "pg", "~> 1.6.2"
gem "activerecord-cte", "~> 0.4.0"
gem "active_record_distinct_on", "1.9.0"
gem "after_commit_everywhere", "~> 1.6.0"
gem "closure_tree", "~> 9.1.1"
gem "async", "~> 2.34.0"
gem "closure_tree", "~> 9.2.0"
gem "frozen_record", "~> 0.27.1"
gem "pghero", "~> 3.7.0"
gem "pg_query", "~> 6.1.0"
Expand All @@ -32,16 +33,16 @@ gem "scenic", "~> 1.9.0"
gem "store_model", "~> 4.3.0"

# Redis / Jobs
gem "good_job", "~> 4.12.0"
gem "good_job", "~> 4.12.1"
gem "redis", "~> 5.4.1"
gem "redis-objects", ">= 2.0.0.beta"
gem "job-iteration", "~> 1.11.0"

# GraphQL
gem "graphql", "2.5.11"
gem "graphql-batch", "~> 0.6.0"
gem "graphql", "2.5.14"
gem "graphql-batch", "~> 0.6.1"
gem "graphql-client", "~> 0.26.0"
gem "graphql-fragment_cache", "~> 1.22.0"
gem "graphql-fragment_cache", "~> 1.22.2"
gem "search_object_graphql", "~> 1.0.5", require: %w[search_object search_object/plugin/graphql]

# dry-rb
Expand All @@ -63,7 +64,7 @@ gem "dry-validation", "~> 1.11.1"

# Keycloak / Auth
gem "bcrypt", "~> 3.1.20"
gem "keycloak-admin", "~> 1.1.3"
gem "keycloak-admin", "~> 1.1.4"
gem "keycloak_rack", "1.2.0"

# Metadata Parsing
Expand All @@ -74,52 +75,49 @@ gem "niso-jats", github: "scryptmouse/niso-jats", require: false

# Misc
gem "absolute_time", "~> 1.0.0"
gem "acts_as_list", "~> 1.2.4"
gem "acts_as_list", "~> 1.2.6"
gem "addressable", ">= 2.8.0"
gem "ahoy_matey", "~> 5.4.0"
gem "ahoy_matey", "~> 5.4.1"
gem "anystyle", "~> 1.6.0"
gem "anyway_config", "~> 2.7.2"
gem "autotuner", "~> 1.0.2"
gem "autotuner", "~> 1.1.0"
gem "down", "~> 5.4.2"
gem "faraday", "~> 2.13.4"
gem "faraday-follow_redirects", "~> 0.3.0"
gem "faraday", "~> 2.14.0"
gem "faraday-follow_redirects", "~> 0.4.0"
gem "faraday-retry", "~> 2.3.2"
gem "ffi", "~> 1.17.2"
gem "fugit", "~> 1.11.1"
gem "fugit", "~> 1.12.1"
gem "geocoder", "~> 1.8.0"
gem "groupdate", "~> 6.7.0"
gem "hashids", "~> 1.0.6"
gem "htmlbeautifier", "~> 1.4.3"
gem "iso-639", "~> 0.3.8"
gem "jbuilder", "~> 2.13.0"
gem "jbuilder", "~> 2.14.1"
gem "json-ld", "~> 3.3.2"
gem "json-schema", "~> 2.8.1"
gem "json_schemer", "~> 0.2.18"
gem "json_schemer", "~> 2.4.0"
gem "jwt", "~> 2.8.2"
gem "kramdown", "~> 2.5.1"
gem "link-header-parser", "~> 7.0.1"
gem "liquid", "~> 5.8.1"
gem "liquid", "~> 5.10.0"
gem "maxminddb", "~> 0.1.22"
gem "namae", "~> 1.2.0"
gem "naught", "~> 1.1.0"
gem "nokogiri", "~> 1.18.9"
gem "oai", "~> 1.3.0"
gem "oj", "3.16.11"
gem "oj", "3.16.12"
gem "openid_connect", "~> 2.3.0"
gem "ox", "~> 2.14.18"
gem "pundit", "~> 2.5.0"
gem "redcarpet", "~> 3.6.0"
gem "reverse_markdown", "~> 3.0.0"
gem "ruby-limiter", "~> 2.3.0"
gem "rufus-scheduler", "~> 3.9.2"
gem "sanitize", "~> 7.0.0"
gem "semantic", "~> 1.6.1"
gem "shale", "~> 1.2.1"
gem "sinatra", "~> 4.1.1", require: "sinatra/base"
gem "sinatra-contrib", "~> 4.1.1", require: false
gem "sinatra", "~> 4.2.1", require: "sinatra/base"
gem "sinatra-contrib", "~> 4.2.1", require: false
gem "statesman", "~> 12.1.0"
gem "strip_attributes", "~> 2.0.0"
gem "sucker_punch", "~> 3.2.0"
gem "tomlib", "~> 0.7.2"
gem "validate_url", "~> 1.0.15"
gem "with_advisory_lock", "~> 7.0.2"
Expand All @@ -128,31 +126,31 @@ gem "with_advisory_lock", "~> 7.0.2"
gem "aws-sdk-s3", "~> 1.196.1"
gem "content_disposition", "~> 1.0.0"
gem "image_processing", "~> 1.14.0"
gem "marcel", "~> 1.0.4"
gem "shrine", "~> 3.6.0"
gem "marcel", "~> 1.1.0"
gem "shrine", "~> 3.6.0", require: %w[shrine shrine/storage/s3 shrine/storage/memory shrine/storage/url]
gem "shrine-tus", "~> 2.1.1"
gem "shrine-url", "~> 2.4.1"
gem "mediainfo", "~> 1.5.0"
gem "tus-server", "~> 2.3.0"
gem "tus-server", "~> 2.3.0", require: %w[tus/server tus/storage/s3]
gem "zaru", "~> 1.0.0"

# Servers / Rack
gem "puma", "~> 6.6.0"
gem "puma-rufus-scheduler", "~> 0.1.0"
gem "puma_worker_killer", "~> 1.0.0", require: false
gem "rack", "~> 3.1.16"
gem "pitchfork", "~> 0.18.1"
gem "rack", "~> 3.2.4"
gem "rack-cors", "~> 3.0.0"

# Debugging / system-level things
gem "bootsnap", ">= 1.18.6", require: false
gem "bootsnap", ">= 1.19.0", require: false
gem "pry-rails", "~> 0.3.11"
gem "pry", "~> 0.15.2"
gem "ruby-prof", "~> 1.7.2", require: false
gem "stackprof", "~> 0.2.25", require: false

group :development, :test do
gem "factory_bot_rails", "~> 6.5.0"
gem "faker", "~> 3.5.2"
gem "rspec", "~> 3.13.1"
gem "rspec-rails", "~> 8.0.1"
gem "rspec", "~> 3.13.2"
gem "rspec-rails", "~> 8.0.2"
gem "yard", "~> 0.9.34"
gem "yard-activerecord", "~> 0.0.16"
gem "yard-activesupport-concern", "~> 0.0.1"
Expand All @@ -165,8 +163,6 @@ group :development do
gem "rubocop-rails", "2.32.0", require: false
gem "rubocop-rspec", "3.6.0", require: false
gem "rubocop-rspec_rails", "2.31.0", require: false
gem "ruby-prof", "~> 1.7.2", require: false
gem "stackprof", "~> 0.2.25", require: false
end

group :test do
Expand All @@ -178,5 +174,5 @@ group :test do
gem "simplecov", "~> 0.22.0", require: false
gem "test-prof", "~> 1.4.4"
gem "timecop", "~> 0.9.8"
gem "webmock", "3.25.1"
gem "webmock", "3.26.1"
end
Loading
Loading