Skip to content

Commit

Permalink
linter suggests
Browse files Browse the repository at this point in the history
  • Loading branch information
srappel committed Aug 23, 2023
1 parent 769664a commit 549002c
Show file tree
Hide file tree
Showing 43 changed files with 339 additions and 339 deletions.
18 changes: 9 additions & 9 deletions Capfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# frozen_string_literal: true

# Load DSL and set up stages
require 'capistrano/setup'
require "capistrano/setup"

# Include default deployment tasks
require 'capistrano/deploy'
require "capistrano/deploy"

# Load the SCM plugin appropriate to your project:
#
Expand All @@ -14,7 +14,7 @@ require 'capistrano/deploy'
# require "capistrano/scm/svn"
# install_plugin Capistrano::SCM::Svn
# or
require 'capistrano/scm/git'
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git

# Include tasks from other gems included in your Gemfile
Expand All @@ -31,11 +31,11 @@ install_plugin Capistrano::SCM::Git
# require "capistrano/rvm"
# require "capistrano/rbenv"
# require "capistrano/chruby"
require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'capistrano/passenger'
require 'whenever/capistrano'
require "capistrano/bundler"
require "capistrano/rails/assets"
require "capistrano/rails/migrations"
require "capistrano/passenger"
require "whenever/capistrano"

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
104 changes: 52 additions & 52 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.1'
ruby "3.2.1"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '~> 7.0.4', '>= 7.0.4.2'
gem "rails", "~> 7.0.4", ">= 7.0.4.2"

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'sprockets-rails'
gem "sprockets-rails"

# Use sqlite3 as the dev and test environment database
gem 'sqlite3', '~> 1.4'
gem "sqlite3", "~> 1.4"

# Use the Puma web server [https://github.com/puma/puma]
gem 'puma', '~> 6.2'
gem "puma", "~> 6.2"

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem 'importmap-rails'
gem "importmap-rails"

# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
gem 'turbo-rails'
gem "turbo-rails"

# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
gem 'stimulus-rails'
gem "stimulus-rails"

# Build JSON APIs with ease [https://github.com/rails/jbuilder]
gem 'jbuilder'
gem "jbuilder"

# Use Redis adapter to run Action Cable in production
gem 'redis', '~> 5.0'
gem "redis", "~> 5.0"

# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
# gem "kredis"
Expand All @@ -39,10 +39,10 @@ gem 'redis', '~> 5.0'
# gem "bcrypt", "~> 3.1.7"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', require: false
gem "bootsnap", require: false

# Use Sass to process CSS
# gem "sassc-rails"
Expand All @@ -51,24 +51,24 @@ gem 'bootsnap', require: false
# gem "image_processing", "~> 1.2"

group :production do
gem 'mysql2'
gem 'passenger', '>= 5.0.25', require: 'phusion_passenger/rack_handler'
gem 'sidekiq', '~> 7.0'
gem "mysql2"
gem "passenger", ">= 5.0.25", require: "phusion_passenger/rack_handler"
gem "sidekiq", "~> 7.0"
end

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem 'debug', platforms: %i[mri mingw x64_mingw]
gem "debug", platforms: %i[mri mingw x64_mingw]
end

group :development do
gem 'capistrano', '~> 3.17', require: false
gem 'capistrano-bundler', '~> 2.1.0'
gem 'capistrano-passenger', '~> 0.2'
gem 'capistrano-rails', '~> 1.6', require: false
gem "capistrano", "~> 3.17", require: false
gem "capistrano-bundler", "~> 2.1.0"
gem "capistrano-passenger", "~> 0.2"
gem "capistrano-rails", "~> 1.6", require: false

# Use console on exceptions pages [https://github.com/rails/web-console]
gem 'web-console'
gem "web-console"

# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
# gem "rack-mini-profiler"
Expand All @@ -79,54 +79,54 @@ end

group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'capybara-screenshot'
gem 'selenium-webdriver'
gem 'simplecov', require: false
gem 'webdrivers'
gem "capybara"
gem "capybara-screenshot"
gem "selenium-webdriver"
gem "simplecov", require: false
gem "webdrivers"
end
gem 'blacklight', '~> 7.0'
gem "blacklight", "~> 7.0"

# BL Advanced Search / Pinned to EWL bug-fix
# See: https://github.com/projectblacklight/blacklight_advanced_search/issues/127
gem 'blacklight_advanced_search', git: 'https://github.com/ewlarson/blacklight_advanced_search.git',
branch: 'bl7-fix-gentle-hands'
gem 'geoblacklight', '~> 4.0'
gem 'geoblacklight_sidecar_images', '~> 1.0'
gem 'mini_magick', '~> 4.0'
gem 'sprockets', '< 4.0'
gem "blacklight_advanced_search", git: "https://github.com/ewlarson/blacklight_advanced_search.git",
branch: "bl7-fix-gentle-hands"
gem "geoblacklight", "~> 4.0"
gem "geoblacklight_sidecar_images", "~> 1.0"
gem "mini_magick", "~> 4.0"
gem "sprockets", "< 4.0"

group :development, :test do
gem 'solr_wrapper', '>= 0.3'
gem "solr_wrapper", ">= 0.3"
end
gem 'bootstrap', '~> 4.0'
gem 'devise'
gem 'devise-guests', '~> 0.8'
gem 'jquery-rails'
gem 'rsolr', '>= 1.0', '< 3'
gem 'sassc-rails', '~> 2.1'
gem 'twitter-typeahead-rails', '0.11.1'
gem "bootstrap", "~> 4.0"
gem "devise"
gem "devise-guests", "~> 0.8"
gem "jquery-rails"
gem "rsolr", ">= 1.0", "< 3"
gem "sassc-rails", "~> 2.1"
gem "twitter-typeahead-rails", "0.11.1"

# ENV
gem 'dotenv-rails', '~> 2.8'
gem "dotenv-rails", "~> 2.8"

# Standard
gem 'standardrb'
gem "standardrb"

# Cron Tasks
gem 'sitemap_generator', '~> 6.3'
gem 'whenever', '~> 1.0.0'
gem "sitemap_generator", "~> 6.3"
gem "whenever", "~> 1.0.0"

# Admin View
gem 'awesome_print'
gem 'haml'
gem "awesome_print"
gem "haml"

# GeoCombine via the UWM Libraries Fork
gem 'geo_combine', git: 'https://github.com/UWM-Libraries/GeoCombine.git', branch: 'main'
gem "geo_combine", git: "https://github.com/UWM-Libraries/GeoCombine.git", branch: "main"

# ED SSH Key support
gem 'bcrypt_pbkdf', '~> 1.0', '< 2.0'
gem 'ed25519', '>=1.2', '< 2.0'
gem "bcrypt_pbkdf", "~> 1.0", "< 2.0"
gem "ed25519", ">=1.2", "< 2.0"

# ExceptionNotification
gem 'exception_notification', '~> 4.5'
gem "exception_notification", "~> 4.5"
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require_relative 'config/application'
require_relative "config/application"

Rails.application.load_tasks
26 changes: 13 additions & 13 deletions app/components/blacklight/search_bar_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ class SearchBarComponent < Blacklight::Component
def initialize(
url:, params:,
advanced_search_url: nil, presenter: nil,
classes: ['search-query-form'], prefix: nil,
method: 'GET', q: nil, query_param: :q,
classes: ["search-query-form"], prefix: nil,
method: "GET", q: nil, query_param: :q,
search_field: nil, search_fields: nil, autocomplete_path: nil,
autofocus: nil, i18n: { scope: 'blacklight.search.form' },
autofocus: nil, i18n: {scope: "blacklight.search.form"},
form_options: {}
)
@url = url
Expand All @@ -36,8 +36,8 @@ def initialize(

return if presenter.nil?

Deprecation.warn(self, 'SearchBarComponent no longer uses a SearchBarPresenter, the presenter: param will be removed in 8.0. ' \
'Set advanced_search.enabled, autocomplete_enabled, and enable_search_bar_autofocus on BlacklightConfiguration')
Deprecation.warn(self, "SearchBarComponent no longer uses a SearchBarPresenter, the presenter: param will be removed in 8.0. " \
"Set advanced_search.enabled, autocomplete_enabled, and enable_search_bar_autofocus on BlacklightConfiguration")
end
# rubocop:enable Metrics/ParameterLists

Expand All @@ -51,7 +51,7 @@ def autofocus
if @autofocus.nil?
blacklight_config.enable_search_bar_autofocus &&
controller.is_a?(Blacklight::Catalog) &&
controller.action_name == 'index' &&
controller.action_name == "index" &&
!controller.has_search_parameters?
else
@autofocus
Expand All @@ -60,10 +60,10 @@ def autofocus

def search_fields
@search_fields ||= blacklight_config.search_fields.values
.select { |field_def| helpers.should_render_field?(field_def) }
.collect do |field_def|
.select { |field_def| helpers.should_render_field?(field_def) }
.collect do |field_def|
[helpers.label_for_search_field(field_def.key),
field_def.key]
field_def.key]
end
end

Expand All @@ -77,14 +77,14 @@ def blacklight_config
helpers.blacklight_config
end

def render_hash_as_hidden_fields(*args)
def render_hash_as_hidden_fields(*)
Deprecation.silence(Blacklight::HashAsHiddenFieldsHelperBehavior) do
helpers.render_hash_as_hidden_fields(*args)
helpers.render_hash_as_hidden_fields(*)
end
end

def scoped_t(key, **args)
t(key, default: t(key, scope: 'blacklight.search.form'), **@i18n, **args)
def scoped_t(key, **)
t(key, default: t(key, scope: "blacklight.search.form"), **@i18n, **)
end
end
end
Loading

0 comments on commit 549002c

Please sign in to comment.