Skip to content

Commit

Permalink
Upgrades Blacklight, Rails, and Ruby. (#758)
Browse files Browse the repository at this point in the history
* Remove first batch of unnecessary files.

* Remove second batch of unnecessary files.

* Adds all new/adjusted files.

* fixes syntax error.

* fix render calls.

* Second big dump

* Completed rubocop and hopefully CircleCI.

* CircleCI tweak.

* CircleCI tweak 2.

* CircleCI tweak 3.

* CircleCI tweak 4.

* CircleCI tweak 5.

* Replace old Blacklight-Marc block.

* CircleCI tweak 6.

* Fleshes out ViewComponent testing and attempts a CircleCI tweak.

* CircleCI tweak 7.

* CircleCI tweak 8.

* CircleCI tweak 9.

* CircleCI tweak 10.

* CircleCI tweak 11.

* CircleCI tweak 12.

* CircleCI tweak 13.

* CircleCI tweak 14.

* CircleCI tweak 15.

* CircleCI tweak 16.

* CircleCI tweak 17.

* CircleCI tweak 18.

* Updated config.yml

* Updated config.yml

* Updated config.yml

* CircleCI tweak 19.

* CircleCI tweak 20.

* CircleCI tweak 21.

* CircleCI tweak 22.

* Adds start_over_button spec.

* Move sole overrirde from whole file to another helper file.

* Appeases the rubocop gods.

* Add tests for citation_component.

* adds test and makes rubocop happy.

* Coverall removal test.

* Rubocop appeasement.

* Adds another component test.

* fixes my rubo oopsy.

* Adds test for about_this_item.

* Adds test for access_and_copyright.

* Adds test for find_this_item and some minor tweaks.

* Adds test for first_column and some minor tweaks.

* Adds test for generic_metadata and some refactoring.

* Adds test for is_part_of_component.

* Adds test for second_column and a bit of refactoring.

* Corrects placement of no rspec comment.

* Adds rspec comment to compoment that produces user errors.

* rubocop fix.

* Adds test for this_item_contains.

* Adds test for view_items_in_collection.

* Mild refactoring and sets ENV for thumbnail to ensure consistency.

* Moves instance variable assignment to before_render.

* Adds test for breadcrumbs and refactors some components.

* Fully tests Lux::BreadcrumbsComponent.

* Adds tests for Lux::ExploreCollectionsComponent.

* Adds tests for Lux::HeroImageComponent and refactors.

* Adds tests for Lux::MetadataFieldComponent and Blacklight test helpers.

* Makes comment of lack of testing for Blacklight::MetadataFieldLayoutComponent.

* Adds tests for Lux::ShowAllMetadataComponent.

* Adds tests for Lux::ShowDocumentComponent.

* Adds tests for Lux::ShowUvComponent.

* Fixes rspec failure on CI.

* Makes deploy script run yarn install.

* Fixes Popper issue and points styling to new elements.

* Fixes bugs related to date range slider.

* Corrects styling of Facets modal.

* Switches back to webpacker.

* Adds invisible facets to load Explore Collections.

* Restricts partials sent to Bookmark page. (#770)

* Restricts partials sent to Bookmark page.

* show em

* show em filtered

* citation only
  • Loading branch information
bwatson78 authored Jul 23, 2024
1 parent 721242e commit 93c0c0b
Show file tree
Hide file tree
Showing 200 changed files with 4,438 additions and 2,107 deletions.
24 changes: 15 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
version: 2.1
orbs:
samvera: samvera/[email protected]
browser-tools: circleci/[email protected]
jobs:
build:
parameters:
ruby_version:
type: string
default: '2.7.5'
default: '3.1.2'
bundler_version:
type: string
default: '2.0.1'
default: '2.3.22'
solr_port:
type: string
default: '8985'
Expand All @@ -18,7 +19,7 @@ jobs:
default: '4'
mysql_version:
type: string
default: '5.7.22'
default: '8.0.33'
environment:
BUNDLE_PATH: vendor/bundle
BUNDLE_JOBS: 4
Expand All @@ -31,16 +32,17 @@ jobs:
DATABASE_PORT: 3306
DATABASE_USERNAME: root
docker:
- image: circleci/ruby:<< parameters.ruby_version >>-node-browsers-legacy
- image: cimg/ruby:<< parameters.ruby_version >>-browsers
- image: solr:7-alpine
command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
- image: circleci/redis:<<parameters.redis_version>>
- image: circleci/mysql:<<parameters.mysql_version>>
- image: cimg/mysql:<<parameters.mysql_version>>
working_directory: ~/project
parallelism: 4
steps:
- checkout

- browser-tools/install-chrome
- browser-tools/install-chromedriver
- samvera/bundle:
ruby_version: << parameters.ruby_version >>
bundler_version: << parameters.bundler_version >>
Expand Down Expand Up @@ -77,6 +79,10 @@ jobs:
name: Wait for MySQL, if necessary.
command: dockerize -wait tcp://${DATABASE_HOST}:${DATABASE_PORT} -timeout 1m

- run:
name: Run migrations
command: bundle exec rails db:migrate RAILS_ENV=test

- samvera/parallel_rspec

- run:
Expand All @@ -95,7 +101,7 @@ jobs:

coverage:
docker:
- image: circleci/ruby:2.7.5
- image: cimg/ruby:3.1.2
working_directory: ~/project
parallelism: 1
steps:
Expand All @@ -119,8 +125,8 @@ workflows:
ci:
jobs:
- build:
name: ruby2-7-5
name: ruby3-1-2
- coverage:
name: codeclimate
requires:
- ruby2-7-5
- ruby3-1-2
6 changes: 5 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inherit_gem:
bixby: bixby_default.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1
Exclude:
- 'bin/**/*'
- 'db/**/*'
Expand All @@ -21,6 +21,9 @@ Lint/EmptyWhen:
Exclude:
- app/models/marc_indexer.rb

Lint/MissingSuper:
Enabled: false

Metrics/AbcSize:
Exclude:
- 'app/models/marc_indexer.rb'
Expand All @@ -44,6 +47,7 @@ Metrics/CyclomaticComplexity:

Metrics/MethodLength:
Exclude:
- 'app/components/blacklight/search_bar_component.rb'
- 'app/models/marc_indexer.rb'
- 'app/values/uv_configuration.rb'

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.1.2
19 changes: 9 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

ruby '~> 2.7.5'
ruby '3.1.2'

gem 'administrate', '~> 0.17.0'
# Use ActiveModel has_secure_password
# Needed for support of OpenSSH keys
gem 'bcrypt_pbkdf'
# Blacklight 7, because Blacklight 6 did not successfully deploy to production
gem 'blacklight', ">= 7"
gem 'blacklight-access_controls', git: 'https://github.com/projectblacklight/blacklight-access_controls', ref: '21e04f5'
gem 'blacklight', "7.33.1"
gem 'blacklight-access_controls', git: 'https://github.com/projectblacklight/blacklight-access_controls', branch: 'rails7_ruby3_blacklight8_upgrade'
gem 'blacklight_advanced_search'
gem 'blacklight-marc', '>= 7.0.0.rc1'
gem 'blacklight_advanced_search', '~>7.0'
gem 'blacklight_range_limit'
gem 'bootstrap', '~> 4.0'
gem 'bootstrap-select-rails', '>= 1.13'
Expand All @@ -39,12 +39,12 @@ gem 'omniauth-shibboleth', '~> 1.3'
# Use Puma as the app server
gem 'puma'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
gem 'rails', '~> 7.0', '>= 7.0.7.2'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
gem 'rsolr', '>= 1.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem "sassc-rails", "~> 2.1"
gem 'simple_form'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
Expand All @@ -71,17 +71,15 @@ group :development do
gem 'web-console', '>= 3.3.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'xray-rails'
gem "xray-rails", git: "https://github.com/brentd/xray-rails.git", branch: "bugs/ruby-3.0.0"
end

group :development, :test do
# bixby = rubocop rules for Hyrax apps
gem 'bixby', '~> 3.0.1'
gem 'bixby'
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'capybara'
gem 'coveralls', require: false
gem 'factory_bot_rails', '~> 4.11.1'
gem 'ffaker'
gem 'pry' unless ENV['CI']
Expand All @@ -90,6 +88,7 @@ group :development, :test do
gem 'rspec-its'
gem 'rspec-rails', '~> 5.0'
gem 'selenium-webdriver'
gem 'simplecov', require: false
gem 'solr_wrapper', '>= 0.3'
gem 'webdrivers', '5.3.0'
end
Expand Down
Loading

0 comments on commit 93c0c0b

Please sign in to comment.