blacklight 6.20.0 → 6.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +4 -4
  3. data/Gemfile +2 -0
  4. data/VERSION +1 -1
  5. data/app/helpers/blacklight/layout_helper_behavior.rb +7 -0
  6. data/app/views/layouts/blacklight.html.erb +2 -2
  7. data/blacklight.gemspec +1 -1
  8. data/solr/conf/schema.xml +0 -2
  9. data/spec/features/search_spec.rb +6 -2
  10. data/spec/helpers/layout_helper_spec.rb +10 -0
  11. data/spec/spec_helper.rb +2 -12
  12. metadata +8 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 469ca5ef4136d32bb5afe11a51dc7eeec97c6b0eded26f0e2d1a9c607fa175a1
4
- data.tar.gz: 7061a8348a91417bffdacb4f7f508e3f1cba134d754ca1cbbe33743229e09e31
3
+ metadata.gz: 481b96adfac07b1cb0009bc9969f299a3a5bab9f519b38c5f0b0f1ccd7a45ec6
4
+ data.tar.gz: 0c237ece3ec9a48dfd7ddfa45086ca64c807bef013f5f2a0357f47bebe84b0be
5
5
  SHA512:
6
- metadata.gz: 6427d562139eb605f5bd5e53d61a9f13abb2a1c35430fc20e21fc8e3a3035f8b7c6c2a9f8b72449db2a6478410a64cd1031ed7e17e42611ceb3be0ebe1b65fa9
7
- data.tar.gz: c0a27859a10d9c1a97bc2f16794d000b407704146f543aec1acd77fe714626e4ce6cc8e2d93be9d7d066ddb4bccf2faaf84107d5dc9e9266f69c3fcb9bec8566
6
+ metadata.gz: b94d6eb3e43c0fa7d5144370f43e3990491e5014977258782a775939bc12610b5fd7aa1c5521e3bbfb51785f652ca1fb8afdefd9f88ed078f56fdf3130152f20
7
+ data.tar.gz: 7dfc79605ae0f1763eed7322273dcdb1b66c9655c94522a5795dc9d122c412fb855aac1ecc43f43bc9b0eb7a0a037c494769f4265b4bfa2418ccef6305583c2a
data/.travis.yml CHANGED
@@ -1,4 +1,4 @@
1
- dist: trusty
1
+ dist: bionic
2
2
  addons:
3
3
  chrome: stable
4
4
  language: ruby
@@ -8,11 +8,11 @@ notifications:
8
8
  email: false
9
9
 
10
10
  rvm:
11
- - 2.5.0
11
+ - 2.5.7
12
12
 
13
13
  matrix:
14
14
  include:
15
- - rvm: 2.5.0
15
+ - rvm: 2.5.7
16
16
  env: "RAILS_VERSION=5.2.0"
17
17
  - rvm: 2.4.4
18
18
  env: "RAILS_VERSION=4.2.10"
@@ -50,4 +50,4 @@ global_env:
50
50
  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
51
51
  - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
52
52
 
53
- jdk: oraclejdk8
53
+ jdk: openjdk11
data/Gemfile CHANGED
@@ -32,6 +32,8 @@ else
32
32
  end
33
33
 
34
34
  case ENV['RAILS_VERSION']
35
+ when /^5.[12]/
36
+ gem 'sass-rails', '~> 5.0'
35
37
  when /^4.2/
36
38
  gem 'responders', '~> 2.0'
37
39
  gem 'sass-rails', '>= 5.0'
data/VERSION CHANGED
@@ -1 +1 @@
1
- 6.20.0
1
+ 6.21.0
data/app/helpers/blacklight/layout_helper_behavior.rb CHANGED
@@ -11,6 +11,13 @@ module Blacklight
11
11
  "#{main_content_classes} show-document"
12
12
  end
13
13
 
14
+ ##
15
+ # Attributes to add to the <html> tag (e.g. lang and dir)
16
+ # @return [Hash]
17
+ def html_tag_attributes
18
+ { lang: I18n.locale }
19
+ end
20
+
14
21
  ##
15
22
  # Classes added to a document's sidebar div
16
23
  # @return [String]
data/app/views/layouts/blacklight.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <html lang="en" class="no-js">
2
+ <%= content_tag :html, class: 'no-js', **html_tag_attributes do %>
3
3
  <head>
4
4
  <meta charset="utf-8">
5
5
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -41,4 +41,4 @@
41
41
 
42
42
  <%= render :partial => 'shared/footer' %>
43
43
  </body>
44
- </html>
44
+ <% end %>
data/blacklight.gemspec CHANGED
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
40
40
  s.add_development_dependency "rspec-its"
41
41
  s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
42
42
  s.add_development_dependency "capybara", '>= 2', '< 4'
43
- s.add_development_dependency 'chromedriver-helper', '< 2.0.0' # 2.1.0 is causing "Unable to find chromedriver" on Travis
43
+ s.add_development_dependency 'webdrivers', '~> 3.0'
44
44
  s.add_development_dependency "selenium-webdriver", '>= 3.13.1'
45
45
  s.add_development_dependency 'engine_cart', '~> 2.1'
46
46
  s.add_development_dependency "equivalent-xml"
data/solr/conf/schema.xml CHANGED
@@ -308,7 +308,6 @@
308
308
  <analyzer>
309
309
  <tokenizer class="solr.StandardTokenizerFactory"/>
310
310
  <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
311
- <filter class="solr.StandardFilterFactory"/>
312
311
  <filter class="solr.LowerCaseFilterFactory"/>
313
312
  <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
314
313
  </analyzer>
@@ -317,7 +316,6 @@
317
316
  <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
318
317
  <analyzer>
319
318
  <tokenizer class="solr.KeywordTokenizerFactory"/>
320
- <filter class="solr.StandardFilterFactory"/>
321
319
  <filter class="solr.LowerCaseFilterFactory"/>
322
320
  <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
323
321
  </analyzer>
data/spec/features/search_spec.rb CHANGED
@@ -1,6 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- describe "Search Page" do
3
+ RSpec.describe "Search Page" do
4
+ it 'declares the page language in the html lang attribute' do
5
+ visit root_path
6
+ expect(page).to have_selector('html[lang=en]')
7
+ end
8
+
4
9
  it "shows welcome" do
5
10
  visit root_path
6
11
  expect(page).to have_selector("input#q")
@@ -116,4 +121,3 @@ describe "Search Page" do
116
121
  expect(page).to have_content "No results found for your search"
117
122
  end
118
123
  end
119
-
data/spec/helpers/layout_helper_spec.rb CHANGED
@@ -35,4 +35,14 @@ describe LayoutHelper do
35
35
  expect(helper.container_classes).to eq 'container'
36
36
  end
37
37
  end
38
+
39
+ describe '#html_tag_attributes' do
40
+ before do
41
+ allow(I18n).to receive(:locale).and_return('x')
42
+ end
43
+
44
+ it 'returns the current locale as the lang' do
45
+ expect(helper.html_tag_attributes).to include lang: 'x'
46
+ end
47
+ end
38
48
  end
data/spec/spec_helper.rb CHANGED
@@ -25,20 +25,10 @@ require 'rspec/rails'
25
25
  require 'rspec/its'
26
26
  require 'rspec/collection_matchers'
27
27
  require 'capybara/rspec'
28
- require 'selenium-webdriver'
28
+ require 'webdrivers'
29
29
  require 'equivalent-xml'
30
30
 
31
- Capybara.javascript_driver = :headless_chrome
32
-
33
- Capybara.register_driver :headless_chrome do |app|
34
- capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
35
- chromeOptions: { args: %w[headless disable-gpu] }
36
- )
37
-
38
- Capybara::Selenium::Driver.new(app,
39
- browser: :chrome,
40
- desired_capabilities: capabilities)
41
- end
31
+ Capybara.javascript_driver = :selenium_chrome_headless
42
32
 
43
33
  # Requires supporting ruby files with custom matchers and macros, etc,
44
34
  # in spec/support/ and its subdirectories.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.20.0
4
+ version: 6.21.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
17
17
  autorequire:
18
18
  bindir: exe
19
19
  cert_chain: []
20
- date: 2019-03-11 00:00:00.000000000 Z
20
+ date: 2019-11-08 00:00:00.000000000 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: rails
@@ -234,19 +234,19 @@ dependencies:
234
234
  - !ruby/object:Gem::Version
235
235
  version: '4'
236
236
  - !ruby/object:Gem::Dependency
237
- name: chromedriver-helper
237
+ name: webdrivers
238
238
  requirement: !ruby/object:Gem::Requirement
239
239
  requirements:
240
- - - "<"
240
+ - - "~>"
241
241
  - !ruby/object:Gem::Version
242
- version: 2.0.0
242
+ version: '3.0'
243
243
  type: :development
244
244
  prerelease: false
245
245
  version_requirements: !ruby/object:Gem::Requirement
246
246
  requirements:
247
- - - "<"
247
+ - - "~>"
248
248
  - !ruby/object:Gem::Version
249
- version: 2.0.0
249
+ version: '3.0'
250
250
  - !ruby/object:Gem::Dependency
251
251
  name: selenium-webdriver
252
252
  requirement: !ruby/object:Gem::Requirement
@@ -784,8 +784,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
784
784
  - !ruby/object:Gem::Version
785
785
  version: '0'
786
786
  requirements: []
787
- rubyforge_project:
788
- rubygems_version: 2.7.6
787
+ rubygems_version: 3.0.3
789
788
  signing_key:
790
789
  specification_version: 4
791
790
  summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)