Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rubocop from 1.57.2 to 1.58.0 #3299

Merged
merged 5 commits into from
Dec 14, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ New entries in this file should aim to provide a meaningful amount of informatio

## [Unreleased]

### Chores
- Bump rubocop from 1.57.2 to 1.58.0 [PR#3299](https://github.com/ualbertalib/jupiter/pull/3299)

## [2.6.1] - 2023-10-17

### Added
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ group :development, :test do
gem 'pry-byebug'
gem 'pry-rails'

gem 'rubocop', '~> 1.57.2', require: false
gem 'rubocop', '~> 1.58.0', require: false
gem 'rubocop-minitest', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ GEM
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.6.3)
json (2.7.0)
json-schema (4.1.1)
addressable (>= 2.8)
jwt (2.2.3)
Expand Down Expand Up @@ -479,15 +479,15 @@ GEM
rsolr (2.5.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
rubocop (1.57.2)
rubocop (1.58.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
Expand Down Expand Up @@ -679,7 +679,7 @@ DEPENDENCIES
redis (~> 4.8)
rollbar
rsolr
rubocop (~> 1.57.2)
rubocop (~> 1.58.0)
rubocop-minitest
rubocop-performance
rubocop-rails
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/concerns/draft_actions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,19 @@ def item_class
end

def describe_step_name
"describe_#{item_class.model_name.singular}".to_sym
:"describe_#{item_class.model_name.singular}"
end

def review_step_name
"review_and_deposit_#{item_class.model_name.singular}".to_sym
:"review_and_deposit_#{item_class.model_name.singular}"
end

def draft_param
draft_class.model_name.singular.to_sym
end

def draft_id_param
"#{item_class.model_name.singular}_id".to_sym
:"#{item_class.model_name.singular}_id"
end

def set_draft
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/concerns/draft_files_actions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def item_class
end

def draft_id_param
"#{item_class.model_name.singular}_id".to_sym
:"#{item_class.model_name.singular}_id"
end

def set_draft
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/search_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class SearchController < ApplicationController
skip_after_action :verify_authorized

def index
models = case (params[:tab] || DEFAULT_TAB)
models = case params[:tab] || DEFAULT_TAB
when 'item'
[Item, Thesis]
when 'collection'
Expand Down
2 changes: 1 addition & 1 deletion app/models/item.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def item_type_with_status_code
publication_status_code = ControlledVocabulary.era.publication_status.from_uri(publication_status.first)
# Next line of code means that 'article_submitted' exists, but 'article_draft' doesn't ("There can be only one!")
publication_status_code = :submitted if publication_status_code == :draft
"#{item_type_code}_#{publication_status_code}".to_sym
:"#{item_type_code}_#{publication_status_code}"
rescue ArgumentError
nil
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ def limit_value
end

# Kaminari integration
define_method Kaminari.config.page_method_name, (proc { |num|
define_method Kaminari.config.page_method_name, proc { |num|
limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
})
}

def count
@count_cache ||= super
Expand Down
Loading