geoblacklight 3.1.0 → 3.2.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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +26 -22
  3. data/bin/coverage.rb +2 -2
  4. data/geoblacklight.gemspec +2 -3
  5. data/lib/generators/geoblacklight/templates/catalog_controller.rb +1 -0
  6. data/lib/geoblacklight/version.rb +1 -1
  7. data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
  8. data/spec/views/catalog/_show_tools.html.erb_spec.rb +1 -1
  9. data/template.rb +2 -2
  10. metadata +7 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5f7188aa67f1fd402b335987b7c0d53bc1ee7b60a21c5334253aad774eb850f1
4
- data.tar.gz: 413aae55a53d966894b419a8b55b90834fff753554d6cf1cef1141ab0a65a560
3
+ metadata.gz: e2e3a858e92e8bb0af8d6cfbb3ca9861cb55102d64ca24e73511924dde247c8d
4
+ data.tar.gz: 63a4a7e376f0ffc2e420c3dcaa0fada82063e9b5da4993bc4bdf2925b21a8147
5
5
  SHA512:
6
- metadata.gz: c27ca9af470f01f6b6c9bf71d9043a1e8c5a92423c3118780d064b241b6277d085d0a20a2d06e8e68b477f0255fb4868a45efbb1a6393a5ac4e90ff787bddf40
7
- data.tar.gz: 7002c3644d74f9a53595a359723c0d3a91a5e7d3311e22ed2c8dbf005d10ae1c86653d9f2e810dd019aa097eec085ccf354e8ce245f81b54855e3c6fe5e10671
6
+ metadata.gz: f3c1db766c32f1e62bf6d269b21ff72850c7f1472192e22b12d116374e150d00ba88d9b493bc89b774b9c7a5a5ba3471254224ebfea294479a6b9eed8dd4a686
7
+ data.tar.gz: 5a2e07a485de06230e6e5ae5fc03bb5b31e66fad43bf3e9f77769e3eff99ee16ab9812fc98af9359aabd5e18ed4d085af748a25870bd0c226e07beb11b349689
data/.circleci/config.yml CHANGED
@@ -10,10 +10,10 @@ commands:
10
10
  default: "8-6-2020-A"
11
11
  ruby_version:
12
12
  type: string
13
- default: '2.7.1'
13
+ default: '2.7.2'
14
14
  rails_version:
15
15
  type: string
16
- default: '6.0.3.2'
16
+ default: '6.0.3.4'
17
17
  steps:
18
18
  - restore_cache:
19
19
  keys:
@@ -29,10 +29,10 @@ commands:
29
29
  default: "8-6-2020-A"
30
30
  ruby_version:
31
31
  type: string
32
- default: '2.7.1'
32
+ default: '2.7.2'
33
33
  rails_version:
34
34
  type: string
35
- default: '6.0.3.2'
35
+ default: '6.0.3.4'
36
36
  steps:
37
37
  - save_cache:
38
38
  key: << parameters.cache_prefix >>-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
@@ -44,13 +44,13 @@ jobs:
44
44
  parameters:
45
45
  ruby_version:
46
46
  type: string
47
- default: '2.7.1'
47
+ default: '2.7.2'
48
48
  solr_port:
49
49
  type: string
50
50
  default: '8983'
51
51
  rails_version:
52
52
  type: string
53
- default: '6.0.3.2'
53
+ default: '6.0.3.4'
54
54
  coverage:
55
55
  type: boolean
56
56
  default: false
@@ -132,10 +132,10 @@ jobs:
132
132
  parameters:
133
133
  ruby_version:
134
134
  type: string
135
- default: '2.7.1'
135
+ default: '2.7.2'
136
136
  rails_version:
137
137
  type: string
138
- default: '6.0.3.2'
138
+ default: '6.0.3.4'
139
139
  docker:
140
140
  - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
141
141
  environment:
@@ -160,10 +160,10 @@ jobs:
160
160
  parameters:
161
161
  ruby_version:
162
162
  type: string
163
- default: '2.7.1'
163
+ default: '2.7.2'
164
164
  rails_version:
165
165
  type: string
166
- default: '6.0.3.2'
166
+ default: '6.0.3.4'
167
167
  docker:
168
168
  - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
169
169
  environment:
@@ -196,21 +196,25 @@ workflows:
196
196
  build:
197
197
  jobs:
198
198
  - build:
199
- ruby_version: 2.7.1
200
- rails_version: 6.0.3.2
199
+ ruby_version: 2.7.2
200
+ rails_version: 6.1.0
201
+ name: "ruby2-7_rails6-1"
202
+ - build:
203
+ ruby_version: 2.7.2
204
+ rails_version: 6.0.3.4
201
205
  coverage: true
202
206
  name: "ruby2-7_rails6-0"
203
207
  - build:
204
208
  ruby_version: 2.6.6
205
- rails_version: 6.0.3.2
209
+ rails_version: 6.0.3.4
206
210
  name: "ruby2-6_rails6-0"
207
211
  - build:
208
- ruby_version: 2.7.1
209
- rails_version: 5.2.4.3
212
+ ruby_version: 2.7.2
213
+ rails_version: 5.2.4.4
210
214
  name: "ruby2-7_rails5-2"
211
215
  - build:
212
216
  ruby_version: 2.6.6
213
- rails_version: 5.2.4.3
217
+ rails_version: 5.2.4.4
214
218
  name: "ruby2-6_rails5-2"
215
219
  - rubocop:
216
220
  requires:
@@ -228,21 +232,21 @@ workflows:
228
232
  - master
229
233
  jobs:
230
234
  - build:
231
- ruby_version: 2.7.1
232
- rails_version: 6.0.3.2
235
+ ruby_version: 2.7.2
236
+ rails_version: 6.0.3.4
233
237
  coverage: true
234
238
  name: "ruby2-7_rails6-0"
235
239
  - build:
236
240
  ruby_version: 2.6.6
237
- rails_version: 6.0.3.2
241
+ rails_version: 6.0.3.4
238
242
  name: "ruby2-6_rails6-0"
239
243
  - build:
240
- ruby_version: 2.7.1
241
- rails_version: 5.2.4.3
244
+ ruby_version: 2.7.2
245
+ rails_version: 5.2.4.4
242
246
  name: "ruby2-7_rails5-2"
243
247
  - build:
244
248
  ruby_version: 2.6.6
245
- rails_version: 5.2.4.3
249
+ rails_version: 5.2.4.4
246
250
  name: "ruby2-6_rails5-2"
247
251
  - rubocop:
248
252
  requires:
data/bin/coverage.rb CHANGED
@@ -27,8 +27,8 @@ class SimpleCovHelper
27
27
  results = SimpleCov::ResultMerger.merge_results(*results)
28
28
  results.format!
29
29
  covered_percent = results.covered_percent.round(2)
30
- return unless covered_percent < SimpleCov.minimum_coverage[:line]
31
- $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage[:line])
30
+ return unless covered_percent < SimpleCov.minimum_coverage
31
+ $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage)
32
32
  Kernel.exit SimpleCov::ExitCodes::MINIMUM_COVERAGE
33
33
  end
34
34
  end
data/geoblacklight.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.require_paths = ['lib']
20
20
  spec.required_rubygems_version = '>= 2.5.2'
21
21
 
22
- spec.add_dependency 'rails', '>= 5.2.4', '< 6.1'
22
+ spec.add_dependency 'rails', '>= 5.2.4', '< 6.2'
23
23
  spec.add_dependency 'blacklight', '~> 7.0'
24
24
  spec.add_dependency 'config'
25
25
  spec.add_dependency 'faraday', '~> 1.0'
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
29
29
  spec.add_dependency 'geo_combine', '~> 0.4'
30
30
  spec.add_dependency 'mime-types'
31
31
  spec.add_dependency 'handlebars_assets'
32
- spec.add_dependency 'webpacker', '~> 4.0'
33
32
 
34
33
  spec.add_development_dependency 'solr_wrapper'
35
34
  spec.add_development_dependency 'rails-controller-testing'
@@ -40,7 +39,7 @@ Gem::Specification.new do |spec|
40
39
  spec.add_development_dependency 'factory_bot_rails'
41
40
  spec.add_development_dependency 'database_cleaner', '~> 1.3'
42
41
  spec.add_development_dependency 'bixby'
43
- spec.add_development_dependency 'simplecov', '~> 0.16'
42
+ spec.add_development_dependency 'simplecov', '~> 0.17.1'
44
43
  spec.add_development_dependency 'foreman'
45
44
  spec.add_development_dependency 'teaspoon'
46
45
  end
data/lib/generators/geoblacklight/templates/catalog_controller.rb CHANGED
@@ -97,6 +97,7 @@ class CatalogController < ApplicationController
97
97
  config.add_facet_field Settings.FIELDS.RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
98
98
  config.add_facet_field Settings.FIELDS.GEOM_TYPE, label: 'Data type', limit: 8, partial: "icon_facet"
99
99
  config.add_facet_field Settings.FIELDS.FILE_FORMAT, :label => 'Format', :limit => 8
100
+ config.add_facet_field Settings.FIELDS.SOURCE, show: false
100
101
 
101
102
  # Have BL send all facet field names to Solr, which has been the default
102
103
  # previously. Simply remove these lines if you'd rather use Solr request
data/lib/geoblacklight/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Geoblacklight
3
- VERSION = '3.1.0'
3
+ VERSION = '3.2.0'
4
4
  end
data/spec/test_app_templates/lib/generators/test_app_generator.rb CHANGED
@@ -16,7 +16,7 @@ class TestAppGenerator < Rails::Generators::Base
16
16
  gem 'blacklight'
17
17
  gem 'teaspoon'
18
18
  gem 'teaspoon-jasmine'
19
- gem 'webpacker'
19
+ gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
20
20
  Bundler.with_clean_env do
21
21
  run 'bundle install'
22
22
  end
data/spec/views/catalog/_show_tools.html.erb_spec.rb CHANGED
@@ -17,7 +17,7 @@ describe 'catalog/_show_tools.html.erb', type: :view do
17
17
 
18
18
  it 'renders a document action' do
19
19
  allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
20
- document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
20
+ document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
21
21
  render partial: 'catalog/show_tools'
22
22
  expect(rendered).to have_link 'Some action', href: 'x'
23
23
  end
data/template.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
  gem 'blacklight', '~> 7.0'
3
- gem 'geoblacklight', '~> 2.0'
4
- gem 'webpacker'
3
+ gem 'geoblacklight', '~> 3.0'
4
+ gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
5
5
 
6
6
  # Hack for https://github.com/rails/rails/issues/35153
7
7
  # Adapted from https://github.com/projectblacklight/blacklight/pull/2065
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geoblacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Graves
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2020-08-19 00:00:00.000000000 Z
14
+ date: 2021-02-04 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -22,7 +22,7 @@ dependencies:
22
22
  version: 5.2.4
23
23
  - - "<"
24
24
  - !ruby/object:Gem::Version
25
- version: '6.1'
25
+ version: '6.2'
26
26
  type: :runtime
27
27
  prerelease: false
28
28
  version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 5.2.4
33
33
  - - "<"
34
34
  - !ruby/object:Gem::Version
35
- version: '6.1'
35
+ version: '6.2'
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: blacklight
38
38
  requirement: !ruby/object:Gem::Requirement
@@ -159,20 +159,6 @@ dependencies:
159
159
  - - ">="
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
- - !ruby/object:Gem::Dependency
163
- name: webpacker
164
- requirement: !ruby/object:Gem::Requirement
165
- requirements:
166
- - - "~>"
167
- - !ruby/object:Gem::Version
168
- version: '4.0'
169
- type: :runtime
170
- prerelease: false
171
- version_requirements: !ruby/object:Gem::Requirement
172
- requirements:
173
- - - "~>"
174
- - !ruby/object:Gem::Version
175
- version: '4.0'
176
162
  - !ruby/object:Gem::Dependency
177
163
  name: solr_wrapper
178
164
  requirement: !ruby/object:Gem::Requirement
@@ -305,14 +291,14 @@ dependencies:
305
291
  requirements:
306
292
  - - "~>"
307
293
  - !ruby/object:Gem::Version
308
- version: '0.16'
294
+ version: 0.17.1
309
295
  type: :development
310
296
  prerelease: false
311
297
  version_requirements: !ruby/object:Gem::Requirement
312
298
  requirements:
313
299
  - - "~>"
314
300
  - !ruby/object:Gem::Version
315
- version: '0.16'
301
+ version: 0.17.1
316
302
  - !ruby/object:Gem::Dependency
317
303
  name: foreman
318
304
  requirement: !ruby/object:Gem::Requirement
@@ -802,7 +788,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
802
788
  - !ruby/object:Gem::Version
803
789
  version: 2.5.2
804
790
  requirements: []
805
- rubygems_version: 3.1.2
791
+ rubygems_version: 3.1.4
806
792
  signing_key:
807
793
  specification_version: 4
808
794
  summary: A discovery platform for geospatial holdings