blacklight 7.0.1 → 7.1.0.alpha

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.0.1",
+  "version": "7.1.0-alpha",
   "description": "[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {
@@ -17,12 +17,13 @@
   },
   "homepage": "https://github.com/projectblacklight/blacklight#readme",
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "shx": "^0.2.2"
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.2.3",
+    "shx": "^0.3.2"
   },
   "dependencies": {
     "bloodhound-js": "^1.2.3",
-    "bootstrap": "^4.1.3",
+    "bootstrap": "^4.3.1",
     "jquery": "^3.3.1",
     "typeahead.js": "^0.11.1"
   }

data/spec/controllers/bookmarks_controller_spec.rb

@@ -5,6 +5,10 @@ RSpec.describe BookmarksController do
     it 'uses POST requests for querying solr' do
       expect(@controller.blacklight_config.http_method).to eq :post
     end
+
+    it 'opts out of search session tracking' do
+      expect(@controller.blacklight_config.track_search_session).to eq false
+    end
   end
 
   # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead.

data/spec/features/search_formats_spec.rb

@@ -4,14 +4,13 @@ RSpec.describe "Search Formats" do
   it "has an RSS XML response" do
     visit "/catalog.rss?q="
     expect(page).to have_content "Blacklight Search Results"
-    doc = Nokogiri::XML(page.body)
-    expect(doc.xpath("//item")).to have(10).items
+    expect(page).to have_xpath('//item', count: 10)
   end
 
   it "has an ATOM XML response" do
     visit "/catalog.atom?q="
     expect(page).to have_content "Blacklight Search Results"
-    doc = Nokogiri::XML(page.body)
-    expect(doc.xpath("//atom:entry", atom: "http://www.w3.org/2005/Atom")).to have(10).entries
+
+    expect(page).to have_xpath('//entry', count: 10)
   end
 end

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -297,5 +297,10 @@ RSpec.describe Blacklight::UrlHelperBehavior do
       allow(helper.main_app).to receive(:track_test_path).with(id: have_attributes(id: 1), x: 1).and_return('x')
       expect(helper.session_tracking_path(document, x: 1)).to eq 'x'
     end
+
+    it "uses the track_search_session configuration to determine whether to track the search session" do
+      blacklight_config.track_search_session = false
+      expect(helper.session_tracking_path(document, x: 1)).to eq nil
+    end
   end
 end

data/spec/helpers/catalog_helper_spec.rb

@@ -388,8 +388,17 @@ RSpec.describe CatalogHelper do
     end
 
     let(:blacklight_config) { Blacklight::Configuration.new }
-    let(:params) { ActionController::Parameters.new(q: 'foobar', f: { format: ["Book"] }) }
 
-    it { is_expected.to eq "foobar / Format: Book" }
+    context 'when the f param is an array' do
+      let(:params) { ActionController::Parameters.new(q: 'foobar', f: { format: ["Book"] }) }
+
+      it { is_expected.to eq "foobar / Format: Book" }
+    end
+
+    context 'when the f param is not an array' do
+      let(:params) { ActionController::Parameters.new(q: 'foobar', f: { format: 'Book' }) }
+
+      it { is_expected.to eq "foobar / Format: Book" }
+    end
   end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -11,7 +11,8 @@
 RSpec.describe Blacklight::SearchService, api: true do
   subject { service }
 
-  let(:service) { described_class.new(config: blacklight_config, user_params: user_params) }
+  let(:context) { { whatever: :value } }
+  let(:service) { described_class.new(config: blacklight_config, user_params: user_params, **context) }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:user_params) { {} }
 
@@ -485,4 +486,10 @@ RSpec.describe Blacklight::SearchService, api: true do
       expect(service.opensearch_response.last).to match_array %w[A B C]
     end
   end
+
+  describe '#context' do
+    it 'has a context attribute' do
+      expect(subject.context).to eq context
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ require 'rspec/collection_matchers'
 require 'capybara/rspec'
 require 'selenium-webdriver'
 require 'equivalent-xml'
+require 'chromedriver-helper'
 
 Capybara.javascript_driver = :headless_chrome
 

data/spec/views/catalog/_facets.html.erb_spec.rb

@@ -16,23 +16,46 @@ RSpec.describe "catalog/_facets" do
     end
   end
 
-  context "with facet fields" do
+  context "with facet groups" do
     let :facet_field do
-      Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label').normalize!
+      Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: nil).normalize!
     end
 
     before do
       blacklight_config.facet_fields['facet_field_1'] = facet_field
       @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
-      allow(view).to receive_messages(facet_field_names: [:facet_field_1], facet_limit_for: 10)
+      allow(view).to receive_messages(facet_group_names: [nil], facet_field_names: [:facet_field_1], facet_limit_for: 10)
       @response = double
       allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
     end
 
-    it "has a header" do
-      allow(view).to receive_messages(render_facet_partials: '')
-      render
-      expect(rendered).to have_selector('.facets-heading')
+    context "with the default facet group" do
+      it "has a header" do
+        allow(view).to receive_messages(render_facet_partials: '')
+        render
+        expect(rendered).to have_selector('.facets-heading')
+      end
+    end
+
+    context "with a named facet group" do
+      let :facet_field do
+        Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: 'group_1').normalize!
+      end
+
+      before do
+        blacklight_config.facet_fields['facet_field_1'] = facet_field
+        @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
+        allow(view).to receive_messages(facet_group_names: [nil, 'group_1'], facet_field_names: [:facet_field_1], facet_limit_for: 10)
+        @response = double
+        allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
+      end
+
+      it "has a header" do
+        allow(view).to receive_messages(render_facet_partials: '')
+        render
+        expect(rendered).to have_selector('.facets-heading')
+        expect(rendered).to have_selector('#facets-group_1')
+      end
     end
 
     describe "facet display" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0.alpha
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,20 +61,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -197,16 +183,16 @@ dependencies:
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -269,14 +255,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.63.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -369,6 +355,7 @@ files:
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_fields.rb
 - app/controllers/concerns/blacklight/search_history.rb
+- app/controllers/concerns/blacklight/searchable.rb
 - app/controllers/concerns/blacklight/token_based_user.rb
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
@@ -451,6 +438,7 @@ files:
 - app/views/catalog/_document_action.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
+- app/views/catalog/_facet_group.html.erb
 - app/views/catalog/_facet_index_navigation.html.erb
 - app/views/catalog/_facet_layout.html.erb
 - app/views/catalog/_facet_limit.html.erb
@@ -751,9 +739,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6