blacklight 7.13.1 → 7.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fb80459866144384607d4a10514e767df6a91c2b4479056ff249e036872b92
-  data.tar.gz: f21dceeab6bc00811799379c7082af587a019101d570071baa98fa9f1aeb9886
+  metadata.gz: f57c80d2b77a3b8bd0d536f3800fad183aa43d5aec10b71f921dfb23cbb6b26c
+  data.tar.gz: 9748a16edba74f0a1f24b1d6813987196088e1d217dd621b6455ca235aec37be
 SHA512:
-  metadata.gz: 9613e0b9fbfbf15765fd21175c942f3f65c208cfdcaf8ded9158520a44ea507896e7419a53085071badf1e0452071b81d99cd2013cbdb727c85f944e87524fc1
-  data.tar.gz: 684cbee2ba2125ac367445bad68ac18d1d2d437c724ad0f0c6a3ac2648705a933e1edb6631193499b4836035e3c6da5b3528a988e555a34b3f1b529b90429e86
+  metadata.gz: af48c90bc958243c5177660307c059a974c647f27b1fd890061e6efbba253b68d4690e46547b488fee11fe92140db88d39051a0a666e656f478d89e9650fd541
+  data.tar.gz: '019a8e8383aff4582a98a74348c2b40cf7e57aa121213fbd43702c13ff66f2f30c455d43c06dfa0f26c39ebc74f9d34ff40f72b72ed30bdd180384f58deb25cb'

data/VERSION

@@ -1 +1 @@
-7.13.1
+7.13.2

data/app/components/blacklight/facet_field_pagination_component.html.erb

@@ -1,9 +1,9 @@
 <div class="prev_next_links btn-group">
-  <%= link_to_previous_page @facet_field.paginator, raw(t('views.pagination.previous')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
+  <%= @view_context.link_to_previous_page @facet_field.paginator, raw(t('views.pagination.previous')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
     <%= content_tag :span, raw(t('views.pagination.previous')), class: 'disabled btn' %>
   <% end %>
 
-  <%= link_to_next_page @facet_field.paginator, raw(t('views.pagination.next')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link',  data: { blacklight_modal: "preserve" } do %>
+  <%= @view_context.link_to_next_page @facet_field.paginator, raw(t('views.pagination.next')), params: @facet_field.search_state.to_h, param_name: param_name, class: 'btn btn-link',  data: { blacklight_modal: "preserve" } do %>
     <%= content_tag :span, raw(t('views.pagination.next')), class: 'disabled btn' %>
   <% end %>
 </div>
@@ -11,9 +11,9 @@
 <div class="sort-options btn-group">
   <% if @facet_field.paginator.sort == 'index' -%>
     <span class="active az btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.index') %></span>
-    <%= link_to(t('blacklight.search.facets.sort.count'), sort_facet_url('count'), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
+    <%= @view_context.link_to(t('blacklight.search.facets.sort.count'), sort_facet_url('count'), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>
   <% elsif @facet_field.paginator.sort == 'count' -%>
-    <%=  link_to(t('blacklight.search.facets.sort.index'), sort_facet_url('index'), class: "sort_change az btn btn-outline-secondary",  data: { blacklight_modal: "preserve" }) %>
+    <%= @view_context.link_to(t('blacklight.search.facets.sort.index'), sort_facet_url('index'), class: "sort_change az btn btn-outline-secondary",  data: { blacklight_modal: "preserve" }) %>
     <span class="active numeric btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.count') %></span>
   <% end -%>
 </div>

data/app/components/blacklight/search_bar_component.html.erb

@@ -1,27 +1,29 @@
-<%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', 'aria-label' => t('blacklight.search.form.submit') do %>
+<%= form_tag @url, method: @method, class: @classes.join(' '), role: 'search', 'aria-label' => scoped_t('submit') do %>
   <%= render_hash_as_hidden_fields(@params) %>
   <% if @search_fields.length > 1 %>
-    <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
+    <label for="search_field" class="sr-only"><%= scoped_t('search_field.label') %></label>
   <% end %>
   <div class="input-group">
+    <%= prepend %>
+
     <% if @search_fields.length > 1 %>
         <%= select_tag(:search_field,
                        options_for_select(@search_fields, h(@search_field)),
-                       title: t('blacklight.search.form.search_field.title'),
+                       title: scoped_t('search_field.title'),
                        id: "#{@prefix}search_field",
                        class: "custom-select search-field") %>
     <% elsif @search_fields.length == 1 %>
       <%= hidden_field_tag :search_field, @search_fields.first.last %>
     <% end %>
 
-    <label for="<%= @prefix %>q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
-    <%= text_field_tag :q, @q, placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q form-control rounded-#{@search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path }  %>
-
-    <%= content %>
+    <label for="<%= @prefix %><%= @query_param %>" class="sr-only"><%= scoped_t('search.label') %></label>
+    <%= text_field_tag @query_param, @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{@search_fields.length > 1 ? '0' : 'left'}", id: "#{@prefix}q", autocomplete: autocomplete_path.present? ? "off" : "", autofocus: @autofocus, data: { autocomplete_enabled: autocomplete_path.present?, autocomplete_path: autocomplete_path }  %>
 
     <span class="input-group-append">
+      <%= append %>
+
       <button type="submit" class="btn btn-primary search-btn" id="<%= @prefix %>search">
-        <span class="submit-search-text"><%= t('blacklight.search.form.submit') %></span>
+        <span class="submit-search-text"><%= scoped_t('submit') %></span>
         <%= blacklight_icon :search, aria_hidden: true %>
       </button>
     </span>

data/app/components/blacklight/search_bar_component.rb

@@ -2,10 +2,18 @@
 
 module Blacklight
   class SearchBarComponent < ::ViewComponent::Base
+    with_content_areas :append, :prepend
+
     # rubocop:disable Metrics/ParameterLists
-    def initialize(url:, params:, classes: ['search-query-form'], presenter: nil, prefix: '', method: 'GET', q: nil, search_field: nil, search_fields: [], autocomplete_path: nil, autofocus: nil)
+    def initialize(
+      url:, params:, classes: ['search-query-form'], presenter: nil,
+      prefix: '', method: 'GET', q: nil, query_param: :q,
+      search_field: nil, search_fields: [], autocomplete_path: nil,
+      autofocus: nil, i18n: { scope: 'blacklight.search.form' }
+    )
       @url = url
       @q = q || params[:q]
+      @query_param = query_param
       @search_field = search_field || params[:search_field]
       @params = params.except(:q, :search_field, :utf8, :page)
       @prefix = prefix
@@ -15,6 +23,7 @@ module Blacklight
       @autocomplete_path = autocomplete_path
       @autofocus = autofocus
       @search_fields = search_fields
+      @i18n = i18n
     end
     # rubocop:enable Metrics/ParameterLists
 
@@ -47,5 +56,9 @@ module Blacklight
         @view_context.render_hash_as_hidden_fields(*args)
       end
     end
+
+    def scoped_t(key, **args)
+      t(key, default: t(key, scope: 'blacklight.search.form'), **@i18n, **args)
+    end
   end
 end

data/app/controllers/concerns/blacklight/catalog.rb

@@ -133,7 +133,7 @@ module Blacklight::Catalog
   # Check if any search parameters have been set
   # @return [Boolean]
   def has_search_parameters?
-    params[:q].present? || params[:f].present? || params[:search_field].present?
+    params[:search_field].present? || search_state.has_constraints?
   end
 
   # TODO: deprecate this constant with #facet_limit_for
@@ -316,11 +316,11 @@ module Blacklight::Catalog
     # If there are errors coming from the index page, we want to trap those sensibly
 
     if flash[:notice] == flash_notice
-      logger.error "Cowardly aborting rsolr_request_error exception handling, because we redirected to a page that raises another exception"
+      logger&.error "Cowardly aborting rsolr_request_error exception handling, because we redirected to a page that raises another exception"
       raise exception
     end
 
-    logger.error exception
+    logger&.error exception
 
     flash[:notice] = flash_notice
     redirect_to search_action_url

data/app/controllers/concerns/blacklight/search_context.rb

@@ -117,7 +117,7 @@ module Blacklight::SearchContext
       { prev: documents.first, next: documents.last }
     end
   rescue Blacklight::Exceptions::InvalidRequest => e
-    logger.warn "Unable to setup next and previous documents: #{e}"
+    logger&.warn "Unable to setup next and previous documents: #{e}"
     nil
   end
 end

data/app/helpers/blacklight/render_partials_helper_behavior.rb

@@ -173,7 +173,7 @@ module Blacklight::RenderPartialsHelperBehavior
   def find_document_show_template_with_view view_type, base_name, format, locals
     document_partial_path_templates.each do |str|
       partial = format(str, action_name: base_name, format: format, index_view_type: view_type)
-      logger.debug "Looking for document partial #{partial}"
+      logger&.debug "Looking for document partial #{partial}"
       template = lookup_context.find_all(partial, lookup_context.prefixes + [""], true, locals.keys + [:document], {}).first
       return template if template
     end
@@ -183,7 +183,7 @@ module Blacklight::RenderPartialsHelperBehavior
   def find_document_index_template_with_view view_type, locals
     document_index_path_templates.each do |str|
       partial = format(str, index_view_type: view_type)
-      logger.debug "Looking for document index partial #{partial}"
+      logger&.debug "Looking for document index partial #{partial}"
       template = lookup_context.find_all(partial, lookup_context.prefixes + [""], true, locals.keys + [:documents], {}).first
       return template if template
     end

data/app/values/blacklight/types.rb

@@ -23,7 +23,7 @@ module Blacklight
         begin
           ::Date.parse(field)
         rescue ArgumentError
-          Rails.logger.info "Unable to parse date: #{field.first.inspect}"
+          Rails.logger&.info "Unable to parse date: #{field.first.inspect}"
         end
       end
     end

data/lib/blacklight/configuration/fields.rb

@@ -151,7 +151,7 @@ module Blacklight
           repository = repository_class.new(self)
           repository.reflect_fields
         rescue => e
-          Blacklight.logger.warn "Error retrieving field metadata: #{e}"
+          Blacklight.logger&.warn "Error retrieving field metadata: #{e}"
           false
         end
 

data/lib/blacklight/solr/repository.rb

@@ -41,7 +41,7 @@ module Blacklight::Solr
     # @return [boolean] true if the repository is reachable
     def ping
       response = connection.send_and_receive 'admin/ping', {}
-      Blacklight.logger.info("Ping [#{connection.uri}] returned: '#{response['status']}'")
+      Blacklight.logger&.info("Ping [#{connection.uri}] returned: '#{response['status']}'")
       response['status'] == "OK"
     end
 
@@ -63,8 +63,8 @@ module Blacklight::Solr
 
         solr_response = blacklight_config.response_model.new(res, solr_params, document_model: blacklight_config.document_model, blacklight_config: blacklight_config)
 
-        Blacklight.logger.debug("Solr query: #{blacklight_config.http_method} #{path} #{solr_params.to_hash.inspect}")
-        Blacklight.logger.debug("Solr response: #{solr_response.inspect}") if defined?(::BLACKLIGHT_VERBOSE_LOGGING) && ::BLACKLIGHT_VERBOSE_LOGGING
+        Blacklight.logger&.debug("Solr query: #{blacklight_config.http_method} #{path} #{solr_params.to_hash.inspect}")
+        Blacklight.logger&.debug("Solr response: #{solr_response.inspect}") if defined?(::BLACKLIGHT_VERBOSE_LOGGING) && ::BLACKLIGHT_VERBOSE_LOGGING
         solr_response
       end
     rescue Errno::ECONNREFUSED => e

data/lib/blacklight/solr/response.rb

@@ -93,7 +93,7 @@ class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
       value.each { |v| force_to_utf8(v) }
     when String
       if value.encoding != Encoding::UTF_8
-        Blacklight.logger.warn "Found a non utf-8 value in Blacklight::Solr::Response. \"#{value}\" Encoding is #{value.encoding}"
+        Blacklight.logger&.warn "Found a non utf-8 value in Blacklight::Solr::Response. \"#{value}\" Encoding is #{value.encoding}"
         value.dup.force_encoding('UTF-8')
       else
         value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.13.1
+  version: 7.13.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails