From dac7594aeb5e9fe89a44f096e606f50f5cf113b1 Mon Sep 17 00:00:00 2001 From: Alex Turchyn Date: Wed, 5 Jul 2023 21:42:41 +0300 Subject: [PATCH] do not require optional gems --- Gemfile | 15 +++++++-------- Gemfile.lock | 4 ---- config/initializers/rollbar.rb | 12 +++++++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 739b08c5..5edacf85 100644 --- a/Gemfile +++ b/Gemfile @@ -4,29 +4,28 @@ source 'https://rubygems.org' ruby '3.2.2' -gem 'audited' -gem 'aws-sdk-s3' -gem 'azure-storage-blob' +gem 'aws-sdk-s3', require: false +gem 'azure-storage-blob', require: false gem 'bootsnap', require: false gem 'devise' gem 'dotenv', require: false gem 'faraday' -gem 'google-cloud-storage' +gem 'google-cloud-storage', require: false gem 'hexapdf' gem 'image_processing' gem 'lograge' -gem 'mysql2' +gem 'mysql2', require: false gem 'oj' gem 'pagy' -gem 'pg' +gem 'pg', require: false gem 'premailer-rails' gem 'puma' gem 'rails' gem 'rails-i18n' -gem 'rollbar' +gem 'rollbar', require: ENV.key?('ROLLBAR_ACCESS_TOKEN') gem 'ruby-vips' gem 'shakapacker' -gem 'sqlite3' +gem 'sqlite3', require: false gem 'strip_attributes' gem 'turbo-rails' gem 'tzinfo-data' diff --git a/Gemfile.lock b/Gemfile.lock index 4ae192f4..a0f7cb73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,9 +72,6 @@ GEM activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) ast (2.4.2) - audited (5.3.3) - activerecord (>= 5.0, < 7.1) - request_store (~> 1.2) aws-eventstream (1.2.0) aws-partitions (1.781.0) aws-sdk-core (3.175.0) @@ -489,7 +486,6 @@ PLATFORMS DEPENDENCIES annotate - audited aws-sdk-s3 azure-storage-blob better_html diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb index ded49d19..d3cf5e3b 100644 --- a/config/initializers/rollbar.rb +++ b/config/initializers/rollbar.rb @@ -1,11 +1,13 @@ # frozen_string_literal: true -Rollbar.configure do |config| - config.access_token = ENV.fetch('ROLLBAR_ACCESS_TOKEN', nil) +if defined?(Rollbar) + Rollbar.configure do |config| + config.access_token = ENV.fetch('ROLLBAR_ACCESS_TOKEN', nil) - config.enabled = !config.access_token.nil? + config.enabled = true - config.exception_level_filters['ActionController::RoutingError'] = 'ignore' + config.exception_level_filters['ActionController::RoutingError'] = 'ignore' - config.environment = ENV['ROLLBAR_ENV'].presence || Rails.env + config.environment = ENV['ROLLBAR_ENV'].presence || Rails.env + end end