geoblacklight 4.1.0 → 4.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c26827784f59e0d846384c2bfc37023df7b49a1d15166c727be785966ee4b651
4
- data.tar.gz: daa3337fee9b870746d6a6dec960105e8c0ce0717134f4c0c72de4ace2f7a3d2
3
+ metadata.gz: 8a1c896a4fde70c2232a3c8d4a6bd4f59e619663dc3fc3116145be671f74c71f
4
+ data.tar.gz: b480da7c8835498b2b44c62fb568dc70ab950ebb59d8ac6e759eab6e7bf2b296
5
5
  SHA512:
6
- metadata.gz: 8fc7061cae6dad0d571274626d5329be5d651caf93efaae0403eb3d50527c7d641f814018438bb2f839b4a8a34d7eae247e8b9c1a4356b75c8bdc5c38ed69993
7
- data.tar.gz: 9e8eaad05028d743875646e0b3e35bba917c350a9bdfc79b37ae94fc4c7117e6916bfbcba1a1f6de5c9b725b11b003c8e8ea6d4923eabc8323651e612ed45c9d
6
+ metadata.gz: 2f17b212166b3c8c2018b601009efd700647df054acd9133677cf2f72a46112525e641891f9d78b131d7f8e126bc03d3e3f76e08e1ac517c1f43254ceb949bf3
7
+ data.tar.gz: bdb6e7af5eb182402c1dd3b5d62fb105c602da36e45a867b2d20677bd3eae646af1956cb667be0a425969779123ae42f5c544cd8750e8576af7d7421b678135a
@@ -37,8 +37,8 @@ jobs:
37
37
  runs-on: ubuntu-latest
38
38
  strategy:
39
39
  matrix:
40
- ruby_version: ['3.0', 2.7]
41
- rails_version: [7.0.2.2, 6.1]
40
+ ruby_version: ['3.2', 2.7]
41
+ rails_version: [7.0.2.2]
42
42
  faraday_version: ['>= 2', '~> 1.0']
43
43
 
44
44
  name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}
data/.gitignore CHANGED
@@ -28,3 +28,6 @@ jetty
28
28
  yarn-debug.log*
29
29
  .yarn-integrity
30
30
  yarn.lock
31
+
32
+ # Ignore IDE files
33
+ .idea
data/.solr_wrapper CHANGED
@@ -1,4 +1,3 @@
1
- url: https://archive.apache.org/dist/lucene/solr/8.11.2/solr-8.11.2.tgz
2
1
  validate: false
3
2
  instance_dir: tmp/solr
4
3
  download_dir: tmp/solr
@@ -74,7 +74,7 @@ GeoBlacklight.Basemaps = {
74
74
  }
75
75
  ),
76
76
  openstreetmapStandard: L.tileLayer(
77
- 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
77
+ 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
78
78
  attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
79
79
  maxZoom: 19,
80
80
  worldCopyJump: true,
@@ -76,6 +76,8 @@ module GeoblacklightHelper
76
76
  ##
77
77
  # Returns an SVG icon or empty HTML span element
78
78
  # @return [SVG or HTML tag]
79
+ # standard:disable Style/ArgumentsForwarding
80
+ # TODO: Remove linter disable after lowest supported Ruby version >= 3.2
79
81
  def geoblacklight_icon(name, **args)
80
82
  icon_name = name ? name.to_s.parameterize : "none"
81
83
  begin
@@ -84,6 +86,7 @@ module GeoblacklightHelper
84
86
  tag.span class: "icon-missing geoblacklight-none"
85
87
  end
86
88
  end
89
+ # standard:enable Style/ArgumentsForwarding
87
90
 
88
91
  ##
89
92
  # Looks up properly formatted names for formats
@@ -1,11 +1,36 @@
1
- <div class="modal-header">
2
- <h1><%= t('blacklight.tools.citation') %></h1>
3
- <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
4
- <span aria-hidden="true">&times;</span>
5
- </button>
6
- </div>
7
- <div class="modal-body">
8
- <% @documents&.each do |document| %>
9
- <%= document.geoblacklight_citation(solr_document_url(document)) %>
10
- <% end %>
1
+ <div data-controller="clipboard">
2
+ <div class="modal-header">
3
+ <h1><%= t('blacklight.tools.citation') %></h1>
4
+ <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
5
+ <span aria-hidden="true">&times;</span>
6
+ </button>
7
+ </div>
8
+ <div class="modal-body" data-clipboard-target="source">
9
+ <div class="alert alert-info d-none" role="alert">
10
+ Citation copied to clipboard
11
+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
12
+ <span aria-hidden="true">&times;</span>
13
+ </button>
14
+ </div>
15
+
16
+ <%= t('blacklight.tools.citation_info') %>
17
+ <% @documents&.each do |document| %>
18
+ <%= document.geoblacklight_citation(solr_document_url(document)) %>
19
+ <% end %>
20
+ </div>
21
+ <div class="modal-footer">
22
+ <button type="button" class="btn btn-primary" data-action="copyToClipboard"><%= t('blacklight.modal.copy-citation') %></button>
23
+ <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('blacklight.modal.close') %></button>
24
+ </div>
11
25
  </div>
26
+
27
+ <script>
28
+ $('[data-action="copyToClipboard"]').on('click', function() {
29
+ let text = $('[data-clipboard-target="source"]').text().trim()
30
+ navigator.clipboard.writeText(text)
31
+ .then(() => {
32
+ $('.alert').removeClass('d-none');
33
+ })
34
+ });
35
+ </script>
36
+
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18
18
  spec.required_rubygems_version = ">= 2.5.2"
19
19
 
20
20
  spec.add_dependency "rails", ">= 6.1", "< 7.1"
21
- spec.add_dependency "blacklight", "~> 7.33"
21
+ spec.add_dependency "blacklight", ">= 7.0", "<= 7.33"
22
22
  spec.add_dependency "config"
23
23
  spec.add_dependency "faraday", ">= 1.0"
24
24
  spec.add_dependency "coderay"
@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
38
38
  spec.add_development_dependency "database_cleaner", "~> 1.3"
39
39
  spec.add_development_dependency "simplecov", "~> 0.17.1"
40
40
  spec.add_development_dependency "foreman"
41
- spec.add_development_dependency "standardrb"
41
+ spec.add_development_dependency "standardrb", "1.0.1"
42
42
  spec.add_development_dependency "webmock", "~> 3.14"
43
43
  end
@@ -160,8 +160,8 @@ LEAFLET:
160
160
  INDEX:
161
161
  DEFAULT: &default
162
162
  color: "#7FCDBB"
163
- weight: "1"
164
- radius: "4"
163
+ weight: 1
164
+ radius: 4
165
165
  UNAVAILABLE:
166
166
  <<: *default
167
167
  color: "#EDF8B1"
@@ -232,8 +232,8 @@ LEAFLET:
232
232
  INDEX:
233
233
  DEFAULT: &default
234
234
  color: "#7FCDBB"
235
- weight: "1"
236
- radius: "4"
235
+ weight: 1
236
+ radius: 4
237
237
  UNAVAILABLE:
238
238
  <<: *default
239
239
  color: "#EDF8B1"
@@ -1,8 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # :nocov:
4
+ # standard:disable Lint/RedundantRequireStatement
4
5
  require "faraday"
5
6
  require "set"
7
+ # standard:enable Lint/RedundantRequireStatement
6
8
 
7
9
  module Geoblacklight
8
10
  # NOTE: We copied this class from faraday_middleware in order to support
@@ -45,7 +45,7 @@ module Geoblacklight
45
45
  # Preferred download (should be a file download)
46
46
  # @return [Hash, nil]
47
47
  def preferred_download
48
- return file_download if download.present?
48
+ file_download if download.present?
49
49
  end
50
50
 
51
51
  ##
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Geoblacklight
4
- VERSION = "4.1.0"
4
+ VERSION = "4.1.1"
5
5
  end
@@ -0,0 +1,12 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "spec_helper"
4
+
5
+ feature "Blacklight Citation" do
6
+ scenario "index has created citations" do
7
+ sign_in
8
+ visit "/catalog/princeton-1r66j405w"
9
+ click_link "Cite"
10
+ expect(page).to have_text "Copy Citation"
11
+ end
12
+ end
@@ -4,7 +4,7 @@ require "spec_helper"
4
4
 
5
5
  feature "Layer inspection", js: true do
6
6
  scenario "clicking map should trigger inspection" do
7
- visit solr_document_path("mit-f6rqs4ucovjk2")
7
+ visit solr_document_path("nyu-2451-34564")
8
8
  expect(page).to have_css("th", text: "Attribute")
9
9
  find("#map").click
10
10
  expect(page).not_to have_css("td.default-text")
@@ -10,6 +10,6 @@ feature "saved searches" do
10
10
  expect(page.current_url).to match(/bbox=/)
11
11
  end
12
12
  visit blacklight.search_history_path
13
- expect(page).to have_css "td.query a", text: /#{I18n.t('geoblacklight.bbox_label')}/
13
+ expect(page).to have_css "td.query a", text: /#{I18n.t("geoblacklight.bbox_label")}/
14
14
  end
15
15
  end
@@ -13,11 +13,13 @@ feature "tilejson layer" do
13
13
 
14
14
  scenario "displays tilejson layer", js: true do
15
15
  # Mock tilejson manifest url
16
- stub_request(:get, "https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248")
16
+ stub_request(:get, "https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json")
17
17
  .to_return(status: 200, body: read_fixture("manifests/tilejson.json"))
18
18
 
19
19
  visit solr_document_path("princeton-fk4544658v-tilejson")
20
+
20
21
  expect(page).to have_css ".leaflet-control-zoom", visible: :visible
21
- expect(page).to have_css "img[src*='https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
22
+ expect(page).to have_css "div[data-protocol='Tilejson']"
23
+ expect(page).to have_css "div[data-url='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json']"
22
24
  end
23
25
  end
@@ -42,7 +42,7 @@ feature "web services tools" do
42
42
  click_link "Web services"
43
43
  within ".modal-body" do
44
44
  expect(page).to have_css "label", text: "Web Map Tile Service"
45
- expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248"]'
45
+ expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml"]'
46
46
  end
47
47
  end
48
48
  end
@@ -53,7 +53,7 @@ feature "web services tools" do
53
53
  click_link "Web services"
54
54
  within ".modal-body" do
55
55
  expect(page).to have_css "label", text: "TileJSON Document"
56
- expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248"]'
56
+ expect(page).to have_css 'input[value="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json"]'
57
57
  end
58
58
  end
59
59
  end
@@ -14,12 +14,13 @@ feature "wmts layer" do
14
14
  context "when referencing a WMTSCapabilities document with a single layer" do
15
15
  scenario "displays the layer", js: true do
16
16
  # Mock wmts manifest url
17
- stub_request(:get, "https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248")
17
+ stub_request(:get, "https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml")
18
18
  .to_return(status: 200, body: read_fixture("manifests/wmts-single.xml"))
19
19
 
20
20
  visit solr_document_path("princeton-fk4544658v-wmts")
21
21
  expect(page).to have_css ".leaflet-control-zoom", visible: :visible
22
- expect(page).to have_css "img[src*='map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad']"
22
+ expect(page).to have_css "div[data-protocol='Wmts']"
23
+ expect(page).to have_css "div[data-url='https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml']"
23
24
  end
24
25
  end
25
26
  context "when referencing a WMTSCapabilities document with a multiple layers" do
@@ -29,7 +30,8 @@ feature "wmts layer" do
29
30
  .to_return(status: 200, body: read_fixture("manifests/wmts-multiple.xml"))
30
31
  visit solr_document_path("princeton-fk4db9hn29")
31
32
  expect(page).to have_css ".leaflet-control-zoom", visible: :visible
32
- expect(page).to have_css "img[src*='http://maps1.wien.gv.at/wmts/lb2016/farbe/google3857']"
33
+ expect(page).to have_css "div[data-protocol='Wmts']"
34
+ expect(page).to have_css "div[data-url='https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml']"
33
35
  end
34
36
  end
35
37
  end
@@ -3,7 +3,7 @@
3
3
  "version": "1.0.0",
4
4
  "scheme": "xyz",
5
5
  "tiles": [
6
- "https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&rescale=0%2C255"
6
+ "https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x"
7
7
  ],
8
8
  "minzoom": 8,
9
9
  "maxzoom": 13,
@@ -8,7 +8,7 @@
8
8
  <ows:Operation name="GetCapabilities">
9
9
  <ows:DCP>
10
10
  <ows:HTTP>
11
- <ows:Get xlink:href="https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&amp;rescale=0%2C255">
11
+ <ows:Get xlink:href="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml">
12
12
  <ows:Constraint name="GetEncoding">
13
13
  <ows:AllowedValues>
14
14
  <ows:Value>RESTful</ows:Value>
@@ -21,7 +21,7 @@
21
21
  <ows:Operation name="GetTile">
22
22
  <ows:DCP>
23
23
  <ows:HTTP>
24
- <ows:Get xlink:href="https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&amp;rescale=0%2C255">
24
+ <ows:Get xlink:href="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml">
25
25
  <ows:Constraint name="GetEncoding">
26
26
  <ows:AllowedValues>
27
27
  <ows:Value>RESTful</ows:Value>
@@ -48,7 +48,7 @@
48
48
  <TileMatrixSetLink>
49
49
  <TileMatrixSet>WebMercatorQuad</TileMatrixSet>
50
50
  </TileMatrixSetLink>
51
- <ResourceURL format="image/png" resourceType="tile" template="https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{TileMatrix}/{TileCol}/{TileRow}@1x.png?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&amp;rescale=0%2C255"/>
51
+ <ResourceURL format="image/png" resourceType="tile" template="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tiles/WebMercatorQuad/{TileMatrix}/{TileCol}/{TileRow}@1x.png"/>
52
52
  </Layer>
53
53
  <TileMatrixSet>
54
54
  <ows:Identifier>WebMercatorQuad</ows:Identifier>
@@ -122,5 +122,5 @@
122
122
 
123
123
  </TileMatrixSet>
124
124
  </Contents>
125
- <ServiceMetadataURL xlink:href="https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?url=s3%3A%2F%2Ffiggy-geo-staging%2F2a%2F91%2Fd8%2F2a91d82c541c426cb787cc62afe8f248%2Fmosaic-6c5b32bfe4cb8e4fb07d32cd6656d024.json&amp;rescale=0%2C255"/>
126
- </Capabilities>
125
+ <ServiceMetadataURL xlink:href="https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml"/>
126
+ </Capabilities>
@@ -35,7 +35,7 @@
35
35
  1908
36
36
  ],
37
37
  "gbl_mdModified_dt": "2022-02-03T22:13:40Z",
38
- "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames\":\"https://map-tiles-staging.princeton.edu/mosaicjson/tiles/WebMercatorQuad/{z}/{x}/{y}@1x.png?id=2a91d82c541c426cb787cc62afe8f248\",\"https://github.com/mapbox/tilejson-spec\":\"https://map-tiles-staging.princeton.edu/mosaicjson/tilejson.json?id=2a91d82c541c426cb787cc62afe8f248\"}",
38
+ "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames\":\"https://map-tiles-staging.princeton.edu/mosaicjson/tiles/2a91d82c541c426cb787cc62afe8f248/WebMercatorQuad/{z}/{x}/{y}@1x.png\",\"https://github.com/mapbox/tilejson-spec\":\"https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/tilejson.json\"}",
39
39
  "layer_geom_type_s": "Image",
40
40
  "gbl_resourceClass_sm": [
41
41
  "Maps",
@@ -36,7 +36,7 @@
36
36
  ],
37
37
  "gbl_mdModified_dt": "2022-02-03T22:13:40Z",
38
38
  "gbl_wxsIdentifier_s": "mosaic",
39
- "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248\"}",
39
+ "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://map-tiles-staging.princeton.edu/2a91d82c541c426cb787cc62afe8f248/mosaicjson/WMTSCapabilities.xml\"}",
40
40
  "gbl_resourceClass_sm": [
41
41
  "Maps",
42
42
  "Web services"
data/spec/spec_helper.rb CHANGED
@@ -36,23 +36,19 @@ require "webdrivers"
36
36
  require "webmock/rspec"
37
37
  WebMock.allow_net_connect!(net_http_connect_on_start: true)
38
38
 
39
- Capybara.register_driver(:headless_chrome) do |app|
40
- Capybara::Selenium::Driver.load_selenium
41
- browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
42
- opts.args << "--headless"
43
- opts.args << "--disable-gpu"
44
- opts.args << "--window-size=1280,1024"
45
- end
39
+ Capybara.register_driver(:selenium) do |app|
40
+ browser_options = ::Selenium::WebDriver::Chrome::Options.new(args: %w[headless disable-gpu disable-setuid-sandbox window-size=7680,4320])
41
+
46
42
  http_client = Selenium::WebDriver::Remote::Http::Default.new
47
43
  http_client.read_timeout = 120
48
44
  http_client.open_timeout = 120
49
45
  Capybara::Selenium::Driver.new(app,
50
46
  browser: :chrome,
51
- http_client: http_client,
52
- capabilities: [browser_options])
47
+ options: browser_options,
48
+ http_client: http_client)
53
49
  end
54
50
 
55
- Capybara.javascript_driver = :headless_chrome
51
+ Capybara.javascript_driver = :selenium
56
52
  Capybara.default_max_wait_time = 120
57
53
 
58
54
  require "geoblacklight"
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: 4.1.0
4
+ version: 4.1.1
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: 2023-06-15 00:00:00.000000000 Z
14
+ date: 2023-12-01 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
@@ -37,14 +37,20 @@ dependencies:
37
37
  name: blacklight
38
38
  requirement: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - "~>"
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: '7.0'
43
+ - - "<="
41
44
  - !ruby/object:Gem::Version
42
45
  version: '7.33'
43
46
  type: :runtime
44
47
  prerelease: false
45
48
  version_requirements: !ruby/object:Gem::Requirement
46
49
  requirements:
47
- - - "~>"
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: '7.0'
53
+ - - "<="
48
54
  - !ruby/object:Gem::Version
49
55
  version: '7.33'
50
56
  - !ruby/object:Gem::Dependency
@@ -303,16 +309,16 @@ dependencies:
303
309
  name: standardrb
304
310
  requirement: !ruby/object:Gem::Requirement
305
311
  requirements:
306
- - - ">="
312
+ - - '='
307
313
  - !ruby/object:Gem::Version
308
- version: '0'
314
+ version: 1.0.1
309
315
  type: :development
310
316
  prerelease: false
311
317
  version_requirements: !ruby/object:Gem::Requirement
312
318
  requirements:
313
- - - ">="
319
+ - - '='
314
320
  - !ruby/object:Gem::Version
315
- version: '0'
321
+ version: 1.0.1
316
322
  - !ruby/object:Gem::Dependency
317
323
  name: webmock
318
324
  requirement: !ruby/object:Gem::Requirement
@@ -358,7 +364,6 @@ files:
358
364
  - app/assets/images/blacklight/arizona.svg
359
365
  - app/assets/images/blacklight/arrow-circle-down.svg
360
366
  - app/assets/images/blacklight/baruch-cuny.svg
361
- - app/assets/images/blacklight/berkeley.svg
362
367
  - app/assets/images/blacklight/book.svg
363
368
  - app/assets/images/blacklight/bookmark.svg
364
369
  - app/assets/images/blacklight/cd-rom.svg
@@ -432,6 +437,7 @@ files:
432
437
  - app/assets/images/blacklight/triangle-exclamation-solid.svg
433
438
  - app/assets/images/blacklight/tufts.svg
434
439
  - app/assets/images/blacklight/ucla.svg
440
+ - app/assets/images/blacklight/university-of-california-berkeley.svg
435
441
  - app/assets/images/blacklight/university-of-chicago.svg
436
442
  - app/assets/images/blacklight/university-of-colorado-boulder.svg
437
443
  - app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg
@@ -654,6 +660,7 @@ files:
654
660
  - spec/controllers/wms_controller_spec.rb
655
661
  - spec/factories/user.rb
656
662
  - spec/features/bookmarks_spec.rb
663
+ - spec/features/citations_spec.rb
657
664
  - spec/features/configurable_basemap_spec.rb
658
665
  - spec/features/data_dictionary_download_spec.rb
659
666
  - spec/features/download_layer_spec.rb
@@ -851,7 +858,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
851
858
  - !ruby/object:Gem::Version
852
859
  version: 2.5.2
853
860
  requirements: []
854
- rubygems_version: 3.2.22
861
+ rubygems_version: 3.4.10
855
862
  signing_key:
856
863
  specification_version: 4
857
864
  summary: A discovery platform for geospatial holdings