arclight 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e12ccfeeb5aa7746c2cec7ac945c267fdd7bf9a351f158acf68cce9d278960
-  data.tar.gz: 3d3d9d64bd2ea6aab1948f3b97eb2ead2ffbe094a11fed01c2bb1cbe83c82cb5
+  metadata.gz: 5ad2c5251cf3130cce536075a7a1049031b459535566a6654f5601be20318820
+  data.tar.gz: 8e4770a4035b7df7c9e870dc60d7d3d44c8e7b90b70389f19a4e1ba9322aa09a
 SHA512:
-  metadata.gz: 3309551edab5e40ead1eaf7ecf7b34548a4cf6e14be34bf8af0d14af9a2966dfa4ebed51cd1ff0f7399640f1c4e21b3c5b224250558fb7b09d9d52e7680e0a77
-  data.tar.gz: 60e7ad421942da5848a2a8d1b45cd5c56f271cdb092f49af37b7a68e4ebf4014c4c05a7d15ba217d99ad00f00ba98f21604ee1464ac19ca98ee9339adcd954f9
+  metadata.gz: 046246fbbf865afb0677463746b458d94b0efb12f63729b9a4f60166547b0cac25a4a3498702c31fc8e2fadc357742d65e613e11b6c23307997245b5c4db50e3
+  data.tar.gz: 8011c4c5b33be7a6983cb1e887cb2f159efa680411ff29cf31dc7d79115029fc61c21cae7ad2955bd08310059e2f062c0aa91dad186fffcd5c53f8aaba6d9216

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rails_version: [6.1.4.7, 7.0.2.3]
+        ruby: [2.7, '3.0']
+        include:
+          - rails_version: 6.0.3.7
+            ruby: 2.7
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies with Rails ${{ matrix.rails_version }}
+      run: bundle install
+    - name: Install dependencies with yarn
+      run: yarn install
+    - name: Run tests
+      run: bundle exec rake

data/.rubocop.yml

@@ -1,4 +1,6 @@
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-rails
 
 inherit_from:
   - .rubocop_todo.yml
@@ -11,7 +13,7 @@ AllCops:
     - 'lib/generators/arclight/templates/**/*'
     - 'vendor/**/*'
     - 'node_modules/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
 
 Metrics/ModuleLength:

data/.rubocop_todo.yml

@@ -1,44 +1,113 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-09-05 15:26:25 -0600 using RuboCop version 0.74.0.
+# on 2021-05-17 20:57:22 UTC using RuboCop version 1.15.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: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'arclight.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: start_of_line, begin
+Layout/BeginEndAlignment:
+  Exclude:
+    - 'app/models/arclight/document_downloads.rb'
+    - 'lib/tasks/index.rake'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'lib/arclight/exceptions.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAliasSyntax, AllowedMethods.
+# AllowedMethods: alias_method, public, protected, private
+Layout/EmptyLinesAroundAttributeAccessor:
+  Exclude:
+    - 'app/models/arclight/document_downloads.rb'
+    - 'app/models/arclight/parent.rb'
+    - 'app/models/arclight/parents.rb'
+    - 'app/models/arclight/requests/aeon_web_ead.rb'
+    - 'app/models/arclight/requests/google_form.rb'
+    - 'lib/arclight/digital_object.rb'
+    - 'lib/arclight/hash_absolute_xpath.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/RescueEnsureAlignment:
+  Exclude:
+    - 'app/models/arclight/document_downloads.rb'
+    - 'lib/tasks/index.rake'
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/arclight/traject/ead2_config.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'spec/features/search_results_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'lib/arclight/engine.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/UriRegexp:
+  Exclude:
+    - 'lib/tasks/index.rake'
+
 # Offense count: 1
 # Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
     - 'lib/arclight/year_range.rb'
 
-# Offense count: 68
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 278
-  Exclude:
-    - 'spec/features/collection_page_spec.rb'
-
 # Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 19
+
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 4
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 11
-  Exclude:
-    - 'app/helpers/arclight_helper.rb'
+  Max: 17
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 9
 
 # Offense count: 1
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'spec/features/autocomplete_spec.rb'
 
-# Offense count: 91
+# Offense count: 80
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -52,58 +121,122 @@ RSpec/DescribedClass:
   Exclude:
     - 'spec/presenters/arclight/show_presenter_spec.rb'
 
-# Offense count: 61
+# Offense count: 55
 # Cop supports --auto-correct.
 RSpec/EmptyLineAfterExampleGroup:
   Enabled: false
 
-# Offense count: 12
+# Offense count: 10
 # Cop supports --auto-correct.
 RSpec/EmptyLineAfterHook:
   Exclude:
     - 'spec/features/collection_page_spec.rb'
     - 'spec/features/home_page_spec.rb'
     - 'spec/features/many_component_ead_spec.rb'
-    - 'spec/features/search_results_spec.rb'
     - 'spec/helpers/arclight_helper_spec.rb'
-    - 'spec/views/_collection_count.html.erb_spec.rb'
     - 'spec/views/repositories/index.html.erb_spec.rb'
 
-# Offense count: 49
-# Configuration parameters: Max.
+# Offense count: 63
+# Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Enabled: false
+  Max: 49
 
-# Offense count: 2
+# Offense count: 3
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/helpers/arclight_helper_spec.rb'
-    - 'spec/presenters/arclight/index_presenter_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: CustomTransform, IgnoreMethods.
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/lib/arclight/viewers/oembed_spec.rb'
 
-# Offense count: 107
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 133
 RSpec/MultipleExpectations:
-  Max: 26
+  Max: 25
+
+# Offense count: 30
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
 
-# Offense count: 8
+# Offense count: 19
 RSpec/NestedGroups:
   Max: 4
 
 # Offense count: 7
 # Cop supports --auto-correct.
-# Configuration parameters: Strict, EnforcedStyle.
+# Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Exclude:
     - 'spec/helpers/arclight_helper_spec.rb'
     - 'spec/lib/arclight/year_range_spec.rb'
 
+# Offense count: 7
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/helpers/arclight_helper_spec.rb'
+    - 'spec/lib/arclight/viewer_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
+Rails/Blank:
+  Exclude:
+    - 'app/controllers/concerns/arclight/ead_format_helpers.rb'
+    - 'lib/arclight/repository.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Rails/ContentTag:
+  Exclude:
+    - 'app/controllers/concerns/arclight/ead_format_helpers.rb'
+    - 'app/controllers/concerns/arclight/field_config_helpers.rb'
+    - 'app/helpers/arclight_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
+Rails/FilePath:
+  Exclude:
+    - 'app/models/arclight/document_downloads.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:
+  Exclude:
+    - 'app/helpers/arclight_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/IndexWith:
+  Exclude:
+    - 'app/models/arclight/document_downloads.rb'
+
+# Offense count: 1
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/concerns/arclight/field_config_helpers.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/Presence:
+  Exclude:
+    - 'lib/arclight/digital_object.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: **/Rakefile, **/*.rake
+Rails/RakeEnvironment:
+  Exclude:
+    - 'lib/tasks/index.rake'
+    - 'tasks/arclight.rake'
+
 # Offense count: 1
 Security/Open:
   Exclude:
@@ -111,7 +244,7 @@ Security/Open:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -121,19 +254,51 @@ Style/BlockDelimiters:
     - 'lib/tasks/index.rake'
 
 # Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
+Style/CommentAnnotation:
+  Exclude:
+    - 'app/models/concerns/arclight/solr_document.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
 Style/CommentedKeyword:
   Exclude:
     - 'lib/arclight/year_range.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
     - 'lib/arclight.rb'
 
+# Offense count: 4
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, IgnoredMethods.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: template
+
 # Offense count: 1
 # Cop supports --auto-correct.
+Style/HashEachMethods:
+  Exclude:
+    - 'lib/arclight/repository.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
     - 'app/models/concerns/arclight/search_behavior.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'spec/features/collection_page_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/StringConcatenation:
+  Exclude:
+    - 'spec/lib/arclight/repository_spec.rb'

data/Gemfile

@@ -4,6 +4,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in arclight.gemspec
 gemspec
+
+gem 'rexml' if RUBY_VERSION >= '3'
+
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 1.1.0
 # engine_cart stanza: 0.10.0
@@ -38,3 +41,5 @@ else
   end
 end
 # END ENGINE_CART BLOCK
+
+eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/projectblacklight/arclight.svg?branch=master)](https://travis-ci.org/projectblacklight/arclight)
+![Build Status](https://github.com/projectblacklight/arclight/workflows/CI/badge.svg)
 [![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](CONTRIBUTORS.md)
 [![Code Climate Test Coverage](https://codeclimate.com/github/projectblacklight/arclight/badges/coverage.svg)](https://codeclimate.com/github/projectblacklight/arclight/coverage)
 
@@ -10,8 +10,8 @@ A Rails engine supporting discovery of archival materials, based on [Blacklight]
 
 ## Requirements
 
-* [Ruby](https://www.ruby-lang.org/en/) 2.5 or later
-* [Rails](http://rubyonrails.org) 5.0 or later
+* [Ruby](https://www.ruby-lang.org/en/) 2.6 or later
+* [Rails](http://rubyonrails.org) 5.2 or later
 * Solr 8.1 or later
 
 ## Installation

data/app/assets/images/blacklight/bookmark.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M0 512V48C0 21.49 21.49 0 48 0h288c26.51 0 48 21.49 48 48v464L192 400 0 512z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 384 512"><path d="M0 512V48C0 21.49 21.49 0 48 0h288c26.51 0 48 21.49 48 48v464L192 400 0 512z"/></svg>

data/app/assets/images/blacklight/collection.svg

@@ -2,4 +2,4 @@
   Used unmodified from https://fontawesome.com
   CC BY 4.0 https://creativecommons.org/licenses/by/4.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M32 448c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V160H32v288zm160-212c0-6.6 5.4-12 12-12h104c6.6 0 12 5.4 12 12v8c0 6.6-5.4 12-12 12H204c-6.6 0-12-5.4-12-12v-8zM480 32H32C14.3 32 0 46.3 0 64v48c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16V64c0-17.7-14.3-32-32-32z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 512 512"><path d="M32 448c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V160H32v288zm160-212c0-6.6 5.4-12 12-12h104c6.6 0 12 5.4 12 12v8c0 6.6-5.4 12-12 12H204c-6.6 0-12-5.4-12-12v-8zM480 32H32C14.3 32 0 46.3 0 64v48c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16V64c0-17.7-14.3-32-32-32z"/></svg>

data/app/assets/images/blacklight/compact.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M3,15H21V13H3Zm0,4H21V17H3Zm0-8H21V9H3ZM3,5V7H21V5Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><path d="M3,15H21V13H3Zm0,4H21V17H3Zm0-8H21V9H3ZM3,5V7H21V5Z"/></svg>

data/app/assets/images/blacklight/container.svg

@@ -2,4 +2,4 @@
   Used unmodified from https://fontawesome.com
   CC BY 4.0 https://creativecommons.org/licenses/by/4.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M464 128H272l-64-64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V176c0-26.51-21.49-48-48-48z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 512 512"><path d="M464 128H272l-64-64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V176c0-26.51-21.49-48-48-48z"/></svg>

data/app/assets/images/blacklight/ead.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M149.9 349.1l-.2-.2-32.8-28.9 32.8-28.9c3.6-3.2 4-8.8.8-12.4l-.2-.2-17.4-18.6c-3.4-3.6-9-3.7-12.4-.4l-57.7 54.1c-3.7 3.5-3.7 9.4 0 12.8l57.7 54.1c1.6 1.5 3.8 2.4 6 2.4 2.4 0 4.8-1 6.4-2.8l17.4-18.6c3.3-3.5 3.1-9.1-.4-12.4zm220-251.2L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM256 51.9l76.1 76.1H256zM336 464H48V48h160v104c0 13.3 10.7 24 24 24h104zM209.6 214c-4.7-1.4-9.5 1.3-10.9 6L144 408.1c-1.4 4.7 1.3 9.6 6 10.9l24.4 7.1c4.7 1.4 9.6-1.4 10.9-6L240 231.9c1.4-4.7-1.3-9.6-6-10.9zm24.5 76.9l.2.2 32.8 28.9-32.8 28.9c-3.6 3.2-4 8.8-.8 12.4l.2.2 17.4 18.6c3.3 3.5 8.9 3.7 12.4.4l57.7-54.1c3.7-3.5 3.7-9.4 0-12.8l-57.7-54.1c-3.5-3.3-9.1-3.2-12.4.4l-17.4 18.6c-3.3 3.5-3.1 9.1.4 12.4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 384 512"><path d="M149.9 349.1l-.2-.2-32.8-28.9 32.8-28.9c3.6-3.2 4-8.8.8-12.4l-.2-.2-17.4-18.6c-3.4-3.6-9-3.7-12.4-.4l-57.7 54.1c-3.7 3.5-3.7 9.4 0 12.8l57.7 54.1c1.6 1.5 3.8 2.4 6 2.4 2.4 0 4.8-1 6.4-2.8l17.4-18.6c3.3-3.5 3.1-9.1-.4-12.4zm220-251.2L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM256 51.9l76.1 76.1H256zM336 464H48V48h160v104c0 13.3 10.7 24 24 24h104zM209.6 214c-4.7-1.4-9.5 1.3-10.9 6L144 408.1c-1.4 4.7 1.3 9.6 6 10.9l24.4 7.1c4.7 1.4 9.6-1.4 10.9-6L240 231.9c1.4-4.7-1.3-9.6-6-10.9zm24.5 76.9l.2.2 32.8 28.9-32.8 28.9c-3.6 3.2-4 8.8-.8 12.4l.2.2 17.4 18.6c3.3 3.5 8.9 3.7 12.4.4l57.7-54.1c3.7-3.5 3.7-9.4 0-12.8l-57.7-54.1c-3.5-3.3-9.1-3.2-12.4.4l-17.4 18.6c-3.3 3.5-3.1 9.1.4 12.4z"/></svg>

data/app/assets/images/blacklight/file.svg

@@ -2,4 +2,4 @@
   Used unmodified from https://fontawesome.com
   CC BY 4.0 https://creativecommons.org/licenses/by/4.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 384 512"><path d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"/></svg>

data/app/assets/images/blacklight/folder.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M464 128H272l-64-64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V176c0-26.51-21.49-48-48-48z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 512 512"><path d="M464 128H272l-64-64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V176c0-26.51-21.49-48-48-48z"/></svg>

data/app/assets/images/blacklight/list.svg

@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file</title><path d="M0,0H24V24H0Z" fill="none"/><path d="M3,19H21V13.45H3ZM3,5v5.61H21V5Z"/></svg>
+<svg height="24" width="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>file</title><path d="M0,0H24V24H0Z" fill="none"/><path d="M3,19H21V13.45H3ZM3,5v5.61H21V5Z"/></svg>

data/app/assets/images/blacklight/online.svg

@@ -2,4 +2,4 @@
   Used unmodified from https://fontawesome.com
   CC BY 4.0 https://creativecommons.org/licenses/by/4.0/
 -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M608 0H160a32 32 0 0 0-32 32v96h160V64h192v320h128a32 32 0 0 0 32-32V32a32 32 0 0 0-32-32zM232 103a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm352 208a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm-168 57H32a32 32 0 0 0-32 32v288a32 32 0 0 0 32 32h384a32 32 0 0 0 32-32V192a32 32 0 0 0-32-32zM96 224a32 32 0 1 1-32 32 32 32 0 0 1 32-32zm288 224H64v-32l64-64 32 32 128-128 96 96z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 640 512"><path d="M608 0H160a32 32 0 0 0-32 32v96h160V64h192v320h128a32 32 0 0 0 32-32V32a32 32 0 0 0-32-32zM232 103a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm352 208a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm-168 57H32a32 32 0 0 0-32 32v288a32 32 0 0 0 32 32h384a32 32 0 0 0 32-32V192a32 32 0 0 0-32-32zM96 224a32 32 0 1 1-32 32 32 32 0 0 1 32-32zm288 224H64v-32l64-64 32 32 128-128 96 96z"/></svg>

data/app/assets/images/blacklight/pdf.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48zm250.2-143.7c-12.2-12-47-8.7-64.4-6.5-17.2-10.5-28.7-25-36.8-46.3 3.9-16.1 10.1-40.6 5.4-56-4.2-26.2-37.8-23.6-42.6-5.9-4.4 16.1-.4 38.5 7 67.1-10 23.9-24.9 56-35.4 74.4-20 10.3-47 26.2-51 46.2-3.3 15.8 26 55.2 76.1-31.2 22.4-7.4 46.8-16.5 68.4-20.1 18.9 10.2 41 17 55.8 17 25.5 0 28-28.2 17.5-38.7zm-198.1 77.8c5.1-13.7 24.5-29.5 30.4-35-19 30.3-30.4 35.7-30.4 35zm81.6-190.6c7.4 0 6.7 32.1 1.8 40.8-4.4-13.9-4.3-40.8-1.8-40.8zm-24.4 136.6c9.7-16.9 18-37 24.7-54.7 8.3 15.1 18.9 27.2 30.1 35.5-20.8 4.3-38.9 13.1-54.8 19.2zm131.6-5s-5 6-37.3-7.8c35.1-2.6 40.9 5.4 37.3 7.8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 384 512"><path d="M369.9 97.9L286 14C277 5 264.8-.1 252.1-.1H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48V131.9c0-12.7-5.1-25-14.1-34zM332.1 128H256V51.9l76.1 76.1zM48 464V48h160v104c0 13.3 10.7 24 24 24h104v288H48zm250.2-143.7c-12.2-12-47-8.7-64.4-6.5-17.2-10.5-28.7-25-36.8-46.3 3.9-16.1 10.1-40.6 5.4-56-4.2-26.2-37.8-23.6-42.6-5.9-4.4 16.1-.4 38.5 7 67.1-10 23.9-24.9 56-35.4 74.4-20 10.3-47 26.2-51 46.2-3.3 15.8 26 55.2 76.1-31.2 22.4-7.4 46.8-16.5 68.4-20.1 18.9 10.2 41 17 55.8 17 25.5 0 28-28.2 17.5-38.7zm-198.1 77.8c5.1-13.7 24.5-29.5 30.4-35-19 30.3-30.4 35.7-30.4 35zm81.6-190.6c7.4 0 6.7 32.1 1.8 40.8-4.4-13.9-4.3-40.8-1.8-40.8zm-24.4 136.6c9.7-16.9 18-37 24.7-54.7 8.3 15.1 18.9 27.2 30.1 35.5-20.8 4.3-38.9 13.1-54.8 19.2zm131.6-5s-5 6-37.3-7.8c35.1-2.6 40.9 5.4 37.3 7.8z"/></svg>

data/app/assets/images/blacklight/repository.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M4 10v7h3v-7H4zm6 0v7h3v-7h-3zM2 22h19v-3H2v3zm14-12v7h3v-7h-3zm-4.5-9L2 6v2h19V6l-9.5-5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M4 10v7h3v-7H4zm6 0v7h3v-7h-3zM2 22h19v-3H2v3zm14-12v7h3v-7h-3zm-4.5-9L2 6v2h19V6l-9.5-5z"/></svg>

data/app/assets/javascripts/arclight/context_navigation.js

@@ -11,6 +11,10 @@ class NavigationDocument {
     this.el.find('li.al-collection-context').addClass('al-hierarchy-highlight');
   }
 
+  makeCollapsible() {
+    this.el.find('li.al-collection-context').addClass('collapsible');
+  }
+
   collapse() {
     this.el.find('li.al-collection-context').addClass('collapsed');
   }
@@ -32,9 +36,9 @@ class ExpandButton {
    * @param {jQuery} $li - the <button> element
    * @return {jQuery} - a jQuery object containing the targeted <li>
    */
-  findSiblings() {
-    const $siblings = this.$el.parent().children('li');
-    return $siblings.slice(0, -1);
+  findCollapsibleSiblings() {
+    const $siblings = this.$el.parent().children('li.collapsible');
+    return $siblings;
   }
 
   /**
@@ -44,7 +48,7 @@ class ExpandButton {
    *   <button> element
    */
   handleClick() {
-    const $targeted = this.findSiblings();
+    const $targeted = this.findCollapsibleSiblings();
 
     $targeted.toggleClass('collapsed');
     this.$el.toggleClass('collapsed');
@@ -66,25 +70,6 @@ class ExpandButton {
   }
 }
 
-/**
- * Modeling <button> Elements which hide or retrieve <li> elements for sibling
- *   documents nested within the <li> elements of the <ul> tree
- * @class
- */
-class NestedExpandButton extends ExpandButton {
-  /**
-   * This retrieves the <li> elements which are hidden/rendered in response to
-   *   clicking the <button> element
-   * @param {jQuery} $li - the <button> element
-   * @return {jQuery} - a jQuery object containing the targeted <li>
-   */
-  findSiblings() {
-    const highlighted = this.$el.siblings('.al-hierarchy-highlight');
-    const $siblings = highlighted.prevAll('.al-collection-context');
-    return $siblings.slice(0, -1);
-  }
-}
-
 /**
  * Models the placeholder display elements for content loading from AJAX
  *   requests
@@ -198,6 +183,7 @@ class ContextNavigation {
     if (prevSiblingDocs.length > 1 && originalDocumentIndex > 0) {
       const hiddenPrevSiblingDocs = prevSiblingDocs.slice(0, -1);
       hiddenPrevSiblingDocs.forEach(siblingDoc => {
+        siblingDoc.makeCollapsible();
         siblingDoc.collapse();
       });
 
@@ -245,6 +231,7 @@ class ContextNavigation {
     let renderedBeforeDocs;
     if (beforeDocs.length > 1) {
       beforeDocs.forEach(function (parentDoc) {
+        parentDoc.makeCollapsible();
         parentDoc.collapse();
       });
       renderedBeforeDocs = beforeDocs.map(newDoc => newDoc.render()).join('');
@@ -281,28 +268,6 @@ class ContextNavigation {
     });
   }
 
-
-  /**
-   * Update the ancestors for <li> elements
-   * @param {jQuery} $li - the <li> element for the current, highlighted
-   *   Document in the <ul> context list of collections, components, and
-   *   containers
-   */
-  /* eslint-disable class-methods-use-this */
-  updateListSiblings($li) {
-    const prevSiblings = $li.prevAll('.al-collection-context');
-    if (prevSiblings.length > 1) {
-      const hiddenNextSiblings = prevSiblings.slice(0, -1);
-      hiddenNextSiblings.toggleClass('collapsed');
-
-      const button = new NestedExpandButton();
-
-      const lastHiddenNextSibling = hiddenNextSiblings[hiddenNextSiblings.length - 1];
-      button.$el.insertAfter(lastHiddenNextSibling);
-    }
-  }
-  /* eslint-enable class-methods-use-this */
-
   /**
    * This updates the elements in the View DOM using an AJAX response containing
    *   the HTML of a server-rendered View template.
@@ -356,8 +321,8 @@ class ContextNavigation {
     const that = this;
     this.ul.find('.al-toggle-view-children').on('click', (e) => {
       e.preventDefault();
-      const targetArea = $($(e.target).attr('href'));
-      if (!targetArea.data().resolved) {
+      const targetArea = $($(e.currentTarget).attr('href'));
+      if (!targetArea.data('resolved') === true) {
         targetArea.find('.context-navigator').each((i, ee) => {
           const contextNavigation = new ContextNavigation(
             // Send null for originalParents. We want to disregard the original

data/app/assets/stylesheets/arclight/application.scss

@@ -7,6 +7,7 @@
 @import 'modules/collection_search';
 @import 'modules/highlights';
 @import 'modules/hierarchy_and_online_contents';
+@import 'modules/icons';
 @import 'modules/layout';
 @import 'modules/mastheads';
 @import 'modules/repositories.scss';

data/app/assets/stylesheets/arclight/modules/icons.scss

@@ -0,0 +1,4 @@
+.blacklight-icons svg {
+  height: 1rem;
+  width: 1rem;
+}

data/app/assets/stylesheets/arclight/modules/layout.scss

@@ -21,6 +21,7 @@
 .breadcrumb-home-link {
   margin-bottom: ($spacer / 4);
 }
+
 .al-show-actions-box {
   border: $default-border-styling;
   background-color: $gray-200;
@@ -81,7 +82,7 @@
 }
 
 // Show page breadcrumbs
-@for $i from 1 to 14 {
+@for $i from 1 to 20 {
   .breadcrumb-item.breadcrumb-item-#{$i}.media {
     padding-left: 0;
 
@@ -99,7 +100,7 @@
 
 // Show page metadata.
 // Indent to match terminal show page breadcrumb.
-@for $i from 1 to 14 {
+@for $i from 1 to 20 {
   .al-metadata-section.breadcrumb-item-#{$i} {
     padding-left: 0;
 
@@ -111,13 +112,12 @@
 
 // Collapse +/- indicators
 .al-toggle-view-children {
-  &:not(.collapsed) {
-    & {
-      content: image-url('blacklight/minus.svg');
-    }
+  &::after {
+    content: image-url('blacklight/plus.svg');
+  }
+  &:not(.collapsed)::after {
+    content: image-url('blacklight/minus.svg');
   }
-
-  content: image-url('blacklight/plus.svg');
 }
 
 .al-toggle-children-container {

data/app/controllers/concerns/arclight/field_config_helpers.rb

@@ -88,7 +88,7 @@ module Arclight
     end
 
     def link_to_name_facet(args)
-      options = args[:config].try(:separator_options) || {}
+      options = args[:config]&.separator_options || {}
       values = args[:value] || []
 
       values.map do |value|

data/app/helpers/arclight_helper.rb

@@ -117,7 +117,7 @@ module ArclightHelper
   end
 
   def collection_active?
-    try(:search_state) && search_state.params_for_search.try(:[], 'f').try(:[], 'level_sim') == ['Collection']
+    respond_to?(:search_state) && search_state&.params_for_search&.dig('f', 'level_sim') == ['Collection']
   end
 
   def collection_active_class
@@ -129,7 +129,7 @@ module ArclightHelper
   end
 
   def grouped?
-    try(:search_state) && search_state.params_for_search.try(:[], 'group') == 'true'
+    respond_to?(:search_state) && search_state&.params_for_search&.dig('group') == 'true'
   end
 
   def search_with_group
@@ -167,7 +167,7 @@ module ArclightHelper
   #
   # @return [Repository]
   def repository_faceted_on
-    return unless try(:search_state) && facet_field_in_params?('repository_sim')
+    return unless respond_to?(:search_state) && search_state && facet_field_in_params?('repository_sim')
 
     repos = Array(facet_params('repository_sim'))
     faceted = repos && repos.length == 1 && repos.first

data/app/views/arclight/requests/_aeon_web_ead.html.erb

@@ -1,7 +1,7 @@
 <% document ||= @document %>
 <% if parsed_files = ead_files(document) %>
   <% aeon_web_ead ||= Arclight::Requests::AeonWebEad.new(document, parsed_files.href) %>
-  <% aeon_web_ead_url = aeon_web_ead.try(:url) %>
+  <% aeon_web_ead_url = aeon_web_ead&.url %>
 
   <%= link_to 'Request', aeon_web_ead_url, class: 'btn btn-secondary btn-sm' %>
 <% end %>

data/app/views/catalog/_index_collection_context_default.html.erb

@@ -4,7 +4,7 @@
     <% if document.children? %>
       <div class="al-toggle-children-container">
         <%= link_to(
-          blacklight_icon(:plus),
+          '',
           "##{document.id}-collapsible-hierarchy",
           class: "al-toggle-view-children #{!show_expanded?(document) ? 'collapsed' : ''}",
           'aria-label': t('arclight.hierarchy.view_all'),

data/app/views/catalog/_search_form.html.erb

@@ -21,7 +21,11 @@
       <% end %>
 
       <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
-      <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q rounded-0 form-control", id: "q", autofocus: presenter.autofocus?, data: { autocomplete_enabled: presenter.autocomplete_enabled?, autocomplete_path: search_action_path(action: :suggest) }  %>
+      <%
+        # Use "autocomplete_path: suggest_index_catalog_path" explicitly so that the RepositoriesController gets the appropriate
+        # autocomplete path w/o having to have the search form action be local to the controller (by including Blacklight::Catalog)
+      %>
+      <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q rounded-0 form-control", id: "q", autofocus: presenter.autofocus?, data: { autocomplete_enabled: presenter.autocomplete_enabled?, autocomplete_path: suggest_index_catalog_path }  %>
 
       <span class="input-group-append">
         <button type="submit" class="btn btn-primary search-btn" id="search">

data/arclight.gemspec

@@ -23,20 +23,21 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'blacklight', '~> 7.2'
-  spec.add_dependency 'blacklight_range_limit', '~> 7.1'
-  spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'sprockets-bumble_d'
+  spec.add_dependency 'blacklight_range_limit', '>= 7.1', '< 9'
+  spec.add_dependency 'rails', '>= 6', '< 7.1'
+  spec.add_dependency 'rexml'
   spec.add_dependency 'traject', '~> 3.0'
-  spec.add_dependency 'traject_plus', '~> 1.2'
+  spec.add_dependency 'traject_plus', '~> 2.0'
 
-  spec.add_development_dependency 'bundler', '> 1.14'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'engine_cart'
   spec.add_development_dependency 'i18n-tasks'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.35'
+  spec.add_development_dependency 'rake', '>= 12.0'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'rubocop', '~> 1.8'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.8'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'

data/lib/arclight/engine.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'sprockets/bumble_d'
 require 'blacklight'
 require 'traject'
 require 'active_model'
@@ -15,13 +14,6 @@ module Arclight
   ##
   # This is the defining class for the Arclight Rails Engine
   class Engine < ::Rails::Engine
-    extend ::Sprockets::BumbleD::DSL
-
-    # We're not sure this is right, but we aren't doing module imports
-    # at the moment anyway
-    register_umd_globals :arclight,
-                         'blacklight' => 'Blacklight'
-
     config.viewer_class = Arclight::Viewers::OEmbed
     config.oembed_resource_exclude_patterns = [/\.pdf$/, /\.ppt$/]
 
@@ -60,7 +52,9 @@ module Arclight
     end
 
     initializer 'arclight.helpers' do
-      ActionView::Base.send :include, ArclightHelper
+      config.after_initialize do
+        ActionView::Base.send :include, ArclightHelper
+      end
     end
   end
 end

data/lib/arclight/repository.rb

@@ -117,8 +117,8 @@ module Arclight
     # @param [String] `slug` or `name` -- same as `find_by`
     # @return [Repository]
     # @raise [ActiveRecord::RecordNotFound] if cannot find repository
-    def self.find_by!(*args)
-      repository = find_by(*args)
+    def self.find_by!(**kwargs)
+      repository = find_by(**kwargs)
       raise ActiveRecord::RecordNotFound if repository.blank?
 
       repository

data/lib/arclight/traject/ead2_config.rb

@@ -5,6 +5,7 @@ require 'traject'
 require 'traject/nokogiri_reader'
 require 'traject_plus'
 require 'traject_plus/macros'
+require 'arclight/exceptions'
 require 'arclight/level_label'
 require 'arclight/normalized_date'
 require 'arclight/normalized_title'

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '0.3.2'
+  VERSION = '0.5.0'
 end

data/lib/generators/arclight/install_generator.rb

@@ -43,9 +43,22 @@ module Arclight
       end
     end
 
-    def assets
+    def copy_styles
       copy_file 'arclight.scss', 'app/assets/stylesheets/arclight.scss'
-      copy_file 'arclight.js', 'app/assets/javascripts/arclight.js'
+    end
+
+    def inject_js
+      inject_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do
+        "\n// Required by Arclight" \
+        "\n//= require arclight/arclight" \
+        "\n//= require stickyfill"
+      end
+    end
+
+    def install_webpacker
+      return unless Rails.version.to_i == 6
+
+      rake 'webpacker:install'
     end
 
     def add_arclight_search_behavior

data/lib/generators/arclight/templates/catalog_controller.rb

@@ -95,6 +95,12 @@ class CatalogController < ApplicationController
     config.add_facet_field 'geogname_sim', label: 'Place', limit: 10
     config.add_facet_field 'places_ssim', label: 'Places', show: false
     config.add_facet_field 'access_subjects_ssim', label: 'Subject', limit: 10
+    config.add_facet_field 'component_level_isim', show: false
+
+    # Note that parent_ssim is an array of all ancestor nodes, including the parent
+    # parent_ssi is just the immediate parent; it's used in queries for context nav
+    config.add_facet_field 'parent_ssim', show: false
+    config.add_facet_field 'parent_ssi', show: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request

data/package.json

@@ -3,10 +3,10 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-external-helpers": "^7.2.0",
-    "@babel/plugin-transform-modules-umd": "^7.2.0",
-    "@babel/preset-env": "^7.5.5"
+    "@babel/core": "^7.18.5",
+    "@babel/plugin-external-helpers": "^7.17.12",
+    "@babel/plugin-transform-modules-umd": "^7.18.0",
+    "@babel/preset-env": "^7.18.2"
   },
   "devDependencies": {
     "eslint": "^3.19.0",

data/solr/conf/schema.xml

@@ -244,8 +244,8 @@
       </analyzer>
     </fieldType>
 
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <!-- A specialized field for geospatial search filters and distance sorting. -->
+    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true" />
 
     <fieldType name="_nest_path_" class="solr.NestPathField" />
 

data/solr/conf/solrconfig.xml

@@ -30,6 +30,7 @@
   -->
   <luceneMatchVersion>8.2.0</luceneMatchVersion>
 
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-gem 'arclight', github: 'sul-dlss/arclight'
+gem 'arclight'
 gem 'blacklight_range_limit', '~> 7.1'
 
 run 'bundle install'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Darren Hardy
 - Jessie Keck
 - Gordon Leacock
 - Jack Reed
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -31,32 +31,44 @@ dependencies:
   name: blacklight_range_limit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: sprockets-bumble_d
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,28 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -157,58 +169,72 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -279,12 +305,12 @@ files:
 - ".babelrc"
 - ".codeclimate.yml"
 - ".eslintrc"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper"
-- ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -317,6 +343,7 @@ files:
 - app/assets/stylesheets/arclight/modules/context_navigation.scss
 - app/assets/stylesheets/arclight/modules/hierarchy_and_online_contents.scss
 - app/assets/stylesheets/arclight/modules/highlights.scss
+- app/assets/stylesheets/arclight/modules/icons.scss
 - app/assets/stylesheets/arclight/modules/layout.scss
 - app/assets/stylesheets/arclight/modules/mastheads.scss
 - app/assets/stylesheets/arclight/modules/repositories.scss
@@ -432,7 +459,6 @@ files:
 - lib/arclight/viewers/oembed.rb
 - lib/arclight/year_range.rb
 - lib/generators/arclight/install_generator.rb
-- lib/generators/arclight/templates/arclight.js
 - lib/generators/arclight/templates/arclight.scss
 - lib/generators/arclight/templates/catalog_controller.rb
 - lib/generators/arclight/templates/config/downloads.yml
@@ -464,7 +490,7 @@ homepage: https://github.com/sul-dlss/arclight
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -479,8 +505,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []

data/.travis.yml

@@ -1,28 +0,0 @@
-sudo: false
-language: ruby
-notifications:
-  email: false
-rvm:
-  - 2.5.5
-  - 2.6.3
-jdk:
-  - openjdk11
-
-before_script:
-  - find spec/fixtures/ead -name '*.xml' | xargs xmllint --noout --schema spec/fixtures/xsd/ead.xsd
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-  - yarn install
-addons:
-  apt:
-    packages:
-    - libxml2-utils
-  chrome: stable
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=0bbc7b5fd7f6bab0c0517183ae34a4d2f6010ca1ef2d1c7c3ccdec55ea823115
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/lib/generators/arclight/templates/arclight.js

@@ -1,2 +0,0 @@
-//= require arclight/arclight
-//= require stickyfill