diff --git a/Dockerfile b/Dockerfile index 163cfbf1f..d867ed0cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full:0.9.30 +FROM phusion/passenger-full:1.0.9 LABEL maintainer="kgarza@datacite.org" # Set correct environment variables. @@ -10,8 +10,8 @@ RUN usermod -a -G docker_env app # Use baseimage-docker's init process. CMD ["/sbin/my_init"] -# Install Ruby 2.4.4 -RUN bash -lc 'rvm --default use ruby-2.4.4' +# Use Ruby 2.6.5 +RUN bash -lc 'rvm --default use ruby-2.6.5' # Update installed APT packages RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/Gemfile b/Gemfile index 12dda24b4..48825666a 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ group :test do gem "vcr", "~> 3.0.3" gem "codeclimate-test-reporter", "~> 1.0", ">= 1.0.8" gem "factory_bot_rails", "~> 4.8", ">= 4.8.2" - gem "shoulda-matchers", "~> 3.1" + gem "shoulda-matchers", "~> 4.1", ">= 4.1.2" gem "faker", "~> 1.9" gem "database_cleaner" gem "elasticsearch-extensions", "~> 0.0.29" diff --git a/Gemfile.lock b/Gemfile.lock index 6ad57f80b..a26830538 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,25 +10,25 @@ GEM specs: aasm (5.0.6) concurrent-ruby (~> 1.0) - actioncable (5.2.4) - actionpack (= 5.2.4) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4) - actionpack (= 5.2.4) - actionview (= 5.2.4) - activejob (= 5.2.4) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4) - actionview (= 5.2.4) - activesupport (= 5.2.4) - rack (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4) - activesupport (= 5.2.4) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -38,20 +38,20 @@ GEM activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.4) - activesupport (= 5.2.4) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) globalid (>= 0.3.6) - activemodel (5.2.4) - activesupport (= 5.2.4) - activerecord (5.2.4) - activemodel (= 5.2.4) - activesupport (= 5.2.4) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) arel (>= 9.0) - activestorage (5.2.4) - actionpack (= 5.2.4) - activerecord (= 5.2.4) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) marcel (~> 0.3.1) - activesupport (5.2.4) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -67,7 +67,7 @@ GEM audited (4.9.0) activerecord (>= 4.2, < 6.1) aws-eventstream (1.0.3) - aws-partitions (1.255.0) + aws-partitions (1.258.0) aws-sdk-core (3.86.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -76,7 +76,7 @@ GEM aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.59.0) + aws-sdk-s3 (1.60.1) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -109,7 +109,7 @@ GEM latex-decode (~> 0.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bolognese (1.4) + bolognese (1.4.1) activesupport (>= 4.2.5, < 6) benchmark_methods (~> 0.7) bibtex-ruby (~> 4.1) @@ -122,7 +122,7 @@ GEM faraday (= 0.17.0) gender_detector (~> 0.1.2) iso8601 (~> 0.9.1) - json-ld-preloaded (= 3.0.2) + json-ld-preloaded (~> 3.0) jsonlint (~> 0.3.0) loofah (~> 2.0, >= 2.0.3) maremma (>= 4.3, < 5) @@ -188,9 +188,9 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) - ebnf (1.1.3) - rdf (~> 3.0) - sxp (~> 1.0) + ebnf (1.2.0) + rdf (~> 3.1) + sxp (~> 1.1) edtf (3.0.5) activesupport (>= 3.0, < 7.0) elasticsearch (7.1.0) @@ -243,7 +243,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) google-protobuf (3.10.0.rc.1) - graphql (1.9.16) + graphql (1.9.17) graphql-batch (0.4.2) graphql (>= 1.3, < 2) promise.rb (~> 0.7.2) @@ -266,13 +266,17 @@ GEM jaro_winkler (1.5.4) jmespath (1.4.0) json (2.3.0) - json-ld (3.0.2) - multi_json (~> 1.12) - rdf (>= 2.2.8, < 4.0) - json-ld-preloaded (3.0.2) - json-ld (~> 3.0) - multi_json (~> 1.12) - rdf (~> 3.0) + json-canonicalization (0.1.0) + json-ld (3.1.0) + htmlentities (~> 4.3) + json-canonicalization (~> 0.1) + link_header (~> 0.0, >= 0.0.8) + multi_json (~> 1.14) + rack (~> 2.0) + rdf (~> 3.1) + json-ld-preloaded (3.1.0) + json-ld (~> 3.1) + rdf (~> 3.1) jsonapi-renderer (0.2.2) jsonlint (0.3.0) oj (~> 3) @@ -373,27 +377,27 @@ GEM rack (>= 1.0, < 3) rack-utf8_sanitizer (1.6.0) rack (>= 1.0, < 3.0) - rails (5.2.4) - actioncable (= 5.2.4) - actionmailer (= 5.2.4) - actionpack (= 5.2.4) - actionview (= 5.2.4) - activejob (= 5.2.4) - activemodel (= 5.2.4) - activerecord (= 5.2.4) - activestorage (= 5.2.4) - activesupport (= 5.2.4) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) bundler (>= 1.3.0) - railties (= 5.2.4) + railties (= 5.2.4.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4) - actionpack (= 5.2.4) - activesupport (= 5.2.4) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -402,29 +406,29 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rdf (3.0.13) + rdf (3.1.0) hamster (~> 3.0) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (2.2.1) - rdf (>= 2.2, < 4.0) - rdf-rdfa (3.0.1) - haml (~> 5.0) + rdf-aggregate-repo (3.1.0) + rdf (~> 3.1) + rdf-rdfa (3.1.0) + haml (~> 5.1) htmlentities (~> 4.3) - rdf (~> 3.0) - rdf-aggregate-repo (>= 2.2, < 4.0) - rdf-xsd (~> 3.0) + rdf (~> 3.1) + rdf-aggregate-repo (~> 3.1) + rdf-xsd (~> 3.1) rdf-rdfxml (2.2.1) htmlentities (~> 4.3) rdf (>= 2.2, < 4.0) rdf-rdfa (>= 2.2, < 4.0) rdf-xsd (>= 2.2, < 4.0) - rdf-turtle (3.0.6) - ebnf (~> 1.1) - rdf (~> 3.0) - rdf-xsd (3.0.1) - rdf (~> 3.0) + rdf-turtle (3.1.0) + ebnf (~> 1.2) + rdf (~> 3.1) + rdf-xsd (3.1.0) + rdf (~> 3.1) regexp_parser (1.6.0) - request_store (1.4.1) + request_store (1.5.0) rack (>= 1.4) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) @@ -472,14 +476,14 @@ GEM ruby-progressbar (1.10.1) ruby_dep (1.5.0) safe_yaml (1.0.5) - sentry-raven (2.12.3) + sentry-raven (2.13.0) faraday (>= 0.7.6, < 1.0) shoryuken (4.0.3) aws-sdk-core (>= 2) concurrent-ruby thor - shoulda-matchers (3.1.3) - activesupport (>= 4.0.0) + shoulda-matchers (4.1.2) + activesupport (>= 4.2.0) simple_command (0.1.0) simplecov (0.13.0) docile (~> 1.1.0) @@ -507,8 +511,8 @@ GEM regexp_parser (~> 1.3, >= 1.3.0) strip_attributes (1.9.0) activemodel (>= 3.0, < 7.0) - sxp (1.0.2) - rdf (~> 3.0) + sxp (1.1.0) + rdf (~> 3.1) sysrandom (1.0.5) temple (0.8.2) thor (0.20.3) @@ -615,7 +619,7 @@ DEPENDENCIES rubocop-rails (~> 2.4) sentry-raven (~> 2.9) shoryuken (~> 4.0) - shoulda-matchers (~> 3.1) + shoulda-matchers (~> 4.1, >= 4.1.2) simple_command slack-notifier (~> 2.1) spring diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 4c30555f3..e6881e75f 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -237,7 +237,7 @@ def destroy def load_event response = Event.find_by_id(params[:id]) @event = response.results.first - fail ActiveRecord::RecordNotFound unless @event.present? + fail ActiveRecord::RecordNotFound if @event.blank? end def set_include diff --git a/config/initializers/_lograge.rb b/config/initializers/_lograge.rb index 85c72dfbc..eb6693412 100644 --- a/config/initializers/_lograge.rb +++ b/config/initializers/_lograge.rb @@ -8,7 +8,7 @@ config.lograge.logger = LogStashLogger.new(type: :stdout) config.lograge.log_level = ENV["LOG_LEVEL"].to_sym - config.active_job.logger = config.logger + config.active_job.logger = config.lograge.logger config.lograge.ignore_actions = ["HeartbeatController#index", "IndexController#index"] config.lograge.ignore_custom = lambda do |event| @@ -20,7 +20,7 @@ exceptions = %w(controller action format id) { params: event.payload[:params].except(*exceptions), - uid: event.payload[:uid] + uid: event.payload[:uid], } end end