diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 090cb7a32..40a6fd194 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,12 +1,12 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude` -# on 2023-12-01 19:40:01 UTC using RuboCop version 1.57.2. +# on 2025-01-30 22:10:33 UTC using RuboCop version 1.71.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 3 +# Offense count: 2 Capybara/SpecificActions: Exclude: - 'spec/features/geo_viewer_spec.rb' @@ -33,12 +33,11 @@ Metrics/MethodLength: - 'app/viewers/embed/viewer/m3_viewer.rb' - 'lib/embed/request.rb' -# Offense count: 14 +# Offense count: 13 RSpec/AnyInstance: Exclude: - - 'spec/components/embed/was_seed_component_spec.rb' + - 'spec/components/legacy/was_seed_component_spec.rb' - 'spec/features/was_seed_viewer_spec.rb' - - 'spec/lib/embed/viewer/common_viewer_spec.rb' - 'spec/lib/embed/viewer/m3_viewer_spec.rb' - 'spec/models/embed/purl_spec.rb' - 'spec/models/embed/was_time_map_spec.rb' @@ -54,7 +53,7 @@ RSpec/ContextWording: # Offense count: 23 RSpec/ExpectInHook: Exclude: - - 'spec/components/embed/was_seed_component_spec.rb' + - 'spec/components/legacy/was_seed_component_spec.rb' - 'spec/features/was_seed_viewer_spec.rb' - 'spec/lib/embed/response_spec.rb' - 'spec/lib/embed/viewer/file_spec.rb' @@ -65,12 +64,12 @@ RSpec/IteratedExpectation: Exclude: - 'spec/models/embed/was_time_map_spec.rb' -# Offense count: 28 +# Offense count: 29 # Configuration parameters: EnforcedStyle. # SupportedStyles: have_received, receive RSpec/MessageSpies: Exclude: - - 'spec/components/embed/was_seed_component_spec.rb' + - 'spec/components/legacy/was_seed_component_spec.rb' - 'spec/features/was_seed_viewer_spec.rb' - 'spec/lib/embed/request_spec.rb' - 'spec/lib/embed/response_spec.rb' @@ -94,12 +93,11 @@ RSpec/StubbedMock: Exclude: - 'spec/lib/embed/request_spec.rb' - 'spec/lib/embed/response_spec.rb' - - 'spec/lib/embed/viewer/common_viewer_spec.rb' - 'spec/lib/embed/viewer/file_spec.rb' - 'spec/lib/embed/viewer/m3_viewer_spec.rb' - 'spec/lib/embed/viewer/was_seed_spec.rb' -# Offense count: 65 +# Offense count: 66 # Configuration parameters: AllowedConstants. Style/Documentation: Enabled: false diff --git a/app/assets/stylesheets/was_seed.scss b/app/assets/stylesheets/legacy_was_seed.scss similarity index 100% rename from app/assets/stylesheets/was_seed.scss rename to app/assets/stylesheets/legacy_was_seed.scss diff --git a/app/components/embed/was_seed_component.html.erb b/app/components/legacy/was_seed_component.html.erb similarity index 100% rename from app/components/embed/was_seed_component.html.erb rename to app/components/legacy/was_seed_component.html.erb diff --git a/app/components/embed/was_seed_component.rb b/app/components/legacy/was_seed_component.rb similarity index 92% rename from app/components/embed/was_seed_component.rb rename to app/components/legacy/was_seed_component.rb index 83b16b416..eec17dc7d 100644 --- a/app/components/embed/was_seed_component.rb +++ b/app/components/legacy/was_seed_component.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module Embed +module Legacy class WasSeedComponent < ViewComponent::Base def initialize(viewer:) @viewer = viewer diff --git a/app/javascript/webarchive.js b/app/javascript/legacy_webarchive.js similarity index 100% rename from app/javascript/webarchive.js rename to app/javascript/legacy_webarchive.js diff --git a/app/viewers/embed/viewer/was_seed.rb b/app/viewers/embed/viewer/was_seed.rb index acdfaf22b..9b4be853a 100644 --- a/app/viewers/embed/viewer/was_seed.rb +++ b/app/viewers/embed/viewer/was_seed.rb @@ -6,15 +6,15 @@ class WasSeed < CommonViewer delegate :druid, to: :@purl_object def component - WasSeedComponent + Legacy::WasSeedComponent end def importmap - 'webarchive' + 'legacy_webarchive' end def stylesheet - 'was_seed.css' + 'legacy_was_seed.css' end def capture_list diff --git a/config/importmap.rb b/config/importmap.rb index 5dc9349c2..04103a3ca 100644 --- a/config/importmap.rb +++ b/config/importmap.rb @@ -1,7 +1,7 @@ # Pin npm packages by running ./bin/importmap pin "media", preload: true -pin "webarchive", preload: true +pin "legacy_webarchive", preload: true pin "file", preload: true pin "document", preload: true pin "3d", preload: true diff --git a/package.json b/package.json index 962a63158..c2d8bec8b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "test": "jest -c jest.config.js", - "build:css": "sass ./app/assets/stylesheets/companion_window.scss:./app/assets/builds/companion_window.css ./app/assets/stylesheets/media.scss:./app/assets/builds/media.css ./app/assets/stylesheets/file.scss:./app/assets/builds/file.css ./app/assets/stylesheets/geo.scss:./app/assets/builds/geo.css ./app/assets/stylesheets/m3.scss:./app/assets/builds/m3.css ./app/assets/stylesheets/model.scss:./app/assets/builds/model.css ./app/assets/stylesheets/was_seed.scss:./app/assets/builds/was_seed.css ./app/assets/stylesheets/sul_icons.scss:./app/assets/builds/sul_icons.css --no-source-map --load-path=node_modules --load-path=vendor/assets/javascripts" + "build:css": "sass ./app/assets/stylesheets/companion_window.scss:./app/assets/builds/companion_window.css ./app/assets/stylesheets/media.scss:./app/assets/builds/media.css ./app/assets/stylesheets/file.scss:./app/assets/builds/file.css ./app/assets/stylesheets/geo.scss:./app/assets/builds/geo.css ./app/assets/stylesheets/m3.scss:./app/assets/builds/m3.css ./app/assets/stylesheets/model.scss:./app/assets/builds/model.css ./app/assets/stylesheets/legacy_was_seed.scss:./app/assets/builds/legacy_was_seed.css ./app/assets/stylesheets/sul_icons.scss:./app/assets/builds/sul_icons.css --no-source-map --load-path=node_modules --load-path=vendor/assets/javascripts" }, "private": true, "dependencies": { diff --git a/spec/components/embed/was_seed_component_spec.rb b/spec/components/legacy/was_seed_component_spec.rb similarity index 97% rename from spec/components/embed/was_seed_component_spec.rb rename to spec/components/legacy/was_seed_component_spec.rb index a114c2631..5ed7fa8ca 100644 --- a/spec/components/embed/was_seed_component_spec.rb +++ b/spec/components/legacy/was_seed_component_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Embed::WasSeedComponent, type: :component do +RSpec.describe Legacy::WasSeedComponent, type: :component do include WasTimeMapFixtures let(:embed_request) do