From 5f1e07c5562b24070c849b0727bd1d4cd8efcbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= Date: Tue, 28 May 2024 11:11:14 +0200 Subject: [PATCH] DEV: Update rubocop-discourse to version 3.8.0 (#208) --- Gemfile.lock | 40 +++++++++++++++++----------- app/controllers/adstxt_controller.rb | 2 +- app/models/house_ad_setting.rb | 2 +- package.json | 9 +++---- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 571925e..27fcd63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -13,27 +13,28 @@ GEM tzinfo (~> 2.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.8) concurrent-ruby (1.2.3) connection_pool (2.4.1) drb (2.2.1) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) - minitest (5.22.2) + minitest (5.23.1) mutex_m (0.2.0) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.1.0) ast (~> 2.4.1) racc prettier_print (1.2.1) - racc (1.7.3) + racc (1.8.0) + rack (3.0.11) rainbow (3.1.1) - regexp_parser (2.9.0) + regexp_parser (2.9.2) rexml (3.2.8) strscan (>= 3.0.9) - rubocop (1.61.0) + rubocop (1.64.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -41,25 +42,34 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-discourse (3.7.1) + rubocop-discourse (3.8.0) activesupport (>= 6.1) rubocop (>= 1.59.0) rubocop-capybara (>= 2.0.0) rubocop-factory_bot (>= 2.0.0) + rubocop-rails (>= 2.25.0) rubocop-rspec (>= 2.25.0) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-rspec (2.27.1) + rubocop-rails (2.25.0) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.3) + rubocop (~> 1.40) ruby-progressbar (1.13.0) strscan (3.1.0) syntax_tree (6.2.0) @@ -76,4 +86,4 @@ DEPENDENCIES syntax_tree BUNDLED WITH - 2.5.4 + 2.5.10 diff --git a/app/controllers/adstxt_controller.rb b/app/controllers/adstxt_controller.rb index 3297867..6af52be 100644 --- a/app/controllers/adstxt_controller.rb +++ b/app/controllers/adstxt_controller.rb @@ -6,7 +6,7 @@ class AdstxtController < ::ApplicationController skip_before_action :preload_json, :check_xhr, :redirect_to_login_if_required def index - raise Discourse::NotFound unless SiteSetting.ads_txt.present? + raise Discourse::NotFound if SiteSetting.ads_txt.blank? render plain: SiteSetting.ads_txt end diff --git a/app/models/house_ad_setting.rb b/app/models/house_ad_setting.rb index 4129299..585e377 100644 --- a/app/models/house_ad_setting.rb +++ b/app/models/house_ad_setting.rb @@ -48,7 +48,7 @@ module ::AdPlugin end def self.update(setting_name, value) - raise Discourse::NotFound unless DEFAULTS.keys.include?(setting_name.to_sym) + raise Discourse::NotFound if DEFAULTS.keys.exclude?(setting_name.to_sym) ad_names = value&.split("|") || [] diff --git a/package.json b/package.json index 8ccf74e..b032ece 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,9 @@ { - "name": "discourse-adplugin", "private": true, "devDependencies": { - "@discourse/lint-configs": "^1.3.5", - "ember-template-lint": "^5.13.0", - "eslint": "^8.56.0", - "prettier": "^2.8.8" + "@discourse/lint-configs": "1.3.9", + "ember-template-lint": "6.0.0", + "eslint": "8.57.0", + "prettier": "2.8.8" } }