Skip to content

Commit 0d244ec

Browse files
author
Shana Moore
committed
Merge branch 'main' into update-hyrax-to-flexible_double_combo
2 parents fc7d9a9 + af9b198 commit 0d244ec

File tree

84 files changed

+901
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+901
-921
lines changed

‎.irbrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# frozen_string_literal: true
2+
3+
IRB.conf[:USE_AUTOCOMPLETE] = false
4+
IRB.conf[:SAVE_HISTORY] = false

‎.rubocop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,24 @@ inherit_from:
55
inherit_gem:
66
bixby: bixby_default.yml
77

8+
Layout/IndentationWidth:
9+
Width: 2
10+
811
AllCops:
912
NewCops: disable
1013
TargetRubyVersion: 3.2.2
1114
DisplayCopNames: true
15+
SuggestExtensions: false
1216
Exclude:
17+
- 'gems/**/*'
1318
- 'db/**/*'
1419
- 'script/**/*'
1520
- 'spec/test_app_templates/**/*'
1621
- 'vendor/**/*'
1722
- 'lib/hyrax/specs/**/*'
1823
- 'bin/graph'
1924
- 'bin/import_from_purl'
25+
- 'spec/features/**/*'
2026

2127
Lint/ImplicitStringConcatenation:
2228
Exclude:
@@ -27,7 +33,7 @@ Rails/Output:
2733
- 'lib/generators/**/*'
2834

2935
Metrics/BlockLength:
30-
IgnoredMethods: ['included']
36+
AllowedMethods: ['included']
3137
Exclude:
3238
- 'hyrax.gemspec'
3339
- 'app/models/concerns/hyrax/content_block_behavior.rb'

‎.rubocop_fixme.yml

Lines changed: 37 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -1,201 +1,48 @@
1-
Security/MarshalLoad:
2-
Exclude:
3-
- 'app/models/concerns/hyrax/user.rb'
4-
5-
Metrics/ClassLength:
6-
Exclude:
7-
- 'app/controllers/hyrax/dashboard/collections_controller.rb'
8-
- 'app/controllers/hyrax/admin/admin_sets_controller.rb'
9-
- 'app/controllers/hyrax/batch_edits_controller.rb'
10-
- 'app/controllers/hyrax/downloads_controller.rb'
11-
- 'app/controllers/hyrax/file_sets_controller.rb'
12-
- 'app/forms/hyrax/forms/permission_template_form.rb'
13-
- 'app/presenters/hyrax/work_show_presenter.rb'
14-
- 'app/presenters/hyrax/collection_presenter.rb'
15-
- 'app/services/hyrax/user_stat_importer.rb'
16-
- 'lib/generators/hyrax/templates/catalog_controller.rb'
17-
- 'lib/generators/hyrax/install_generator.rb'
18-
- 'lib/hyrax/configuration.rb'
19-
20-
Metrics/ParameterLists:
21-
Exclude:
22-
- 'app/jobs/batch_create_job.rb'
23-
24-
Metrics/ModuleLength:
25-
Exclude:
26-
- 'app/controllers/concerns/hyrax/works_controller_behavior.rb'
27-
- 'app/helpers/hyrax/hyrax_helper_behavior.rb'
28-
- 'app/models/concerns/hyrax/ability.rb'
29-
- 'app/services/hyrax/workflow/permission_query.rb'
30-
- 'spec/services/hyrax/workflow/permission_query_spec.rb'
31-
# TODO: extract CollectionAccessControls or something, so we don't have to skip this check?
32-
- 'app/models/concerns/hyrax/collection_behavior.rb'
33-
34-
RSpec/NamedSubject:
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config --exclude-limit 0`
3+
# on 2024-08-15 14:53:42 UTC using RuboCop version 1.61.0.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 3
10+
# This cop supports safe autocorrection (--autocorrect).
11+
# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
12+
Layout/ExtraSpacing:
3513
Enabled: false
3614

37-
RSpec/ExampleLength:
38-
Max: 9
39-
Exclude:
40-
- 'spec/actors/hyrax/actors/file_set_actor_spec.rb'
41-
- 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
42-
- 'spec/controllers/hyrax/api/items_controller_spec.rb'
43-
- 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
44-
- 'spec/controllers/hyrax/batch_uploads_controller_spec.rb'
45-
- 'spec/controllers/hyrax/file_sets_controller_spec.rb'
46-
- 'spec/controllers/hyrax/generic_works_controller_spec.rb'
47-
- 'spec/controllers/hyrax/my/highlights_controller_spec.rb'
48-
- 'spec/controllers/hyrax/transfers_controller_spec.rb'
49-
- 'spec/forms/hyrax/forms/collection_form_spec.rb'
50-
- 'spec/forms/hyrax/forms/batch_edit_form_spec.rb'
51-
- 'spec/forms/hyrax/forms/batch_upload_form_spec.rb'
52-
- 'spec/forms/hyrax/forms/file_set_edit_form_spec.rb'
53-
- 'spec/features/**/*'
54-
- 'spec/helpers/hyrax/charts_helper_spec.rb'
55-
- 'spec/helpers/dashboard_helper_spec.rb'
56-
- 'spec/helpers/hyrax_helper_spec.rb'
57-
- 'spec/indexers/hyrax/file_set_indexer_spec.rb'
58-
- 'spec/javascripts/jasmine_spec.rb'
59-
- 'spec/jobs/file_set_attached_event_job_spec.rb'
60-
- 'spec/jobs/batch_create_job_spec.rb'
61-
- 'spec/jobs/create_work_job_spec.rb'
62-
- 'spec/jobs/content_update_event_job_spec.rb'
63-
- 'spec/jobs/content_restored_version_event_job_spec.rb'
64-
- 'spec/jobs/content_new_version_event_job_spec.rb'
65-
- 'spec/jobs/content_depositor_change_event_job_spec.rb'
66-
- 'spec/jobs/change_depositor_event_job_spec.rb'
67-
- 'spec/jobs/content_deposit_event_job_spec.rb'
68-
- 'spec/jobs/content_delete_event_job_spec.rb'
69-
- 'spec/jobs/ingest_file_job_spec.rb'
70-
- 'spec/lib/hyrax/arkivo/actor_spec.rb'
71-
- 'spec/lib/hyrax/resource_sync/capability_list_writer_spec.rb'
72-
- 'spec/models/checksum_audit_log_spec.rb'
73-
- 'spec/models/featured_work_spec.rb'
74-
- 'spec/models/file_set_spec.rb'
75-
- 'spec/models/generic_work_spec.rb'
76-
- 'spec/presenters/hyrax/inspect_work_presenter_spec.rb'
77-
- 'spec/services/hyrax/actor_factory_spec.rb'
78-
- 'spec/services/hyrax/admin_set_create_service_spec.rb'
79-
- 'spec/services/hyrax/default_middleware_stack_spec.rb'
80-
- 'spec/services/hyrax/graph_exporter_spec.rb'
81-
- 'spec/services/hyrax/user_stat_importer_spec.rb'
82-
- 'spec/services/hyrax/workflow/activate_object_spec.rb'
83-
- 'spec/services/hyrax/workflow/deactivate_object_spec.rb'
84-
- 'spec/services/hyrax/workflow/permission_generator_spec.rb'
85-
- 'spec/services/hyrax/workflow/permission_query_spec.rb'
86-
- 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
87-
- 'spec/services/hyrax/workflow/workflow_importer_spec.rb'
88-
- 'spec/views/**/*'
89-
- 'spec/wings/valkyrie/persister_spec.rb'
90-
91-
RSpec/VerifiedDoubles:
15+
# Offense count: 3
16+
# This cop supports safe autocorrection (--autocorrect).
17+
# Configuration parameters: AllowForAlignment.
18+
Layout/SpaceBeforeFirstArg:
9219
Enabled: false
9320

94-
RSpec/SubjectStub:
95-
Exclude:
96-
- 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
97-
- 'spec/controllers/hyrax/file_sets_controller_spec.rb'
98-
- 'spec/models/file_set_spec.rb'
99-
- 'spec/models/hyrax/work_behavior_spec.rb'
100-
- 'spec/search_builders/hyrax/file_set_search_builder_spec.rb'
101-
- 'spec/models/hyrax/operation_spec.rb'
102-
- 'spec/controllers/hyrax/accepts_batches_controller_spec.rb'
103-
- 'spec/indexers/hyrax/repository_reindexer_spec.rb'
104-
- 'spec/lib/hyrax/analytics_spec.rb'
105-
- 'spec/models/job_io_wrapper_spec.rb'
106-
- 'spec/search_builders/hyrax/abstract_type_relation_spec.rb'
107-
- 'spec/services/hyrax/database_migrator_spec.rb'
108-
109-
RSpec/AnyInstance:
110-
Exclude:
111-
- 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
112-
- 'spec/controllers/hyrax/api/items_controller_spec.rb'
113-
- 'spec/controllers/hyrax/api/zotero_controller_spec.rb'
114-
- 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
115-
- 'spec/controllers/hyrax/stats_controller_spec.rb'
116-
- 'spec/controllers/hyrax/users_controller_spec.rb'
117-
- 'spec/hyrax/transactions/steps/delete_access_control_spec.rb'
118-
- 'spec/hyrax/transactions/steps/save_access_control_spec.rb'
119-
- 'spec/jobs/content_restored_version_event_job_spec.rb'
120-
- 'spec/jobs/file_set_attached_event_job_spec.rb'
121-
- 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'
122-
- 'spec/jobs/hyrax/grant_read_to_members_job_spec.rb'
123-
- 'spec/jobs/hyrax/revoke_edit_from_members_job_spec.rb'
124-
- 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
125-
- 'spec/presenters/hyrax/file_usage_spec.rb'
126-
- 'spec/presenters/hyrax/work_usage_spec.rb'
127-
- 'spec/services/hyrax/repository_fixity_check_service_spec.rb'
128-
- 'spec/services/hyrax/workflow/permission_generator_spec.rb'
129-
- 'spec/services/hyrax/workflow/sipity_actions_generator_spec.rb'
130-
- 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
131-
- 'spec/services/hyrax/workflow/workflow_permissions_generator_spec.rb'
132-
- 'spec/controllers/hyrax/homepage_controller_spec.rb'
133-
- 'spec/controllers/hyrax/my/collections_controller_spec.rb'
134-
- 'spec/controllers/hyrax/my/works_controller_spec.rb'
135-
- 'spec/presenters/hyrax/admin/repository_object_presenter_spec.rb'
136-
137-
# Offense count: 51
138-
RSpec/ExpectInHook:
21+
# Offense count: 1
22+
# Configuration parameters: AllowedParentClasses.
23+
Lint/MissingSuper:
13924
Enabled: false
14025

141-
# Offense count: 27
142-
# Configuration parameters: EnforcedStyle, SupportedStyles.
143-
# SupportedStyles: and_return, block
144-
RSpec/ReturnFromStub:
145-
Exclude:
146-
- 'spec/controllers/hyrax/api/items_controller_spec.rb'
147-
- 'spec/controllers/hyrax/file_sets_controller_spec.rb'
148-
- 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
149-
- 'spec/models/file_set_spec.rb'
150-
- 'spec/presenters/hyrax/admin_set_options_presenter_spec.rb'
151-
- 'spec/routing/api_route_spec.rb'
152-
- 'spec/views/_user_util_links.html.erb_spec.rb'
153-
- 'spec/views/hyrax/base/_attributes.html.erb_spec.rb'
154-
- 'spec/views/hyrax/base/_form.html.erb_spec.rb'
155-
- 'spec/views/hyrax/base/file_manager.html.erb_spec.rb'
156-
- 'spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb'
157-
- 'spec/views/hyrax/users/_user_info.html.erb_spec.rb'
26+
# Offense count: 8
27+
# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
28+
Metrics/MethodLength:
29+
Enabled: false
15830

159-
# Offense count: 26
160-
RSpec/RepeatedDescription:
161-
Exclude:
162-
- 'spec/models/sipity/agent_spec.rb'
163-
- 'spec/models/sipity/comment_spec.rb'
164-
- 'spec/models/sipity/entity_spec.rb'
165-
- 'spec/models/sipity/entity_specific_responsibility_spec.rb'
166-
- 'spec/models/sipity/role_spec.rb'
167-
- 'spec/models/sipity/workflow_action_spec.rb'
168-
- 'spec/models/sipity/workflow_responsibility_spec.rb'
169-
- 'spec/models/sipity/workflow_role_spec.rb'
170-
- 'spec/models/sipity/workflow_state_action_permission_spec.rb'
171-
- 'spec/models/sipity/workflow_state_action_spec.rb'
172-
- 'spec/models/sipity/workflow_state_spec.rb'
31+
# Offense count: 3
32+
# This cop supports safe autocorrection (--autocorrect).
33+
# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
34+
# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
35+
# SupportedShorthandSyntax: always, never, either, consistent
36+
Style/HashSyntax:
37+
Enabled: false
17338

17439
# Offense count: 2
175-
# Configuration parameters: Include.
176-
# Include: app/models/**/*.rb
177-
Rails/HasManyOrHasOneDependent:
178-
Exclude:
179-
- 'app/models/admin_set.rb'
180-
- 'app/models/hyrax/permission_template.rb'
40+
# This cop supports safe autocorrection (--autocorrect).
41+
Style/RedundantParentheses:
42+
Enabled: false
18143

18244
# Offense count: 1
183-
Rails/SkipsModelValidations:
184-
Exclude:
185-
- 'app/services/hyrax/works/migration_service.rb'
186-
187-
# Offense count: 12
188-
Lint/MissingSuper:
189-
Exclude:
190-
- 'app/actors/hyrax/actors/interpret_visibility_actor.rb'
191-
- 'app/actors/hyrax/actors/ordered_members_actor.rb'
192-
- 'app/models/concerns/hyrax/file_set/characterization.rb'
193-
- 'app/presenters/hyrax/file_usage.rb'
194-
- 'app/presenters/hyrax/work_usage.rb'
195-
- 'app/services/hyrax/batch_create_failure_service.rb'
196-
- 'app/services/hyrax/batch_create_success_service.rb'
197-
- 'app/services/hyrax/collection_types/create_service.rb'
198-
- 'app/services/hyrax/solr_query_service.rb'
199-
- 'lib/hyrax/form_fields.rb'
200-
- 'lib/hyrax/health_checks/solr_check.rb'
201-
- 'lib/hyrax/schema.rb'
45+
# This cop supports safe autocorrection (--autocorrect).
46+
# Configuration parameters: AllowMultipleReturnValues.
47+
Style/RedundantReturn:
48+
Enabled: false

‎.rubocop_todo.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# This configuration was generated by
2-
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3-
# using RuboCop version 1.28.2.
2+
# `rubocop --auto-gen-config`
3+
# on 2024-08-15 14:54:14 UTC using RuboCop version 1.61.0.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
8-
9-
# Offense count: 1
10-
# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
11-
Metrics/MethodLength:
12-
Max: 21

‎Gemfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
# for knapsack overrides of gems. See https://github.com/ManageIQ/bundler-inject
4-
# set BUNDLE_BUNDLER_INJECT__GEM_PATH in your knapsack to point at the knapsack override file.
4+
# bundler inject reads from ~/.bundler.d and ./bundler.d ~/.bundler.d maps to the bundler.d directory in your knapsack.
55
plugin 'bundler-inject'
66
begin
77
require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject")
@@ -12,16 +12,17 @@ end
1212
# rubocop:disable Layout/LineLength
1313
source 'https://rubygems.org'
1414

15-
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
16-
gem 'rails', '~> 6.1.7.8'
15+
# Refer to this rails version to resolve compatibility issues with good_job
16+
gem 'rails', '~> 6.0', github: 'rails/rails', branch: '6-1-stable', ref: 'd16199e507086e3d54d94253b7e1d87ead394d9f'
1717

1818
gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
1919
gem 'active-fedora', '~> 14.0'
2020
gem 'activerecord-nulldb-adapter'
21+
gem 'activesupport', '>= 4.2.0', group: %i[development test]
2122
gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
2223
gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
2324
gem 'aws-sdk-sqs', group: %i[aws]
24-
gem 'bixby', '~> 5.0', '>= 5.0.2', group: %i[development test]
25+
gem 'bixby', group: %i[development test]
2526
gem 'blacklight', '~> 7.29'
2627
gem 'blacklight_advanced_search'
2728
gem 'blacklight_oai_provider', '~> 7.0'
@@ -38,6 +39,7 @@ gem 'cocoon'
3839
gem 'codemirror-rails'
3940
gem 'coffee-rails', '~> 4.2' # Use CoffeeScript for .coffee assets and views
4041
gem 'database_cleaner', group: %i[test]
42+
gem 'derivative-rodeo', '~>0.5', '>= 0.5.3'
4143
gem 'devise'
4244
gem 'devise-guests', '~> 0.3'
4345
gem 'devise-i18n'
@@ -94,7 +96,9 @@ gem 'rspec-its', group: %i[test]
9496
gem 'rspec_junit_formatter', group: %i[test]
9597
gem 'rspec-rails', '>= 3.6.0', group: %i[development test]
9698
gem 'rspec-retry', group: %i[test]
97-
gem 'rubocop', '1.28.2', group: %i[development test]
99+
gem 'rubocop', '~> 1.61.0', group: %i[development test]
100+
gem 'rubocop-capybara', group: %i[development test]
101+
gem 'rubocop-factory_bot', group: %i[development test]
98102
gem 'rubocop-rails', '~> 2.15', group: %i[development test]
99103
gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
100104
gem 'sass-rails', '~> 6.0' # Use SCSS for stylesheets
@@ -143,4 +147,4 @@ gem 'willow_sword', github: 'scientist-softserv/willow_sword', branch: 'main'
143147
# of the time use the `samvera-labs/hyku_knapsack` remote branch.
144148
gem 'hyku_knapsack', github: 'samvera-labs/hyku_knapsack', branch: 'required_for_knapsack_instances'
145149

146-
# rubocop:enable Layout/LineLength
150+
# rubocop:enable Metrics/MethodLength

0 commit comments

Comments
 (0)