blacklight 7.43.0 → 7.43.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a6c3e69551f3ec30627ee9af6650769e67b2a3a218e8565ba4f3932ef02847c9
4
- data.tar.gz: 0a6d3a9136156ede88c35a280452e5f2c93b62e94c8b0f242eaa97bff800354e
3
+ metadata.gz: 55824e54437448fdce78c30180ba1ddedefae1360b6e5468b5ec60663e6d1232
4
+ data.tar.gz: a1056d6a5f8bb57da327115f182434285be843daea42d3a8df17c42103894267
5
5
  SHA512:
6
- metadata.gz: f7fec0f4025fa11b4ae1f966f78be6bb7ec3ef3c11226e16741e821fc27d2107e3d33ba251c7158b5c8573d27af97c9eaf7e17fc38e2dd58c01a3729ee32a1ba
7
- data.tar.gz: e38e2cd95019ca902fe5e257d7b9511811c63b646eb919383b807ae7a1d478ae6a6b365361b072f34f2d37187c6cd352afe895ab6c923e6b19f52a18e2e1157f
6
+ metadata.gz: 8b7594ab2fe336dd67f70f13d13cb88c69028f6ef66aaf5363928372c317ac79629c81dc8df9d06f8718f0cdbc2213b2c3e8f5ee58e35b47ab011b49c66798d5
7
+ data.tar.gz: ec233ac4802dc0ce0e7d16d5560311272b69cd8404402e6e02d91bc108808fa680366eb940628ca59988afdc107d6fcba897691433fbfed7c26c6d5a8feb3168
data/.github/matrix.json CHANGED
@@ -47,6 +47,10 @@
47
47
  "rails_version": "8.1.3",
48
48
  "bootstrap_version": "~> 4.0"
49
49
  },
50
+ {
51
+ "ruby": "4.0",
52
+ "rails_version": "8.1.3"
53
+ },
50
54
  {
51
55
  "ruby": "3.3",
52
56
  "rails_version": "7.1.5.1",
@@ -63,7 +67,7 @@
63
67
  {
64
68
  "ruby": "3.3",
65
69
  "rails_version": "7.1.5.1",
66
- "api:": "true",
70
+ "api": "true",
67
71
  "additional_engine_cart_rails_options": "--api --skip-yarn",
68
72
  "additional_name": "| API"
69
73
  }
data/VERSION CHANGED
@@ -1 +1 @@
1
- 7.43.0
1
+ 7.43.2
data/blacklight.gemspec CHANGED
@@ -43,8 +43,9 @@ Gem::Specification.new do |s|
43
43
  s.add_development_dependency 'axe-core-rspec'
44
44
  s.add_development_dependency "capybara", '~> 3'
45
45
  s.add_development_dependency 'selenium-webdriver'
46
- s.add_development_dependency 'engine_cart', '~> 2.1'
46
+ s.add_development_dependency 'engine_cart', '~> 2.7'
47
47
  s.add_development_dependency "equivalent-xml"
48
+ s.add_development_dependency "rexml"
48
49
  s.add_development_dependency "simplecov"
49
50
  s.add_development_dependency "rubocop", '~> 1.66'
50
51
  s.add_development_dependency "rubocop-capybara", '~> 2.21'
@@ -36,7 +36,7 @@ module Blacklight
36
36
  CONTENT
37
37
  end
38
38
  empty_directory 'app/assets/images'
39
- elsif defined?(Sprockets::VERSION) && Sprockets::VERSION >= '4'
39
+ elsif defined?(Sprockets::VERSION) && Sprockets::VERSION >= '4' && !using_importmap?
40
40
  append_to_file 'app/assets/config/manifest.js', "\n//= link application.js"
41
41
  empty_directory 'app/assets/images'
42
42
  end
@@ -86,6 +86,10 @@ module Blacklight
86
86
 
87
87
  private
88
88
 
89
+ def using_importmap?
90
+ File.exist?(File.expand_path('config/importmap.rb', destination_root))
91
+ end
92
+
89
93
  def has_blacklight_assets?
90
94
  application_js.include?('blacklight/blacklight')
91
95
  end
@@ -11,7 +11,10 @@ module Blacklight
11
11
  class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
12
12
  class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
13
13
  class_option :'bootstrap-version', type: :string, default: nil, desc: "Set the generated app's bootstrap version"
14
- class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
14
+ # skip-assets should only happen by default if there's no Sprockets and
15
+ # Jsbundling is defined instead. Should only effect the generator, but this
16
+ # is the setup blacklight_range_limit relies on.
17
+ class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets) && !defined?(Jsbundling).nil?, desc: "Skip generating javascript and css assets into the application"
15
18
  class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
16
19
 
17
20
  desc <<-EOS
@@ -36,7 +36,7 @@ module Blacklight
36
36
 
37
37
  def bundle_install
38
38
  inside destination_root do
39
- Bundler.with_clean_env do
39
+ Bundler.with_unbundled_env do
40
40
  run "bundle install"
41
41
  end
42
42
  end
@@ -25,7 +25,7 @@ module Blacklight
25
25
  gem "devise-guests", "~> 0.8"
26
26
 
27
27
  inside destination_root do
28
- Bundler.with_clean_env do
28
+ Bundler.with_unbundled_env do
29
29
  run "bundle install"
30
30
  end
31
31
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "blacklight-frontend",
3
- "version": "7.43.0",
3
+ "version": "7.43.2",
4
4
  "description": "The frontend code and styles for Blacklight",
5
5
  "main": "app/assets/javascripts/blacklight",
6
6
  "scripts": {
@@ -231,7 +231,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
231
231
  context "when one of the facet items is rendered as nil" do
232
232
  # An app may override render_facet_item to filter out some undesired facet items by returning nil.
233
233
  before do
234
- allow_any_instance_of Blacklight::FacetItemComponent.to receive(:overridden_helper_methods?).and_return(true) # rubocop:disable RSpec/AnyInstance
234
+ allow_any_instance_of(Blacklight::FacetItemComponent).to receive(:overridden_helper_methods?).and_return(true) # rubocop:disable RSpec/AnyInstance
235
235
  allow(helper).to receive(:render_facet_item).and_return('<a class="facet-select">Book</a>'.html_safe, nil)
236
236
  end
237
237
 
data/spec/spec_helper.rb CHANGED
@@ -46,7 +46,7 @@ RSpec.configure do |config|
46
46
  config.disable_monkey_patching!
47
47
 
48
48
  # When we're testing the API, only run the api tests
49
- config.filter_run api: true if ENV['BLACKLIGHT_API_TEST']
49
+ config.filter_run api: true if ENV['BLACKLIGHT_API_TEST'].present?
50
50
 
51
51
  if Rails.version.to_f >= 7.1
52
52
  config.fixture_paths = [Rails.root.join("spec/fixtures")]
@@ -15,7 +15,7 @@ class TestAppGenerator < Rails::Generators::Base
15
15
  run "bundle install"
16
16
  end
17
17
  options = '--devise'
18
- if ENV['BLACKLIGHT_API_TEST']
18
+ if ENV['BLACKLIGHT_API_TEST'].present?
19
19
  options += ' --skip-assets'
20
20
  end
21
21
 
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: 7.43.0
4
+ version: 7.43.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Rochkind
@@ -280,14 +280,14 @@ dependencies:
280
280
  requirements:
281
281
  - - "~>"
282
282
  - !ruby/object:Gem::Version
283
- version: '2.1'
283
+ version: '2.7'
284
284
  type: :development
285
285
  prerelease: false
286
286
  version_requirements: !ruby/object:Gem::Requirement
287
287
  requirements:
288
288
  - - "~>"
289
289
  - !ruby/object:Gem::Version
290
- version: '2.1'
290
+ version: '2.7'
291
291
  - !ruby/object:Gem::Dependency
292
292
  name: equivalent-xml
293
293
  requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,20 @@ dependencies:
302
302
  - - ">="
303
303
  - !ruby/object:Gem::Version
304
304
  version: '0'
305
+ - !ruby/object:Gem::Dependency
306
+ name: rexml
307
+ requirement: !ruby/object:Gem::Requirement
308
+ requirements:
309
+ - - ">="
310
+ - !ruby/object:Gem::Version
311
+ version: '0'
312
+ type: :development
313
+ prerelease: false
314
+ version_requirements: !ruby/object:Gem::Requirement
315
+ requirements:
316
+ - - ">="
317
+ - !ruby/object:Gem::Version
318
+ version: '0'
305
319
  - !ruby/object:Gem::Dependency
306
320
  name: simplecov
307
321
  requirement: !ruby/object:Gem::Requirement
@@ -1034,7 +1048,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1034
1048
  - !ruby/object:Gem::Version
1035
1049
  version: '0'
1036
1050
  requirements: []
1037
- rubygems_version: 4.0.18
1051
+ rubygems_version: 4.0.20
1038
1052
  specification_version: 4
1039
1053
  summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
1040
1054
  index.