blacklight_range_limit 8.3.0 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27dcb701e35e32cec10ac4e6c203264c1fc5681cc7d754af1085eb8c5cf8e82
-  data.tar.gz: 3189accdc1592a669f87e65729d1fc174794db399b847a43d8b354a2597137d1
+  metadata.gz: 510a2e212fd11cacd9e7a83be02dec8ddec4f5e3e551fb64187f022825ae2661
+  data.tar.gz: c7505814e1172ff021da4ecd65fc7085639771138cf557cf6343707cad9ad577
 SHA512:
-  metadata.gz: ec927ebe8aff759c1cd16911203cb65f2687c7df61914ee9a01f51d4469eff66f5b41a51c0a17fbaf6bb838f8b8ca5757f6f4df1f70fd66b662b8d55368e67a2
-  data.tar.gz: 772c9541b39355fd40e9c6c822563864bc02ad944a9fec4a2eaa29bb2ebfec7964c826e1e8462f38c38119aee235179dd969a623764c44800a9c3ca95776e812
+  metadata.gz: 5c6ef8dd3df728ab8790ddb050ab05f4ff1d72053410af3a138891160f9cb00d287d341586463e6e91081ea271f6c2afaa08773420177d3d455f966fa366b789
+  data.tar.gz: 8c91836e3eaa68af79f7192d18a81a1c0d57f3d6f8d49d0a1fa278ffc657dc597bfe01294e12e87f7954972c3a9f47ac1cd8a479a9279292b81d20cb637de791

data/.github/workflows/ruby.yml

@@ -30,6 +30,7 @@ jobs:
         - ruby: '3.0'
           rails_version: '7.0.4.1'
     env:
+      BLACKLIGHT_VERSION: "~> 7.0" # only test on BL 7 for now
       RAILS_VERSION: ${{ matrix.rails_version }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
     steps:

data/Gemfile

@@ -9,6 +9,14 @@ group :test do
   gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 end
 
+# While gemspec allows BL8 and some people are using BL8... the build
+# has never actually passed on BL8 yet. We may choose to run tests on
+# a blacklight version other than the latest allowed by gemspec, to get
+# tests to pass, or to test on older BL still supported here.
+if ENV['BLACKLIGHT_VERSION']
+  gem "blacklight", ENV['BLACKLIGHT_VERSION']
+end
+
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 2.5.0
 # engine_cart stanza: 2.5.0

data/VERSION

@@ -1 +1 @@
-8.3.0
+8.4.0

data/app/components/blacklight_range_limit/range_facet_component.html.erb

@@ -1,9 +1,9 @@
 <%= render(@layout.new(facet_field: @facet_field)) do |component| %>
-  <% component.label do %>
+  <% component.with_label do %>
     <%= @facet_field.label %>
   <% end %>
 
-  <% component.body do %>
+  <% component.with_body do %>
     <div class="limit_content range_limit <%= @facet_field.key %>-config blrl-plot-config">
       <% if @facet_field.selected_range_facet_item %>
         <%= render BlacklightRangeLimit::RangeSegmentsComponent.new(facet_field: @facet_field, facet_items: [@facet_field.selected_range_facet_item], classes: ['current']) %>
@@ -37,7 +37,7 @@
 
         <%= render BlacklightRangeLimit::RangeFormComponent.new(facet_field: @facet_field, classes: @classes) %>
 
-        <%= more_link(key: @facet_field.key, label: @facet_field.label) unless @facet_field.in_modal? %>
+        <%= with_more_link(key: @facet_field.key, label: @facet_field.label) unless @facet_field.in_modal? %>
 
         <% if @facet_field.missing_facet_item && !request.xhr? %>
           <%= render BlacklightRangeLimit::RangeSegmentsComponent.new(facet_field: @facet_field, facet_items: [@facet_field.missing_facet_item], classes: ['missing', 'subsection']) %>

data/blacklight_range_limit.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.license     = 'Apache 2.0'
 
   s.add_dependency 'blacklight', '>= 7.25.2', '< 9'
+  s.add_dependency 'view_component', ">= 2.54", "< 4"
   s.add_dependency 'deprecation'
 
   s.add_development_dependency 'rspec', '~> 3.0'
@@ -28,5 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'solr_wrapper'
   s.add_development_dependency 'engine_cart', '~> 2.1'
   s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
-  s.add_development_dependency 'webdrivers', '~>5.0'
 end

data/spec/components/range_facet_component_spec.rb

@@ -15,7 +15,6 @@ RSpec.describe BlacklightRangeLimit::RangeFacetComponent, type: :component do
     instance_double(
       BlacklightRangeLimit::FacetFieldPresenter,
       key: 'key',
-      html_id: 'id',
       active?: false,
       collapsed?: false,
       in_modal?: false,
@@ -30,7 +29,8 @@ RSpec.describe BlacklightRangeLimit::RangeFacetComponent, type: :component do
       range_config: {},
       modal_path: nil,
       facet_field: facet_config,
-      **facet_field_params
+      **facet_field_params,
+      **extra_facet_field_params
     )
   end
 
@@ -39,6 +39,7 @@ RSpec.describe BlacklightRangeLimit::RangeFacetComponent, type: :component do
   end
 
   let(:facet_field_params) { {} }
+  let(:extra_facet_field_params) { Blacklight::VERSION > '8' ? {} : { html_id: 'id' } }
 
   before do
     allow(component).to receive(:search_facet_path).and_return('/range/key')

data/spec/components/range_form_component_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe BlacklightRangeLimit::RangeFormComponent, type: :component do
   end
 
   let(:facet_field_params) { {} }
+  let(:extra_facet_field_params) { Blacklight::VERSION > '8' ? {} : { html_id: 'id' } }
   let(:selected_range) { nil }
   let(:search_params) { { another_field: 'another_value' } }
 
@@ -19,7 +20,6 @@ RSpec.describe BlacklightRangeLimit::RangeFormComponent, type: :component do
     instance_double(
       BlacklightRangeLimit::FacetFieldPresenter,
       key: 'key',
-      html_id: 'id',
       active?: false,
       collapsed?: false,
       in_modal?: false,
@@ -34,7 +34,8 @@ RSpec.describe BlacklightRangeLimit::RangeFormComponent, type: :component do
       range_config: {},
       modal_path: nil,
       facet_field: facet_config,
-      **facet_field_params
+      **facet_field_params,
+      **extra_facet_field_params
     )
   end
 

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'selenium-webdriver'
-require 'webdrivers'
 
 Capybara.javascript_driver = :headless_chrome
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.4.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -31,6 +31,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.54'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.54'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -157,20 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.13.1
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description:
 email:
 - blacklight-development@googlegroups.com
@@ -293,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Blacklight Range Limit plugin