blacklight 7.23.0.1 → 7.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7895d66b40843f8b85bc61e5b82adc59d9a4e3b9dbd4e63eed41446f74c790e
-  data.tar.gz: 07d6a7302ee044fbb2a3b866e0f04f57f05319fd769800fcd2703ab6427e2988
+  metadata.gz: 6488b7d6a423e0f783458e7398cce167abd6638fe4b75765dc02480ef5906394
+  data.tar.gz: 1670c1b8631f8c17738216a734e66046459461462d55e0056be52cb19dad8e86
 SHA512:
-  metadata.gz: 28fe2e4ac6ef07980d74fb2ec33c4a4e68b0a9412d3824258b8792df893b4b7466bbf6359a997678a0deb055f9aa364531c1ed72a48e12ad809f56dd2162586b
-  data.tar.gz: 7aea50d06ab5198e186290061bbabbfafe972570d0b2ba05b1f70fc62edf37e92d5e4d8d31297014a9b906ee8654dc7084da9c3e0e84f3d356046b613a05351d
+  metadata.gz: 560fc0c64261c3502a1ca897fdb03d8d242ad08d9619bdc528753f0a39f466f5dd147a21a89baf1779fafc6f0aa84f3f7de12ea51df502a480052686bd5b064f
+  data.tar.gz: 2eb309a4b911bc60dbaa44e2cb81b1c3703531a15274e8e14b3602081d7856b17b9a321307f5b1778363f63ecf6b7a581eed4f283df68b7467fbf6d7be823095

data/VERSION

@@ -1 +1 @@
-7.23.0.1
+7.24.0

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -12,6 +12,7 @@
     cursor: default;
     text-overflow: ellipsis;
     overflow: hidden;
+    white-space: nowrap;
 
     @media (max-width: breakpoint-min(sm)) {
       max-width: breakpoint-min(sm) * .5;

data/app/components/blacklight/response/facet_group_component.html.erb

@@ -22,7 +22,7 @@
   </div>
 
   <%= content_tag :div, id: @panel_id, class: 'facets-collapse collapse' do %>
-    <% Deprecation.silence(Blacklight::FacetsHelperBehavior) do %>
+    <% ::Deprecation.silence(Blacklight::FacetsHelperBehavior) do %>
       <%= helpers.render_facet_partials @fields, response: @response %>
     <% end %>
   <% end %>

data/app/components/blacklight/response/pagination_component.rb

@@ -9,11 +9,11 @@ module Blacklight
       def initialize(response:, html: {}, **pagination_args)
         @response = response
         @html_attr = { aria: { label: t('views.pagination.aria.container_label') } }.merge(html)
-        @pagination_args = { outer_window: 2, theme: 'blacklight' }.merge(pagination_args)
+        @pagination_args = pagination_args
       end
 
       def pagination
-        helpers.paginate @response, **@pagination_args
+        helpers.paginate @response, **Blacklight::Engine.config.blacklight.default_pagination_options, **@pagination_args
       end
     end
   end

data/lib/blacklight/engine.rb

@@ -52,6 +52,13 @@ module Blacklight
 
     bl_global_config.facet_missing_param = '[* TO *]'
 
+    # These options are passed through to the kaminari #paginate helper
+    # https://www.rubydoc.info/gems/kaminari/1.2.2#helpers
+    bl_global_config.default_pagination_options = {
+      theme: 'blacklight',
+      outer_window: 2
+    }
+
     # Anything that goes into Blacklight::Engine.config is stored as a class
     # variable on Railtie::Configuration.  we're going to encapsulate all the
     # Blacklight specific stuff in this single struct:

data/lib/blacklight/runtime_registry.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/per_thread_registry'
-
 module Blacklight
   class RuntimeRegistry
-    extend ActiveSupport::PerThreadRegistry
-
-    attr_accessor :connection, :connection_config
+    thread_mattr_accessor :connection, :connection_config
   end
 end

data/lib/blacklight/search_state.rb

@@ -42,11 +42,8 @@ module Blacklight
       end
 
       # Normalize facet parameters mangled by facebook
-      if params[:f].is_a?(Hash) && params[:f].values.any? { |x| x.is_a?(Hash) }
-        params[:f] = params[:f].transform_values do |value|
-          value.is_a?(Hash) ? value.values : value
-        end
-      end
+      params[:f] = normalize_facet_params(params[:f]) if facet_params_need_normalization(params[:f])
+      params[:f_inclusive] = normalize_facet_params(params[:f_inclusive]) if facet_params_need_normalization(params[:f_inclusive])
 
       params
     end
@@ -251,6 +248,16 @@ module Blacklight
       params[facet_request_keys[:prefix]]
     end
 
+    def self.facet_params_need_normalization(facet_params)
+      facet_params.is_a?(Hash) && facet_params.values.any? { |x| x.is_a?(Hash) }
+    end
+
+    def self.normalize_facet_params(facet_params)
+      facet_params.transform_values do |value|
+        value.is_a?(Hash) ? value.values : value
+      end
+    end
+
     private
 
     def search_field_key

data/spec/lib/blacklight/search_state_spec.rb

@@ -50,10 +50,14 @@ RSpec.describe Blacklight::SearchState do
     end
 
     context 'with facebooks badly mangled query parameters' do
-      let(:params) { { f: { field: { '0': 'first', '1': 'second' } } } }
+      let(:params) do
+        { f: { field: { '0': 'first', '1': 'second' } },
+          f_inclusive: { field: { '0': 'first', '1': 'second' } } }
+      end
 
       it 'normalizes the facets to the expected format' do
         expect(search_state.to_h).to include f: { field: %w[first second] }
+        expect(search_state.to_h).to include f_inclusive: { field: %w[first second] }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.23.0.1
+  version: 7.24.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails