arclight 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7808677713ad5aae304dd2839b2ff3a189f8afe33826953ba1dc47266a79a871
-  data.tar.gz: b49f87ca3d6a279d9b511985fb91d4870f817daabde87fd900b251c73ad80805
+  metadata.gz: f51a3a7025a39a90504bd7a9fe679f84a88b1ebc14c3497d16b4a3f0f7919c36
+  data.tar.gz: c39d93f039a1ac4bd05373353d121268801c2eabb097ff16e142b08f155a518d
 SHA512:
-  metadata.gz: 7d9f27aa642ed24bf138d4752c03a81e84f4d29f2551ed0f88dca72acd15e7bd4ecdbcee67d45f5e4e807bb746d735e7017a02f6dfce18baaa0dc83a9d9ec875
-  data.tar.gz: 0d6ba7a004bd76fd849c59b995c2aa6f9a8a87ab6a7495dd3e82bc1a1fd80ac0e67bde12f24c477953bcfc3d67845e3d061a13b09a91c483b0f829f7af6ef6e1
+  metadata.gz: dd10ff42c38f9a1c8c408279182adc4c2c6af1a77ed2d1996435efb43a46d2398064de8e878a552be062cc94c77407734cb5db7992f266baaba77931eab031e7
+  data.tar.gz: 2fea971f65494fccbb43d1bf42ff5ae3da35fd03e13425b1480a7064411ff9dd3cc4bbc8f7cdd2355e58dab2930822e74434732ceab7792ea2112f9d5877bb57

data/.github/workflows/ruby.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rails_version: [5.2.4.3, 6.0.3.2, 6.1.0]
+        ruby: [2.6, 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/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/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/modules/layout.scss

@@ -111,13 +111,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/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/arclight.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'blacklight', '~> 7.2'
   spec.add_dependency 'blacklight_range_limit', '~> 7.1'
-  spec.add_dependency 'rails', '>= 5.2.3', '< 6.1'
+  spec.add_dependency 'rails', '>= 5.2.3', '< 6.2'
   spec.add_dependency 'sprockets-bumble_d'
   spec.add_dependency 'traject', '~> 3.0'
   spec.add_dependency 'traject_plus', '~> 1.2'

data/lib/arclight/version.rb

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

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

@@ -95,6 +95,8 @@ 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
+    config.add_facet_field 'parent_ssim', 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Darren Hardy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -50,7 +50,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-bumble_d
   requirement: !ruby/object:Gem::Requirement
@@ -285,12 +285,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

data/.travis.yml

@@ -1,37 +0,0 @@
-sudo: false
-language: ruby
-notifications:
-  email: false
-
-matrix:
-  include:
-    - rvm: 2.7.1
-      env: RAILS_VERSION=6.0.3.2
-    - rvm: 2.7.1
-      env: RAILS_VERSION=5.2.4.3
-    - rvm: 2.6.6
-      env: RAILS_VERSION=6.0.3.2
-    - rvm: 2.6.6
-      env: RAILS_VERSION=5.2.4.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