blacklight-hierarchy 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26cd69f479cdeed50d1d81525856bb1aaa30f4b308865b4560ec27623d331a6c
-  data.tar.gz: 1f8fadf9e59ac9dbcf4713bfa86084cb0ef19616bd2c4d1d0c5d400bbc34cdb0
+  metadata.gz: '0087020faf523fb8671351fa18c62b7d4f2bd09f254b24564a5a5d7aac9d5593'
+  data.tar.gz: 6ffb7349402eea8340d105cc747d95d0089c94a552700f5f1106cb6fb069173a
 SHA512:
-  metadata.gz: 2f7525164912a4e448138ee84f6e911ada7430d140ccce9525ab665bff85fed658e4552cb22d6c4a98c5f8a72aa18bf14e829482c75d1988143911ecc8b954dc
-  data.tar.gz: 9a799edaa82ababdd09a754d7d737d18005ff24c356a76d5ddbe9e6632935d9e7d8091522d683043f46c960ad18f56ae84ab15968c2e3e2c6e22091e5cf5d805
+  metadata.gz: 66d064cea30098266d2276b2806775a348250f8f1eb9bd27958018502589dbd6402bf18273ab1cd034e85a6747ef0fa74aee88e93d0d1bda71552284c656d192
+  data.tar.gz: 685bd238b6bec0f0c41d2b3bbd831111734c3b472f5949e8f27b90f13ffa3c387784d486b617b4cab07ba5b16e490bd6584c94b0c20e557f0c0479a5697107d3

data/.github/workflows/ruby.yml

@@ -18,18 +18,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.2", "3.3"]
-        rails_version: ["7.1.3.4", "7.2.0"]
-        blacklight_version: ["7.38.0"]
+        ruby: ["3.3", "3.4"]
+        rails_version: ["7.2.2.1", "8.0.2"]
+        blacklight_version: ["8.8.4"]
         include:
-          - ruby: "3.1"
-            rails_version: "6.1.7.8"
           - ruby: "3.2"
-            rails_version: "7.0.8.4"
+            rails_version: "7.1.3.4"
           - ruby: "3.3"
             rails_version: "7.1.3.4"
-            name: "Blacklight 8.3"
-            blacklight_version: "8.3.0"
+            name: "Blacklight 7"
+            blacklight_version: "7.38.0"
     env:
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
     steps:
@@ -39,8 +37,6 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: latest
-      - name: Change permissions
-        run: "chmod -f -R o-w /opt/hostedtoolcache/Ruby/3.2.5/x64/lib/ruby/gems/3.2.0/gems | :"
       - name: Install dependencies
         run: bundle install
         env:
@@ -49,4 +45,4 @@ jobs:
         run: bundle exec rake ci
         env:
           RAILS_VERSION: ${{ matrix.rails_version }}
-          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-coffee --skip-test"
+          ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test -a propshaft --css=bootstrap"

data/README.md

@@ -146,3 +146,10 @@ $ npm publish
 - WRITE TESTS
 - Switch internal facet management from hack-y Hash to `Blacklight::Hierarchy::FacetGroup` class (already implemented, but not plumbed up)
 - Clarify when suffix is applied/required/etc.
+
+## Developing gem
+- Clone locally `git@github.com:sul-dlss/blacklight-hierarchy.git`
+- go into project directory `cd blacklight-hierarchy`
+- install dependencies `bundle install`
+- Create a test app to develop and test against `bundle exec rake engine_cart:generate
+- Run tests `bundle exec rspec`

data/app/models/blacklight/hierarchy/facet_tree.rb

@@ -28,6 +28,8 @@ module Blacklight
               path = facet_item.value.split(split_regex)
               loc = tree[facet_field]
               loc = loc[path.shift] ||= {} while path.length > 0
+              raise(StandardError, "Expected non-empty array after splitting facet value. Original facet value: '#{facet_item.value}'") unless facet_item.value.split(split_regex).present?
+
               loc[:_] = HierarchicalFacetItem.new(facet_item.value, facet_item.value.split(split_regex).last, facet_item.hits)
             end
           end

data/blacklight-hierarchy.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'blacklight', '>= 7.18', '< 9'
-  s.add_dependency 'rails', '>= 6.1', '< 7.3'
+  s.add_dependency 'rails', '>= 7.1', '< 9'
   s.add_dependency 'deprecation'
 
   s.add_development_dependency 'rsolr'

data/lib/blacklight/hierarchy/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Hierarchy
-    VERSION = '6.4.0'.freeze
+    VERSION = '6.5.0'.freeze
   end
 end

data/spec/models/blacklight/hierarchy/facet_tree_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+RSpec.describe Blacklight::Hierarchy::FacetTree do
+  let(:prefix) { 'lc' }
+  let(:facet_display) { { hierarchy: { 'lc' => [['facet'], ':'] } } }
+  let(:display_facet) do
+    instance_double(Blacklight::Solr::Response::Facets::FacetField, name: 'lc_facet', items:, limit: 1001, sort: :index, offset: 0, prefix: nil)
+  end
+  let(:items) do
+    [
+      Blacklight::Solr::Response::Facets::FacetItem.new(label: ':', value: ':', hits: 100),
+      Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works', value: 'A - General Works', hits: 5),
+      Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works:AC - Collections Works', value: 'A - General Works:AC - Collections Works', hits: 4)
+    ]
+  end
+  let(:facet_field) do
+    instance_double(
+      Blacklight::FacetFieldPresenter,
+      display_facet:,
+      key: 'lc_facet',
+      label: 'Classification'
+    )
+  end
+  context 'with only valid items' do
+    let(:items) do
+      [
+        Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works', value: 'A - General Works', hits: 5),
+        Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works:AC - Collections Works', value: 'A - General Works:AC - Collections Works', hits: 4)
+      ]
+    end
+    it 'creates HierarchicalFacetItems' do
+      facet_tree = described_class.build(prefix:, facet_display:, facet_field:)
+      expect(facet_tree['lc_facet'].size).to eq(1)
+      expect(facet_tree['lc_facet'].keys.first).to eq('A - General Works')
+      expect(facet_tree['lc_facet']['A - General Works'].keys).to match_array([:_, 'AC - Collections Works'])
+      expect(facet_tree['lc_facet']['A - General Works'][:_]).to be_an_instance_of(HierarchicalFacetItem)
+    end
+  end
+
+
+  context 'with an invalid item' do
+    let(:items) do
+      [
+        Blacklight::Solr::Response::Facets::FacetItem.new(label: ':', value: ':', hits: 100),
+        Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works', value: 'A - General Works', hits: 5),
+        Blacklight::Solr::Response::Facets::FacetItem.new(label: 'A - General Works:AC - Collections Works', value: 'A - General Works:AC - Collections Works', hits: 4)
+      ]
+    end
+
+    it 'raises an error' do
+      expect do
+        described_class.build(prefix:, facet_display:, facet_field:)
+      end.to raise_error(StandardError, "Expected non-empty array after splitting facet value. Original facet value: ':'")
+    end
+  end
+
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-hierarchy
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Michael B. Klein
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -36,20 +35,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -180,13 +179,13 @@ files:
 - package.json
 - spec/features/basic_spec.rb
 - spec/helpers/hierarchy_helper_spec.rb
+- spec/models/blacklight/hierarchy/facet_tree_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: https://github.com/sul-dlss/blacklight-hierarchy
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,13 +200,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Hierarchical Facets for Blacklight
 test_files:
 - spec/features/basic_spec.rb
 - spec/helpers/hierarchy_helper_spec.rb
+- spec/models/blacklight/hierarchy/facet_tree_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb