blacklight 6.21.0 → 7.3.0

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-module Blacklight
-  module Suggest
-    extend ActiveSupport::Concern
-
-    included do
-      include Blacklight::Configurable
-      include Blacklight::SearchHelper
-
-      copy_blacklight_config_from(CatalogController)
-    end
-
-    def index
-      respond_to do |format|
-        format.json do
-          render json: suggestions_service.suggestions
-        end
-      end
-    end
-
-    def suggestions_service
-      Blacklight::SuggestSearch.new(params, repository).suggestions
-    end
-  end
-end

data/app/controllers/saved_searches_controller.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-class SavedSearchesController < ApplicationController
-  include Blacklight::SavedSearches
-end

data/app/controllers/suggest_controller.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-class SuggestController < ApplicationController
-  include Blacklight::Suggest
-end

data/app/helpers/blacklight/deprecated_url_helper_behavior.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-module Blacklight
-  module DeprecatedUrlHelperBehavior
-    extend Deprecation
-    self.deprecation_horizon = 'blacklight 7.x'
-
-    def params_for_search(*args, &block)
-      source_params, params_to_merge = case args.length
-      when 0
-        search_state.params_for_search
-      when 1
-        search_state.params_for_search(args.first)
-      when 2
-        Deprecation.warn(Blacklight::DeprecatedUrlHelperBehavior, 'Use controller.search_state_class.new(source_params).params_for_search instead')
-        controller.search_state_class.new(args.first, blacklight_config).params_for_search(args.last)
-      else
-        raise ArgumentError, "wrong number of arguments (#{args.length} for 0..2)"
-      end
-    end
-    deprecation_deprecate :params_for_search
-
-    def sanitize_search_params(source_params)
-      Blacklight::Parameters.sanitize(source_params)
-    end
-    deprecation_deprecate :sanitize_search_params
-
-    def reset_search_params(source_params)
-      controller.search_state_class.new(source_params, blacklight_config).send(:reset_search_params)
-    end
-    deprecation_deprecate :reset_search_params
-
-    def add_facet_params(field, item, source_params = nil)
-      if source_params
-        Deprecation.warn(Blacklight::DeprecatedUrlHelperBehavior, 'Use controller.search_state_class.new(source_params).add_facet_params instead')
-
-        controller.search_state_class.new(source_params, blacklight_config).add_facet_params(field, item)
-      else
-        search_state.add_facet_params(field, item)
-      end
-    end
-    deprecation_deprecate :add_facet_params
-
-    def remove_facet_params(field, item, source_params = nil)
-      if source_params
-        Deprecation.warn(Blacklight::DeprecatedUrlHelperBehavior, 'Use controller.search_state_class.new(source_params).remove_facet_params instead')
-
-        controller.search_state_class.new(source_params, blacklight_config).remove_facet_params(field, item)
-      else
-        search_state.remove_facet_params(field, item)
-      end
-    end
-    deprecation_deprecate :remove_facet_params
-
-    delegate :add_facet_params_and_redirect, to: :search_state
-    deprecation_deprecate :add_facet_params_and_redirect
-  end
-end

data/app/helpers/blacklight/render_partials_helper.rb

@@ -1,205 +0,0 @@
-# frozen_string_literal: true
-module Blacklight::RenderPartialsHelper
-  ##
-  # Render the document index view
-  #
-  # @param [Array<SolrDocument>] documents list of documents to render
-  # @param [Hash] locals to pass to the render call
-  # @return [String]
-  def render_document_index documents = nil, locals = {}
-    documents ||= @document_list
-    render_document_index_with_view(document_index_view_type, documents, locals)
-  end
-
-  ##
-  # Render the document index for a grouped response
-  def render_grouped_document_index
-    render 'catalog/group_default'
-  end
-
-  ##
-  # Return the list of partials for a given solr document
-  # @param [SolrDocument] doc solr document to render partials for
-  # @param [Array<String>] partials list of partials to render
-  # @param [Hash] locals local variables to pass to the render call
-  # @return [String] 
-  def render_document_partials(doc, partials = [], locals = {})
-    safe_join(partials.map do |action_name|
-      render_document_partial(doc, action_name, locals)
-    end, "\n")
-  end
-
-  ##
-  # Given a doc and a base name for a partial, this method will attempt to render
-  # an appropriate partial based on the document format and view type.
-  #
-  # If a partial that matches the document format is not found,
-  # render a default partial for the base name.
-  #
-  # @see #document_partial_path_templates
-  #
-  # @param [SolrDocument] doc
-  # @param [String] base_name base name for the partial
-  # @param [Hash] locals local variables to pass through to the partials
-  def render_document_partial(doc, base_name, locals = {})
-    format = document_partial_name(doc, base_name)
-
-    view_type = document_index_view_type
-    template = cached_view ['show', view_type, base_name, format].join('_') do
-      find_document_show_template_with_view(view_type, base_name, format, locals)
-    end
-    if template
-      template.render(self, locals.merge(document: doc))
-    else
-      ''
-    end
-  end
-
-  ##
-  # Render the document index for the given view type with the
-  # list of documents.
-  #
-  # This method will interpolate the list of templates with
-  # the current view, and gracefully handles missing templates.
-  #
-  # @see #document_index_path_templates
-  #
-  # @param [String] view type
-  # @param [Array<SolrDocument>] documents list of documents to render
-  # @param [Hash] locals to pass to the render call
-  # @return [String]
-  def render_document_index_with_view view, documents, locals = {}
-    template = cached_view ['index', view].join('_') do
-      find_document_index_template_with_view(view, locals)
-    end
-
-    if template
-      template.render(self, locals.merge(documents: documents))
-    else
-      ''
-    end
-  end
-
-  ##
-  # A list of document partial templates to attempt to render
-  #
-  # @see #render_document_index_with_view
-  # @return [Array<String>]
-  def document_index_path_templates
-    # first, the legacy template names for backwards compatbility
-    # followed by the new, inheritable style
-    # finally, a controller-specific path for non-catalog subclasses
-    @document_index_path_templates ||= [
-      "document_%{index_view_type}",
-      "catalog/document_%{index_view_type}",
-      "catalog/document_list"
-    ]
-  end
-
-  protected
-
-    ##
-    # Return a partial name for rendering a document
-    # this method can be overridden in order to transform the value
-    #   (e.g. 'PdfBook' => 'pdf_book')
-    #
-    # @param [SolrDocument] document
-    # @param [String, Array] display_type a value suggestive of a partial
-    # @return [String] the name of the partial to render
-    # @example
-    #  type_field_to_partial_name(['a book-article'])
-    #  => 'a_book_article'
-    if Rails.version >= '5.0.0'
-      def type_field_to_partial_name(document, display_type)
-        # using "_" as sep. to more closely follow the views file naming conventions
-        # parameterize uses "-" as the default sep. which throws errors
-        underscore = '_'.freeze
-        Array(display_type).join(' '.freeze).tr('-'.freeze, underscore).parameterize(separator: underscore)
-      end
-    else
-      def type_field_to_partial_name(document, display_type)
-        # using "_" as sep. to more closely follow the views file naming conventions
-        # parameterize uses "-" as the default sep. which throws errors
-        underscore = '_'.freeze
-        Array(display_type).join(' '.freeze).tr('-'.freeze, underscore).parameterize(underscore)
-      end
-    end
-
-    ##
-    # Return a normalized partial name for rendering a single document
-    #
-    # @param [SolrDocument] document
-    # @param [Symbol] base_name base name for the partial
-    # @return [String]
-    def document_partial_name(document, base_name = nil)
-      view_config = blacklight_config.view_config(:show)
-
-      display_type = if base_name and view_config.key? :"#{base_name}_display_type_field"
-        document[view_config[:"#{base_name}_display_type_field"]]
-      end
-
-      display_type ||= document[view_config.display_type_field]
-
-      display_type ||= 'default'
-
-      type_field_to_partial_name(document, display_type)
-    end
-
-    ##
-    # A list of document partial templates to try to render for a document
-    #
-    # The partial names will be interpolated with the following variables:
-    #   - action_name: (e.g. index, show)
-    #   - index_view_type: (the current view type, e.g. list, gallery)
-    #   - format: the document's format (e.g. book)
-    #
-    # @see #render_document_partial
-    def document_partial_path_templates
-      # first, the legacy template names for backwards compatbility
-      # followed by the new, inheritable style
-      # finally, a controller-specific path for non-catalog subclasses
-      @partial_path_templates ||= [
-        "%{action_name}_%{index_view_type}_%{format}",
-        "%{action_name}_%{index_view_type}_default",
-        "%{action_name}_%{format}",
-        "%{action_name}_default",
-        "catalog/%{action_name}_%{format}",
-        "catalog/_%{action_name}_partials/%{format}",
-        "catalog/_%{action_name}_partials/default"
-      ]
-    end
-
-  private
-
-    def find_document_show_template_with_view view_type, base_name, format, locals
-      document_partial_path_templates.each do |str|
-        partial = str % { action_name: base_name, format: format, index_view_type: view_type }
-        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
-      nil
-    end
-
-    def find_document_index_template_with_view view, locals
-      document_index_path_templates.each do |str|
-        partial = str % { index_view_type: view }
-        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
-      nil
-    end
-
-    ##
-    # @param key fetches or writes data to a cache, using the given key.
-    # @yield the block to evaluate (and cache) if there is a cache miss
-    def cached_view key
-      @view_cache ||= {}
-      if @view_cache.key?(key)
-        @view_cache[key]
-      else
-        @view_cache[key] = yield
-      end
-    end
-end

data/app/helpers/blacklight_configuration_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module BlacklightConfigurationHelper
-  include Blacklight::ConfigurationHelperBehavior
-end

data/app/helpers/blacklight_url_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module BlacklightUrlHelper
-  include Blacklight::UrlHelperBehavior
-end

data/app/helpers/component_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module ComponentHelper
-  include Blacklight::ComponentHelperBehavior
-end

data/app/helpers/facets_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module FacetsHelper
-  include Blacklight::FacetsHelperBehavior
-end

data/app/helpers/hash_as_hidden_fields_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module HashAsHiddenFieldsHelper
-  include Blacklight::HashAsHiddenFieldsHelperBehavior
-end

data/app/helpers/layout_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module LayoutHelper
-  include Blacklight::LayoutHelperBehavior
-end

data/app/helpers/render_constraints_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module RenderConstraintsHelper
-  include Blacklight::RenderConstraintsHelperBehavior
-end

data/app/helpers/search_history_constraints_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module SearchHistoryConstraintsHelper
-  include Blacklight::SearchHistoryConstraintsHelperBehavior
-end

data/app/helpers/suggest_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module SuggestHelper
-  include Blacklight::SuggestHelperBehavior
-end

data/app/models/concerns/blacklight/solr/document/more_like_this.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module Blacklight::Solr::Document::MoreLikeThis
-  def more_like_this
-    response.more_like(self).map { |doc| self.class.new(doc, response) }
-  end
-end

data/app/views/_user_util_links.html.erb

@@ -1,26 +0,0 @@
-<div class="navbar-right">
-  <ul class="nav navbar-nav">
-    <%= render_nav_actions do |config, action|%>
-      <li><%= action %></li>
-    <% end %>
-  </ul>
-
-  <% if has_user_authentication_provider? %>
-    <ul class="nav navbar-nav">
-      <% if current_user %>
-      <li>
-        <%= link_to t('blacklight.header_links.logout'), destroy_user_session_path %>
-      </li>
-      <% unless current_user.to_s.blank? -%>
-      <li>
-        <%= link_to current_user, edit_user_registration_path %>
-      </li>
-      <% end %>
-      <% else %>
-      <li>
-        <%= link_to t('blacklight.header_links.login'), new_user_session_path %>
-      </li>
-      <% end %>
-      </ul>
-  <% end %>
-</div>

data/app/views/blacklight/nav/_saved_searches.html.erb

@@ -1 +0,0 @@
-<%= link_to t('blacklight.header_links.saved_searches'), blacklight.saved_searches_path %>

data/app/views/catalog/_index_default.html.erb

@@ -1,12 +0,0 @@
-<% doc_presenter = index_presenter(document) %>
-<%# default partial to display solr document fields in catalog index view -%>
-<dl class="document-metadata dl-horizontal dl-invert">
-
-  <% index_fields(document).each do |field_name, field| -%>
-    <% if should_render_index_field? document, field %>
-	    <dt class="blacklight-<%= field_name.parameterize %>"><%= render_index_field_label document, field: field_name %></dt>
-	    <dd class="blacklight-<%= field_name.parameterize %>"><%= doc_presenter.field_value field %></dd>
-    <% end -%>
-  <% end -%>
-
-</dl>

data/app/views/catalog/_show_default.html.erb

@@ -1,10 +0,0 @@
-<% doc_presenter = show_presenter(document) %>
-<%# default partial to display solr document fields in catalog show view -%>
-<dl class="dl-horizontal  dl-invert">
-  <% document_show_fields(document).each do |field_name, field| -%>
-    <% if should_render_show_field? document, field %>
-	    <dt class="blacklight-<%= field_name.parameterize %>"><%= render_document_show_field_label document, field: field_name %></dt>
-	    <dd class="blacklight-<%= field_name.parameterize %>"><%= doc_presenter.field_value field %></dd>
-    <% end -%>
-  <% end -%>
-</dl>

data/app/views/catalog/_thumbnail_default.html.erb

@@ -1,5 +0,0 @@
-<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, {}, :counter => document_counter_with_offset(document_counter)) %>
-<div class="document-thumbnail">
-  <%= tn %>
-</div>  
-<%- end %>

data/app/views/saved_searches/index.html.erb

@@ -1,32 +0,0 @@
-<% @page_title = t('blacklight.saved_searches.page_title', :application_name => application_name) %>
-
-<div id="content" class="col-md-9">
-
-<h2 class='page-heading'><%= t('blacklight.saved_searches.title') %></h2>
-
-<%- if current_or_guest_user.blank? -%>
-  
-  <h3 class='section-heading'><%= t('blacklight.saved_searches.need_login') %></h3>
-  
-<%- elsif @searches.blank? -%>
-  
-  <h3 class='section-heading'><%= t('blacklight.saved_searches.no_searches') %></h3>
-  
-<%- else -%>
-  <p>
-  <%= link_to t('blacklight.saved_searches.clear.action_title'), blacklight.clear_saved_searches_path, :method => :delete, :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>
-  </p>
-
-  <h3 class='section-heading'><%= t('blacklight.saved_searches.list_title') %></h3>
-  <table class="table table-striped">
-  <%- @searches.each do |search| -%>
-    <tr>
-      <td><%= link_to_previous_search(search.query_params) %></td>
-      <td><%= button_to t('blacklight.saved_searches.delete'), blacklight.forget_search_path(search.id), :class => 'btn btn-danger' %></td>
-    </tr>
-  <%- end -%>
-  </table>
-
-<%- end -%>
-
-</div>