geoblacklight 2.4.0 → 3.3.0

data/spec/features/search_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Search' do

data/spec/features/show_page_metadata_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Metadata display on show page' do

data/spec/features/sms_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'SMS tool', js: true do

data/spec/features/split_view.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Index view', js: true do
@@ -9,7 +10,7 @@ feature 'Index view', js: true do
   scenario 'should have documents and map on page' do
     visit search_catalog_path(f: { Settings.FIELDS.PROVENANCE => ['Stanford'] })
     expect(page).to have_css('#documents')
-    expect(page).to have_css('.document', count: 5)
+    expect(page).to have_css('.document', count: 6)
     expect(page).to have_css('#map')
   end
 
@@ -51,7 +52,7 @@ feature 'Index view', js: true do
   end
 
   scenario 'click on a record area to expand collapse' do
-    within('.documentHeader', match: :first) do
+    within('article', match: :first) do
       expect(page).not_to have_css('.collapse')
       find('button').click
       expect(page).to have_css('.collapse', visible: true)

data/spec/features/suppressed_records_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'Suppressed records' do

data/spec/features/tms_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+feature 'tms layer' do
+  scenario 'displays tms layer', js: true do
+    visit solr_document_path('6f47b103-9955-4bbe-a364-387039623106')
+    expect(page).to have_css '.leaflet-control-zoom', visible: true
+    expect(page).to have_css "img[src*='earthquake.usgs.gov']"
+  end
+end

data/spec/features/web_services_modal_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 feature 'web services tools' do

data/spec/fixtures/solr_documents/multiple-downloads.json

@@ -0,0 +1,30 @@
+{
+  "geoblacklight_version": "1.0",
+  "dc_identifier_s": "https://cugir.library.cornell.edu/catalog/cugir-007950",
+  "dc_title_s": "Test record with additional download formats",
+  "dc_description_s": "This is a test record containing new-style references as nested child documents.  In addition to the origianl shapefile download, the references section contains additional PDF and KMZ downloads.",
+  "dc_rights_s": "Public",
+  "dct_provenance_s": "Cornell",
+  "dct_references_s": "{\"http:\/\/schema.org\/downloadUrl\":[{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http:\/\/www.opengis.net\/cat\/csw\/csdgm\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.xml\",\"http:\/\/www.w3.org\/1999\/xhtml\":\"https:\/\/cugir-data.s3.amazonaws.com\/00\/79\/50\/fgdc.html\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wfs\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wfs\",\"http:\/\/www.opengis.net\/def\/serviceType\/ogc\/wms\":\"https:\/\/cugir.library.cornell.edu\/geoserver\/cugir\/wms\"}",
+  "layer_id_s": "cugir007950",
+  "layer_slug_s": "cugir-007950",
+  "dc_type_s": "Dataset",
+  "dc_format_s": "Shapefile",
+  "layer_geom_type_s": "Polygon",
+  "layer_modified_dt": "2019-05-24T00:00:00Z",
+  "dc_creator_sm": [
+    "Cornell Institute for Resource Information Sciences (Cornell IRIS)",
+    "NYS Department of Agriculture and Markets"
+  ],
+  "dc_subject_sm": [
+    "New York State Agricultural District boundaries",
+    "Agriculture and Markets",
+    "Agricultural Districts Mapping Program"
+  ],
+  "dct_spatial_sm": ["Broome County NY"],
+  "dct_issued_s": "2011-02-28",
+  "dct_temporal_sm": ["2011"],
+  "dct_isPartOf_sm": ["Agricultural Districts (NYS Ag and Markets)"],
+  "solr_geom": "ENVELOPE(-76.12987, -75.42034, 42.414648, 41.997963)",
+  "solr_year_i": 2011
+}

data/spec/fixtures/solr_documents/public_iiif_princeton.json

@@ -16,7 +16,7 @@
     "Rogers, Henry Darwin",
     "Pownall, Thomas"
   ],
-  "dct_references_s": "{\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\",\"http://schema.org/thumbnailUrl\":\"https://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/full/50,/0/default.jpg\",\"http://iiif.io/api/image\":\"https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/info.json\"}",
+  "dct_references_s": "{\"http://schema.org/url\":\"http://arks.princeton.edu/ark:/88435/02870w62c\",\"http://schema.org/thumbnailUrl\":\"https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/!200,150/0/default.jpg\",\"http://iiif.io/api/image\":\"https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json\"}",
   "dct_spatial_sm": [
     "New York (State)",
     "New Jersey",

data/spec/fixtures/solr_documents/tms.json

@@ -0,0 +1,29 @@
+{
+  "dc_identifier_s": "6f47b103-9955-4bbe-a364-387039623106",
+  "dc_title_s": "Quaternary Fault and Fold Database of the United States",
+  "dc_description_s": "Quaternary Fault and Fold Database of the United States",
+  "dc_rights_s": "Public",
+  "dct_provenance_s": "Stanford",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}",
+  "layer_slug_s": "6f47b103-9955-4bbe-a364-387039623106",
+  "layer_geom_type_s": "Polyline",
+  "dc_format_s": "Shapefile",
+  "dc_language_s": "English",
+  "dc_type_s": "Dataset",
+  "dc_publisher_s": "Geological Survey (U.S.)",
+  "dc_subject_sm": [
+    "Earthquakes",
+    "Faults"
+  ],
+  "dct_issued_s": "2020",
+  "dct_temporal_sm": [
+    "2020"
+  ],
+  "dct_spatial_sm": [
+    "Earth (Planet)",
+    "North America"
+  ],
+  "solr_geom": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)",
+  "solr_year_i": 2020,
+  "geoblacklight_version": "1.0"
+}

data/spec/helpers/arcgis_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe ArcgisHelper, type: :helper do

data/spec/helpers/carto_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe CartoHelper, type: :helper do

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe GeoblacklightHelper, type: :helper do
@@ -8,7 +9,7 @@ describe GeoblacklightHelper, type: :helper do
     let(:subject_field) { Settings.FIELDS.SUBJECT }
     it 'contains unique links' do
       expect(self).to receive(:search_catalog_path).exactly(3).times.and_return("http://example.com/catalog?f[#{subject_field}][]=category")
-      html = Capybara.string(render_facet_links(subject_field, %w(Test Test Earth Science)))
+      html = Capybara.string(render_facet_links(subject_field, %w[Test Test Earth Science]))
       expect(html).to have_css 'a', count: 3
       expect(html).to have_css 'a', text: 'Test', count: 1
       expect(html).to have_css 'a', text: 'Earth', count: 1
@@ -52,6 +53,17 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
+  describe '#download_link_file' do
+    let(:label) { 'Test Link Text' }
+    let(:id) { 'test-id' }
+    let(:url) { 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip' }
+
+    it 'generates a link to download the original file' do
+      puts download_link_file(label, id, url)
+      expect(download_link_file(label, id, url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" class="btn btn-default download download-original" data-download="trigger" data-download-type="direct" data-download-id="test-id" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
+    end
+  end
+
   describe '#download_link_direct' do
     let(:text) { 'Test Link Text' }
     let(:references_field) { Settings.FIELDS.REFERENCES }
@@ -185,7 +197,7 @@ describe GeoblacklightHelper, type: :helper do
     context 'as a multivalued Array' do
       let(:document_attributes) do
         {
-          value: %w(short description)
+          value: %w[short description]
         }
       end
       it 'uses both values' do
@@ -204,9 +216,9 @@ describe GeoblacklightHelper, type: :helper do
       allow(helper).to receive(:application_name).and_return('GeoBlacklight')
     end
 
-    describe '#cartodb_link' do
+    describe '#carto_link' do
       it 'aliases CartoHelper#carto_link' do
-        expect(helper.cartodb_link('http://demo.org/wfs/layer.json')).to eq(helper.carto_link('http://demo.org/wfs/layer.json'))
+        expect(helper.carto_link('http://demo.org/wfs/layer.json')).to eq(helper.carto_link('http://demo.org/wfs/layer.json'))
       end
     end
   end
@@ -240,7 +252,7 @@ describe GeoblacklightHelper, type: :helper do
 
   describe '#render_value_as_truncate_abstract' do
     context 'with multiple values' do
-      let(:document) { SolrDocument.new(value: %w(short description)) }
+      let(:document) { SolrDocument.new(value: %w[short description]) }
       it 'wraps in correct DIV class' do
         expect(helper.render_value_as_truncate_abstract(document)).to eq '<div class="truncate-abstract">short description</div>'
       end
@@ -328,15 +340,62 @@ describe GeoblacklightHelper, type: :helper do
   end
 
   describe '#relations_icon' do
-    it 'renders a goemetry type if configured' do
-      allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(true)
-      html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
-      expect(html.title.strip).to eq 'Polygon'
-    end
-    it 'renders provided icon if not configured to use geometry' do
-      allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(false)
-      html = Capybara.string(helper.relations_icon({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
-      expect(html.title.strip).to eq 'Leaf'
+    context 'when configured to use the geometry type' do
+      before do
+        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(true)
+      end
+
+      it 'renders a goemetry type as the icon' do
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
+        expect(html.title.strip).to eq 'Polygon'
+      end
+
+      it 'has the svg_tooltip class so that the Bootstrap tooltip is applied' do
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
+        expect(html).to have_css('.blacklight-icons.svg_tooltip')
+      end
+    end
+
+    context 'when not confiugred to use the geometry type' do
+      before do
+        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(false)
+      end
+
+      it 'renders the provided icon' do
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
+        expect(html.title.strip).to eq 'Leaf'
+      end
+
+      it 'does not have the svg_tooltip class' do
+        html = Capybara.string(helper.relations_icon({ Settings.FIELDS.GEOM_TYPE => 'polygon' }, 'leaf'))
+        expect(html).not_to have_css('.blacklight-icons.svg_tooltip')
+      end
+    end
+  end
+
+  describe '#results_js_map_selector' do
+    context 'viewing bookmarks' do
+      let(:controller_name) { 'bookmarks' }
+
+      it 'returns bookmarks data-map selector' do
+        expect(results_js_map_selector(controller_name)).to eq 'bookmarks'
+      end
+    end
+
+    context 'viewing catalog results' do
+      let(:controller_name) { 'catalog' }
+
+      it 'returns index data-map selector' do
+        expect(results_js_map_selector(controller_name)).to eq 'index'
+      end
+    end
+
+    context 'calling outside of intended scope' do
+      let(:controller_name) { 'outside' }
+
+      it 'returns default data-map value' do
+        expect(results_js_map_selector(controller_name)).to eq 'index'
+      end
     end
   end
 end

data/spec/javascripts/geoblacklight_spec.js

@@ -1,5 +1,3 @@
-//= require geoblacklight
-
 describe('GeoBlacklight', function() {
   describe('loads and makes available libraries', function() {
     it('Leaflet is defined', function() {
@@ -9,9 +7,5 @@ describe('GeoBlacklight', function() {
     it('History.js is defined', function() {
       expect(History).toBeDefined();
     });
-
-    it('MetadataDownloadButton is defined', function() {
-      expect(GeoBlacklight.MetadataDownloadButton).toBeDefined();
-    });
   });
 });

data/spec/javascripts/metadata_download_button_spec.js

@@ -1,11 +1,13 @@
-//= require geoblacklight
+const MetadataDownloadButton = require('../../app/assets/javascripts/geoblacklight/modules/metadata_download_button');
 
 describe('MetadataDownloadButton', function() {
   describe('initialize', function() {
-    fixture.set('<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>');
+    beforeEach(() => {
+      document.body.innerHTML = '<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>';
+    });
 
     it('creates a new instance and sets the download button @href value', function() {
-      var button = new GeoBlacklight.MetadataDownloadButton('#foo');
+      var button = new MetadataDownloadButton('#foo');
       expect(button.$el.attr('id')).toBe('foo');
       expect(button.$download.attr('id')).toBe('bar');
       expect(button.$download.attr('href')).toBe('http://testdomain');

data/spec/javascripts/util_spec.js

@@ -1,11 +1,9 @@
-//= require geoblacklight
-
-'use strict';
+const Util = require('../../app/assets/javascripts/geoblacklight/modules/util');
 
 describe('GeoBlacklight.Util', function() {
   describe('linkify', function() {
     it('returns a linkified string', function() {
-      expect(GeoBlacklight.Util.linkify('http://www.example.com'))
+      expect(Util.linkify('http://www.example.com'))
         .toEqual("<a href='http://www.example.com'>http://www.example.com</a>");
     });
   });

data/spec/lib/geoblacklight/bounding_box_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::BoundingBox do

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::DocumentPresenter do
   # Please see https://github.com/projectblacklight/blacklight/blob/v6.15.0/spec/presenters/index_presenter_spec.rb#L4
+  subject { presenter }
   let(:request_context) { double(document_index_view_type: 'list') }
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
@@ -12,7 +14,6 @@ describe Geoblacklight::DocumentPresenter do
     end
   end
   let(:solr_fields) { Settings.FIELDS }
-  subject { presenter }
   let(:presenter) do
     described_class.new(document, request_context, blacklight_config)
   end
@@ -23,7 +24,7 @@ describe Geoblacklight::DocumentPresenter do
       layer_id_s: 'druid:abc123',
       non_index_field: 'do not render',
       period: 'Ends with period.',
-      multi_display: %w(blue blah)
+      multi_display: %w[blue blah]
     )
   end
 

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::GeojsonDownload do

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::GeotiffDownload do

data/spec/lib/geoblacklight/download/hgl_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::HglDownload do

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.UNIQUE_KEY => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a KmzDownload object with specific options' do
@@ -9,7 +10,7 @@ describe Geoblacklight::KmzDownload do
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/vnd.google-earth.kmz'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
-      expect(options[:request_params][:bbox]).to eq '-180, -90, 180, 90'
+      expect(options[:request_params][:bbox]).to eq '-180.0, -90.0, 180.0, 90.0'
     end
     it 'merges custom options' do
       download = described_class.new(document, timeout: 33)

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload do

data/spec/lib/geoblacklight/download_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Download do
@@ -6,7 +7,7 @@ describe Geoblacklight::Download do
   let(:faraday_connection) { instance_double(Faraday::Connection) }
   let(:faraday_response) { instance_double(Faraday::Response) }
   let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
+  let(:document) { SolrDocument.new("#{Settings.FIELDS.UNIQUE_KEY}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
 
   describe '#initialize' do
@@ -31,7 +32,7 @@ describe Geoblacklight::Download do
   end
   describe '#file_path' do
     it 'returns the path with name and extension' do
-      expect(download.class.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
+      expect(download.class.file_path).to eq Rails.root.join('tmp', 'cache', 'downloads')
     end
     it 'is configurable' do
       expect(Settings).to receive(:DOWNLOAD_PATH).and_return('configured/path')

data/spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::GeoblacklightHelperBehavior do

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Geoblacklight::Geometry do
+  let(:wkt_geom) { 'MULTIPOLYGON(((-180 81.66, -180 -12.93, -168.35 -12.93, -168.35 81.66, -180 81.66)), ((180 81.66, 25 81.66, 25 -12.93, 180 -12.93, 180 81.66)))' }
+  let(:envelope_geom) { 'ENVELOPE(25, -168.35, 81.66, -12.93)' }
+  let(:invalid_geom) { 'INVALID' }
+
+  describe '#geojson' do
+    context 'with standard WKT geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(wkt_geom).geojson).to include('MultiPolygon', 'coordinates', '[[[[-180.0,81.66]')
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(envelope_geom).geojson).to include('Polygon', 'coordinates', '[[[25.0,81.66]')
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns an empty string' do
+        expect(described_class.new(invalid_geom).geojson).to eq ''
+      end
+    end
+  end
+
+  describe '#bounding_box' do
+    context 'with standard WKT geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(wkt_geom).bounding_box).to eq '-180.0, -12.93, 180.0, 81.66'
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(envelope_geom).bounding_box).to eq '-168.35, -12.93, 25.0, 81.66'
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns an empty string' do
+        expect(described_class.new(invalid_geom).bounding_box).to eq ''
+      end
+    end
+  end
+end