blacklight-hierarchy 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79579c36f70d48f54d5968f3123e636b59dd5bcc267603967a4c161f991d1da8
-  data.tar.gz: c7046b2a00788761b9901cb625f4b845db1d91877cce3c09a07a76751bb84ea3
+  metadata.gz: d7bacf2b0748d1154d75223505d631c5d38edd91a1bb72f514bd0809fb57cce8
+  data.tar.gz: 752c9cb4ba854489493681452862fcbb8dd332d0a1c505c849890f2ae0d85184
 SHA512:
-  metadata.gz: 0e26f0a52342f53fe9e06c1c253dd46a44dbc2cce4590edeafe978e410b71f0471e2ec70b65844a5cd0bf3b1e30ae8e0be25c0733be739dd6f7508f0d16afc0b
-  data.tar.gz: 11d377fc4e98d6a7352b4db13c85d8ac3431531604ce55ed1185b2c2c7291f7e4df771954f3e3ddbfce73ed551212843416b4c0fecdd61d289eb8455e9ad387a
+  metadata.gz: baf85f7b64a20872faa888b8513d82b469757325a0da6dfa597f653f8040059413cb42f8a9cd8ec41636529a335b4c7247173a16447d85ee1f81adee91ae6a07
+  data.tar.gz: 966af183ac26d3db3346018af9bff71e714d5dbc22af73664fc4bab5d8eba816cec2c564408c4dd050685c1cc14d52f13b09c14b50d98c3f5e4495174490cb29

data/.github/workflows/ruby.yml

@@ -0,0 +1,53 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  test_rails5:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+      env:
+        RAILS_VERSION: 5.2.4.2
+    - name: Run tests
+      run: bundle exec rake ci
+      env:
+        RAILS_VERSION: 5.2.4.2
+        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'

data/app/components/blacklight/hierarchy/facet_field_component.rb

@@ -26,7 +26,7 @@ module Blacklight
 
       def qfacet_selected?
         config = helpers.facet_configuration_for_field(field_name)
-        helpers.search_state.has_facet?(config, value: item.qvalue)
+        helpers.search_state.filter(config).include?(item.qvalue)
       end
     end
   end

data/app/helpers/blacklight/hierarchy_helper.rb

@@ -1,6 +1,8 @@
 require 'deprecation'
 
 module Blacklight::HierarchyHelper
+  extend Deprecation
+
   # Putting bare HTML strings in a helper sucks. But in this case, with a
   # lot of recursive tree-walking going on, it's an order of magnitude faster
   # than either render(:partial) or content_tag
@@ -8,27 +10,29 @@ module Blacklight::HierarchyHelper
     item = data[:_]
     subset = data.reject { |k, _v| !k.is_a?(String) }
 
-    li_class = subset.empty? ? 'h-leaf' : 'h-node'
-    id = SecureRandom.uuid
-    ul = ''
-    li = ''
-    li << facet_toggle_button(field_name, id) if subset.any?
-    li << if item.nil?
-            key
-          elsif qfacet_selected?(field_name, item)
-            render_selected_qfacet_value(field_name, item)
-          else
-            render_qfacet_value(field_name, item, id: id)
-          end
-
-    unless subset.empty?
-      subul = subset.keys.sort.collect do |subkey|
-        render_facet_hierarchy_item(field_name, subset[subkey], subkey)
-      end.join('')
-      ul = "<ul role=\"group\">#{subul}</ul>".html_safe
-    end
+    Deprecation.silence(Blacklight::HierarchyHelper) do
+      li_class = subset.empty? ? 'h-leaf' : 'h-node'
+      id = SecureRandom.uuid
+      ul = ''
+      li = ''
+      li << facet_toggle_button(field_name, id) if subset.any?
+      li << if item.nil?
+              key
+            elsif qfacet_selected?(field_name, item)
+              render_selected_qfacet_value(field_name, item)
+            else
+              render_qfacet_value(field_name, item, id: id)
+            end
+
+      unless subset.empty?
+        subul = subset.keys.sort.collect do |subkey|
+          render_facet_hierarchy_item(field_name, subset[subkey], subkey)
+        end.join('')
+        ul = "<ul role=\"group\">#{subul}</ul>".html_safe
+      end
 
-    %(<li class="#{li_class}" role="treeitem">#{li.html_safe}#{ul.html_safe}</li>).html_safe
+      %(<li class="#{li_class}" role="treeitem">#{li.html_safe}#{ul.html_safe}</li>).html_safe
+    end
   end
   deprecation_deprecate :render_facet_hierarchy_item
 
@@ -54,10 +58,12 @@ module Blacklight::HierarchyHelper
   deprecation_deprecate :render_hierarchy
 
   def render_qfacet_value(facet_solr_field, item, options = {})
-    id = options.delete(:id)
-    facet_config = facet_configuration_for_field(facet_solr_field)
-    path_for_facet = facet_item_presenter(facet_config, item.qvalue, facet_solr_field).href
-    (link_to_unless(options[:suppress_link], item.value, path_for_facet, id: id, class: 'facet_select') + ' ' + render_facet_count(item.hits)).html_safe
+    Deprecation.silence(Blacklight::FacetsHelperBehavior) do
+      id = options.delete(:id)
+      facet_config = facet_configuration_for_field(facet_solr_field)
+      path_for_facet = facet_item_presenter(facet_config, item.qvalue, facet_solr_field).href
+      (link_to_unless(options[:suppress_link], item.value, path_for_facet, id: id, class: 'facet_select') + ' ' + render_facet_count(item.hits)).html_safe
+    end
   end
   deprecation_deprecate :render_qfacet_value
 

data/blacklight-hierarchy.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  # A version of blacklight with view_component is required
-  s.add_dependency 'blacklight', '~> 7.9'
+  s.add_dependency 'blacklight', '~> 7.13'
   s.add_dependency 'rails', '>= 5.1', '< 7'
   s.add_dependency 'deprecation'
 

data/lib/blacklight/hierarchy/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Hierarchy
-    VERSION = '4.2.1'.freeze
+    VERSION = '4.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-hierarchy
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Michael B. Klein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.9'
+        version: '7.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.9'
+        version: '7.13'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Hierarchical Facets for Blacklight