blacklight 7.40.0 → 8.0.0.beta1

data/app/javascript/blacklight/autocomplete.js

@@ -1,36 +0,0 @@
-/*global Bloodhound */
-import Bloodhound from 'typeahead.js/dist/bloodhound.js'
-
-Blacklight.onLoad(function() {
-  'use strict';
-
-  $('[data-autocomplete-enabled="true"]').each(function() {
-    var $el = $(this);
-    if($el.hasClass('tt-hint')) {
-      return;
-    }
-    var suggestUrl = $el.data().autocompletePath;
-
-    var terms = new Bloodhound({
-      datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
-      queryTokenizer: Bloodhound.tokenizers.whitespace,
-      remote: {
-        url: suggestUrl + '?q=%QUERY',
-        wildcard: '%QUERY'
-      }
-    });
-
-    terms.initialize();
-
-    $el.typeahead({
-      hint: true,
-      highlight: true,
-      minLength: 2
-    },
-    {
-      name: 'terms',
-      displayKey: 'term',
-      source: terms.ttAdapter()
-    });
-  });
-});

data/app/javascript/blacklight/facet_load.js

@@ -1,22 +0,0 @@
-/*global Blacklight */
-
-'use strict';
-
-Blacklight.doResizeFacetLabelsAndCounts = function() {
-  // adjust width of facet columns to fit their contents
-  function longer (a,b) { return b.textContent.length - a.textContent.length }
-
-  document.querySelectorAll('.facet-values, .pivot-facet').forEach(function(elem){
-    const nodes = elem.querySelectorAll('.facet-count')
-    // TODO: when we drop ie11 support, this can become the spread operator:
-    const longest = Array.from(nodes).sort(longer)[0]
-    if (longest && longest.textContent) {
-      const width = longest.textContent.length + 1 + 'ch'
-      elem.querySelector('.facet-count').style.width = width
-    }
-  })
-}
-
-Blacklight.onLoad(function() {
-  Blacklight.doResizeFacetLabelsAndCounts()
-})

data/app/presenters/blacklight/search_bar_presenter.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Blacklight
-  class SearchBarPresenter
-    extend Deprecation
-    attr_reader :configuration, :view_context, :controller
-
-    # Set the partial this presenter draws
-    class_attribute :partial
-    self.partial = 'catalog/search_form'
-
-    def initialize(controller, configuration = view_context.blacklight_config)
-      @controller = controller
-      @view_context = controller.view_context
-      @configuration = configuration
-    end
-
-    def render
-      view_context.render partial, presenter: self
-    end
-    deprecation_deprecate render: "The SearchBarPresenter has been deprecated. Call `render Blacklight::SearchBarComponent.new' instead"
-
-    ##
-    # @return [Boolean] should autocomplete be enabled in the UI
-    def autocomplete_enabled?
-      configuration.autocomplete_enabled.present? &&
-        configuration.autocomplete_path.present?
-    end
-
-    ##
-    # If no search parameters have been given, we should
-    # auto-focus the user's cursor into the searchbox
-    #
-    # @return [Boolean]
-    def autofocus?
-      configuration.enable_search_bar_autofocus.present? &&
-        configuration.enable_search_bar_autofocus &&
-        controller.is_a?(Blacklight::Catalog) &&
-        controller.action_name == "index" &&
-        !controller.has_search_parameters?
-    end
-
-    def advanced_search_enabled?
-      configuration.advanced_search.enabled
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-<%  # local params:
-    # label
-    # value
-    # options =>
-    #   :remove => url for a remove constraint link
-    #   :classes => array of classes to add to container span
-    options ||= {}
-%>
-
-<%= render(Blacklight::ConstraintLayoutComponent.new(
-      classes: options[:classes],
-      label: label,
-      value: value,
-      remove_path: options[:remove])) %>

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

@@ -1,5 +0,0 @@
-<%= link_to document_action_label(document_action_config.key, document_action_config),
-            document_action_path(document_action_config, (local_assigns.has_key?(:url_opts) ? url_opts : {}).merge(({id: document} if document) || {})),
-            id: document_action_config.fetch(:id, "#{document_action_config.key}Link"),
-            class: 'nav-link',
-            data: {}.merge(({ blacklight_modal: "trigger" } if document_action_config.modal != false) || {}) %>

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

@@ -1,5 +0,0 @@
-<%= render (blacklight_config&.view_config(document_index_view_type)&.facet_group_component || Blacklight::Response::FacetGroupComponent).new(
-  response: @response,
-  id: groupname,
-  fields: facet_field_names(groupname),
-  title: groupname.present? ? t("blacklight.search.facets-#{groupname}.title") : t('blacklight.search.facets.title')) %>

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

@@ -1,3 +0,0 @@
-<%= render(Blacklight::FacetFieldListComponent.new(
-      facet_field: facet_field_presenter(facet_field, display_facet),
-      layout: false)) %>

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

@@ -1 +0,0 @@
-<%= render(Blacklight::DocumentMetadataComponent.new(fields: document_presenter(document).field_presenters)) %>

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

@@ -1,22 +0,0 @@
-<%# header bar for doc items in index view -%>
-<header class="documentHeader row">
-  <%# main title container for doc partial view
-      How many bootstrap columns need to be reserved
-      for bookmarks control depends on size.
-  -%>
-  <% document_actions = capture do %>
-    <% # bookmark functions for items/docs -%>
-    <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
-  <% end %>
-
-  <h3 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
-    <% if counter = document_counter_with_offset(document_counter) %>
-      <span class="document-counter">
-        <%= t('blacklight.search.documents.counter', counter: counter) %>
-      </span>
-    <% end %>
-    <%= link_to_document document, counter: counter %>
-  </h3>
-
-  <%= document_actions %>
-</header>

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

@@ -1,2 +0,0 @@
-<% Deprecation.warn(self, 'The partial _previous_next_doc.html.erb will be removed in 8.0. Render Blacklight::SearchContextComponent instead.') %>
-<%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) %>

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

@@ -1,6 +0,0 @@
-<%= render(
-  Blacklight::DocumentMetadataComponent.new(
-    fields: document_presenter(document).field_presenters,
-    show: true
-  )
-) %>

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

@@ -1,2 +0,0 @@
-<% # bookmark/folder functions -%>
-<%= Deprecation.silence(Blacklight::BlacklightHelperBehavior) { render_document_heading(document, :tag => :h1) } %>

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

@@ -1 +0,0 @@
-<%= render Blacklight::Document::ThumbnailComponent.new(presenter: document_presenter(document), counter: document_counter_with_offset(document_counter)) -%>

data/lib/blacklight/deprecations/engine_configuration.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Blacklight
-  module Deprecations
-    module EngineConfiguration
-      # rubocop:disable Style/RedundantSelf, Style/HashSyntax
-      # @deprecated
-      def bookmarks_http_method
-        self.blacklight.bookmarks_http_method
-      end
-      deprecation_deprecate bookmarks_http_method: 'Moved to `blacklight.bookmarks_http_method`'
-
-      # @deprecated
-      def bookmarks_http_method=(val)
-        self.blacklight.bookmarks_http_method = val
-      end
-      deprecation_deprecate :'bookmarks_http_method=' => 'Moved to `blacklight.bookmarks_http_method=`'
-
-      # @deprecated
-      def email_regexp
-        self.blacklight.email_regexp
-      end
-      deprecation_deprecate email_regexp: 'Moved to `blacklight.email_regexp`'
-
-      # @deprecated
-      def email_regexp=(val)
-        self.blacklight.email_regexp = val
-      end
-      deprecation_deprecate :'email_regexp=' => 'Moved to `blacklight.email_regexp=`'
-
-      # @deprecated
-      def facet_missing_param
-        self.blacklight.facet_missing_param
-      end
-      deprecation_deprecate facet_missing_param: 'Moved to `blacklight.facet_missing_param`'
-
-      # @deprecated
-      def facet_missing_param=(val)
-        self.blacklight.facet_missing_param = val
-      end
-      deprecation_deprecate :'facet_missing_param=' => 'Moved to `blacklight.facet_missing_param=`'
-
-      # @deprecated
-      def sms_mappings
-        self.blacklight.sms_mappings
-      end
-      deprecation_deprecate sms_mappings: 'Moved to `blacklight.sms_mappings`'
-
-      # @deprecated
-      def sms_mappings=(val)
-        self.blacklight.sms_mappings = val
-      end
-      deprecation_deprecate :'sms_mappings=' => 'Moved to `blacklight.sms_mappings=`'
-      # rubocop:enable Style/RedundantSelf, Style/HashSyntax
-
-      def self.deprecate_in(object)
-        class << object
-          extend Deprecation
-          self.deprecation_horizon = 'blacklight 8.0'
-
-          include Blacklight::Deprecations::EngineConfiguration
-        end
-      end
-    end
-  end
-end

data/lib/blacklight/deprecations/search_state_normalization.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Blacklight
-  module Deprecations
-    module SearchStateNormalization
-      extend ActiveSupport::Concern
-
-      class_methods do
-        def facet_params_need_normalization(facet_params)
-          Deprecation.warn(self, 'Calling `facet_params_need_normalization` on the Blacklight::SearchState ' \
-          'class is deprecated and will be removed in Blacklight 8. Delegate to #needs_normalization?(value_params) on the ' \
-          'filter fields of the search state object.')
-
-          facet_params.is_a?(Hash) && facet_params.values.any? { |x| x.is_a?(Hash) }
-        end
-
-        def normalize_facet_params(facet_params)
-          Deprecation.warn(self, 'Calling `normalize_facet_params` on the Blacklight::SearchState ' \
-          'class is deprecated and will be removed in Blacklight 8. Delegate to #normalize(value_params) on the ' \
-          'filter fields of the search state object.')
-
-          facet_params.transform_values { |value| value.is_a?(Hash) ? value.values : value }
-        end
-
-        def normalize_params(untrusted_params = {})
-          Deprecation.warn(self, 'Calling `normalize_params` on the Blacklight::SearchState ' \
-          'class is deprecated and will be removed in Blacklight 8. Call #normalize_params on the ' \
-          'search state object.')
-          params = untrusted_params
-
-          if params.respond_to?(:to_unsafe_h)
-            # This is the typical (not-ActionView::TestCase) code path.
-            params = params.to_unsafe_h
-            # In Rails 5 to_unsafe_h returns a HashWithIndifferentAccess, in Rails 4 it returns Hash
-            params = params.with_indifferent_access if params.instance_of? Hash
-          elsif params.is_a? Hash
-            # This is an ActionView::TestCase workaround for Rails 4.2.
-            params = params.dup.with_indifferent_access
-          else
-            params = params.dup.to_h.with_indifferent_access
-          end
-
-          # Normalize facet parameters mangled by facebook
-          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
-      end
-    end
-  end
-end

data/spec/components/blacklight/header_component_spec.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Blacklight::HeaderComponent, type: :component do
-  before do
-    with_controller_class(CatalogController) do
-      allow(controller).to receive(:current_user).and_return(nil)
-      allow(controller).to receive(:search_action_url).and_return('/search')
-      render
-    end
-  end
-
-  context 'with no slots' do
-    let(:render) { render_inline(described_class.new(blacklight_config: CatalogController.blacklight_config)) }
-
-    it 'draws the topbar' do
-      expect(page).to have_css 'nav.topbar'
-      expect(page).to have_link 'Blacklight', href: '/'
-    end
-  end
-end

data/spec/components/blacklight/icons/icon_component_spec.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Blacklight::Icons::IconComponent, type: :component do
-  subject(:component) { sub_component.new }
-
-  let(:sub_component) do
-    Class.new(described_class) do
-      def self.name
-        'TestIconComponent'
-      end
-    end
-  end
-
-  context 'when no classes are passed in' do
-    subject(:component) { sub_component.new }
-
-    it "renders component" do
-      render_inline(component)
-      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-test_icon']"
-    end
-  end
-
-  context 'when classes are passed in' do
-    subject(:component) { sub_component.new(classes: 'my-icon') }
-
-    it "renders component" do
-      render_inline(component)
-      expect(page).to have_css "span[class='my-icon blacklight-icons blacklight-icons-test_icon']"
-    end
-  end
-
-  context 'when name is passed in' do
-    subject(:component) { sub_component.new(name: 'my-icon') }
-
-    it "renders component" do
-      render_inline(component)
-      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-my-icon']"
-    end
-  end
-end

data/spec/components/blacklight/response/pagination_component_spec.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Blacklight::Response::PaginationComponent, type: :component do
-  let(:render) do
-    with_request_url '/catalog?q=foo' do
-      render_inline(instance)
-    end
-  end
-
-  let(:instance) { described_class.new(response: response) }
-
-  context 'when there are many results' do
-    let(:response) { instance_double(Blacklight::Solr::Response, total: 10, current_page: 5, limit_value: 10_000, total_pages: 100) }
-
-    context 'with default config' do
-      before { render }
-
-      it "has links to deep pages" do
-        expect(page).not_to have_link '98'
-        expect(page).to have_link '99'
-        expect(page).to have_link '100'
-        expect(page).not_to have_link '101'
-      end
-    end
-
-    context 'when a different configuration that removes deep links is passed as a parameter' do
-      let(:instance) { described_class.new(response: response, left: 5, right: 0, outer_window: nil) }
-
-      before { render }
-
-      it "does not link to deep pages" do
-        expect(page).to have_link '1'
-        expect(page).not_to have_link '100'
-      end
-    end
-
-    context 'when a different configuration that removes deep links is configured in the controller' do
-      before do
-        allow(controller.blacklight_config.index)
-          .to receive(:pagination_options)
-          .and_return(theme: 'blacklight', left: 5, right: 0)
-        render
-      end
-
-      it "does not link to deep pages" do
-        expect(page).to have_link '1'
-        expect(page).not_to have_link '100'
-      end
-    end
-  end
-end

data/spec/controllers/blacklight/facet_spec.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Blacklight::Facet do
-  subject do
-    Class.new do
-      include Blacklight::Facet
-      attr_reader :blacklight_config
-
-      def initialize blacklight_config
-        @blacklight_config = blacklight_config
-      end
-    end.new(blacklight_config)
-  end
-
-  let(:blacklight_config) { Blacklight::Configuration.new }
-
-  describe "#facet_configuration_for_field" do
-    it "looks up fields by key" do
-      blacklight_config.add_facet_field 'a'
-      expect(subject.facet_configuration_for_field('a')).to eq blacklight_config.facet_fields['a']
-    end
-
-    it "looks up fields by field name" do
-      blacklight_config.add_facet_field 'a', field: 'b'
-      expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
-    end
-
-    it "supports both strings and symbols" do
-      blacklight_config.add_facet_field 'a', field: :b
-      expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
-    end
-  end
-end

data/spec/controllers/blacklight/search_fields_spec.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Blacklight::SearchFields do
-  around { |test| Deprecation.silence(described_class) { test.call } }
-
-  class MockConfig
-    include Blacklight::SearchFields
-  end
-
-  before(:all) do
-    @config = Blacklight::Configuration.new do |config|
-      config.default_solr_params = { qt: 'search' }
-
-      config.add_search_field 'all_fields', label: 'All Fields'
-      config.add_search_field 'title', qt: 'title_search'
-      config.add_search_field 'author', qt: 'author_search'
-      config.add_search_field 'subject', qt: 'subject_search'
-      config.add_search_field 'no_display', qt: 'something', include_in_simple_select: false
-    end
-  end
-
-  before do
-    @search_field_obj = MockConfig.new
-    allow(@search_field_obj).to receive(:blacklight_config).and_return(@config)
-  end
-
-  it "returns search field list with calculated :label when needed" do
-    @search_field_obj.search_field_list.each do |hash|
-      expect(hash.label).not_to be_blank
-    end
-  end
-
-  describe "for unspecified :key" do
-    before do
-      @bad_config = MockConfig.new
-    end
-
-    it "raises exception on #search_field_list" do
-      expect do
-        allow(@bad_config).to receive(:blacklight_config).and_return(Blacklight::Configuration.new do |config|
-                                                                       config.add_search_field label: 'All Fields', qt: 'all_fields'
-                                                                       config.add_search_field 'title', qt: 'title_search'
-                                                                     end)
-      end.to raise_error ArgumentError
-    end
-  end
-
-  describe "for duplicate keys" do
-    before do
-      @bad_config = MockConfig.new
-    end
-
-    it "raises on #search_field_list" do
-      expect do
-        allow(@bad_config).to receive(:blacklight_config).and_return(Blacklight::Configuration.new do |config|
-                                                                       config.add_search_field 'my_key', label: 'All Fields'
-                                                                       config.add_search_field 'my_key', label: 'title'
-                                                                     end)
-      end.to raise_error RuntimeError
-    end
-  end
-end

data/spec/features/citation_spec.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe 'Citation functionality' do
-  before { visit solr_document_path('2007020969') }
-
-  it 'displays the Cite modal with expected header' do
-    click_link 'Cite'
-    expect(find('div.modal-header')).to have_text 'Cite'
-  end
-end

data/spec/features/sitelinks_search_box_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe 'Sitelinks search box' do
-  it 'is home page' do
-    visit root_path
-    expect(page).to have_selector 'script[type="application/ld+json"]', visible: :hidden
-  end
-
-  it 'on search page' do
-    visit search_catalog_path q: 'book'
-    expect(page).not_to have_selector 'script[type="application/ld+json"]', visible: :hidden
-  end
-end

data/spec/features/sms_spec.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe 'SMS functionality' do
-  before { visit solr_document_path('2007020969') }
-
-  it 'displays SMS modal with form' do
-    click_link 'SMS'
-    expect(find('div.modal-header')).to have_text 'SMS This'
-    fill_in 'Phone Number:', with: '555-555-5555'
-    select 'Verizon', from: 'Carrier'
-  end
-end

data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Blacklight::HashAsHiddenFieldsHelperBehavior do
-  around { |test| Deprecation.silence(described_class) { test.call } }
-
-  let(:params) do
-    { q: "query",
-      search_field: "search_field",
-      per_page: 10,
-      page: 5,
-      extra_arbitrary_key: "arbitrary_value",
-      f: { field1: %w[a b], field2: ["z"] } }
-  end
-  let(:generated) { helper.render_hash_as_hidden_fields(params) }
-
-  it "converts a hash with nested complex data to Rails-style hidden form fields" do
-    allow(Deprecation).to receive(:warn)
-    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: false)
-    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: false)
-  end
-end