geoblacklight 2.2.0 → 3.0.1

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/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/metadata_no_dct_provenance_s.json

@@ -0,0 +1,30 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2019-12-16T15:57:35Z",
+  "layer_slug_s": "99-0001-noProvenance",
+  "dc_identifier_s": "99-0001-noProvenance",
+  "dc_title_s": "Social Explorer",
+  "dct_temporal_sm": [
+    "1790-present"
+  ],
+  "dc_description_s": "Requires creating a free account or logging in through an organization with licensed access. This interactive website includes the entire US census history from 1790 to 2000, the American Community Survey (ACS), and the Religious Congregations and Membership Study (RCMS) from 1980 to 2000? the most complete census available on religion in the U.S. Overall, the site contains 39 billion data points, 200,000 variables, and 15,000 interactive maps",
+  "dc_subject_sm": [
+    "Society"
+  ],
+  "dc_type_sm": [
+    "Interactive Resource"
+  ],
+  "dc_rights_s": "Restricted",
+  "layer_geom_type_s": "Table",
+  "solr_geom": "ENVELOPE(-179.9,-64.4,71.6,-14.8)",
+  "dc_publisher_sm": [
+    "Social Explorer"
+  ],
+  "dc_creator_sm": [
+    "Queens College (New York, N.Y.). Department of Sociology"
+  ],
+  "dct_spatial_sm": [
+    "United States"
+  ],
+  "dct_references_s": "{\"http://schema.org/url\":\"https://www.socialexplorer.com/\"}"
+}

data/spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json

@@ -0,0 +1,17 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2020-01-17T15:31:30Z",
+  "layer_slug_s": "05d-03-noGeomType",
+  "dc_identifier_s": "05d-03-noGeomType",
+  "dc_title_s": "University of Minnesota Digital Conservancy DRUM",
+  "dc_description_s": "DRUM is a publicly available collection of digital research data generated by University of Minnesota researchers, students, and staff. Anyone can search and download the data housed in the repository, instantly or by request.",
+  "dc_publisher_sm": [
+    "University of Minnesota Digital Conservancy"
+  ],
+  "dc_type_sm": [
+    "Collection"
+  ],
+  "dct_provenance_s": "Minnesota",
+  "dc_rights_s": "Public",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://conservancy.umn.edu/handle/11299/166578\"}"
+}

data/spec/fixtures/solr_documents/metadata_no_solr_geom.json

@@ -0,0 +1,23 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2020-01-23T14:01:19Z",
+  "layer_slug_s": "05d-p16022coll246-noGeo",
+  "dc_identifier_s": "05d-p16022coll246-noGeo",
+  "dc_title_s": "Ames Library of South Asia Maps",
+  "dc_description_s": "A collection of maps covering Asia held by the University of Minnesota's Ames Library of South Asia.",
+  "dc_publisher_sm": [
+    "University of Minnesota"
+  ],
+  "dc_type_sm": [
+    "Collection"
+  ],
+  "layer_geom_type_s": "Table",
+  "dct_provenance_s": "Minnesota",
+  "dct_spatial_sm": [
+    "Asia",
+    "India",
+    "Afghanistan"
+  ],
+  "dc_rights_s": "Public",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://umedia.lib.umn.edu/search?facets[collection_name_s][]=Ames+Library+of+South+Asia+Maps\"}"
+}

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/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
@@ -326,4 +338,38 @@ describe GeoblacklightHelper, type: :helper do
       end
     end
   end
+
+  describe '#relations_icon' do
+    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({ 'layer_geom_type_s' => '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({ 'layer_geom_type_s' => '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({ 'layer_geom_type_s' => '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({ 'layer_geom_type_s' => 'polygon' }, 'leaf'))
+        expect(html).not_to have_css('.blacklight-icons.svg_tooltip')
+      end
+    end
+  end
 end

data/spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js

@@ -0,0 +1,12 @@
+//= require geoblacklight
+
+describe('setupInspection', function() {
+  describe('Inspect attribute on the map', function() {
+    it('identifyFeatures is defined', function() {
+      expect(L.esri.identifyFeatures).toBeDefined();
+    });
+    it('Tasks is not defined', function() {
+      expect(L.esri.Tasks).toBeUndefined();
+    });
+  });
+});

data/spec/javascripts/geoblacklight_spec.js

@@ -13,9 +13,5 @@ describe('GeoBlacklight', function() {
     it('MetadataDownloadButton is defined', function() {
       expect(GeoBlacklight.MetadataDownloadButton).toBeDefined();
     });
-
-    it ('Readmore is defined', function() {
-      expect(Readmore).toBeDefined();
-    });
   });
 });

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/controller_override_spec.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'spec_helper'

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,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do

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
@@ -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')
@@ -141,14 +142,14 @@ describe Geoblacklight::Download do
 
     it 'raises Geoblacklight::Exceptions::ExternalDownloadFailed with a connection failure' do
       expect(faraday_connection).to receive(:url_prefix).and_return 'http://www.example.com/wms'
-      expect(faraday_connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new('Failed'))
+      expect(faraday_connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new('Failed'))
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(faraday_connection)
       expect { download.initiate_download }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed)
     end
 
     it 'raises Geoblacklight::Exceptions::ExternalDownloadFailed with a connection timout' do
       expect(faraday_connection).to receive(:url_prefix).and_return 'http://www.example.com/wms'
-      expect(faraday_connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+      expect(faraday_connection).to receive(:get).and_raise(Faraday::TimeoutError)
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(faraday_connection)
       expect { download.initiate_download }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed)
     end

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/item_viewer_spec.rb

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

data/spec/lib/geoblacklight/metadata/base_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Metadata::Base do
@@ -30,7 +31,7 @@ describe Geoblacklight::Metadata::Base do
       subject { metadata.document }
 
       before do
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed, 'test connection failures')
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed, 'test connection failures')
       end
 
       it 'returns nil when a connection error' do
@@ -73,7 +74,7 @@ describe Geoblacklight::Metadata::Base do
 
     context 'when attempts to connect to an endpoint URL fail' do
       before do
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed, 'test connection failures')
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed, 'test connection failures')
       end
 
       it 'returns true' do
@@ -144,7 +145,7 @@ describe Geoblacklight::Metadata::Base do
     context 'when requesting the metadata resource times out' do
       before do
         allow(geocombine_metadata).to receive(:to_html).and_return('')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>')
       end
 

data/spec/lib/geoblacklight/metadata/html_spec.rb

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

data/spec/lib/geoblacklight/metadata_spec.rb

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

data/spec/lib/geoblacklight/metadata_transformer/base_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Base do
@@ -8,8 +9,8 @@ describe Geoblacklight::MetadataTransformer::Base do
   end
 
   context 'with metadata types without XSL Stylesheets' do
-    let(:metadata) { instance_double(GeoCombine::Metadata) }
     subject { described_class.new(metadata) }
+    let(:metadata) { instance_double(GeoCombine::Metadata) }
     describe '#transform' do
       before do
         allow(metadata).to receive(:to_html).and_raise(NoMethodError, 'undefined method `to_html\'')
@@ -21,8 +22,8 @@ describe Geoblacklight::MetadataTransformer::Base do
   end
 
   context 'with metadata types with XSL Stylesheets but invalid HTML' do
-    let(:metadata) { instance_double(GeoCombine::Metadata) }
     subject { described_class.new(metadata) }
+    let(:metadata) { instance_double(GeoCombine::Metadata) }
     describe '#transform' do
       before do
         allow(metadata).to receive(:to_html).and_return('<invalid-html></invalid-html>')

data/spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Fgdc do
-  let(:fgdc_html) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'metadata', 'fgdc.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Fgdc') }
   subject do
     described_class.new(metadata)
   end
+  let(:fgdc_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'fgdc.html')) }
+  let(:metadata) { instance_double('Geoblacklight::Metadata::Fgdc') }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer::Iso19139 do
-  let(:iso_html) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'metadata', 'iso.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Iso19139') }
   subject do
     described_class.new(metadata)
   end
+  let(:iso_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'iso.html')) }
+  let(:metadata) { instance_double('Geoblacklight::Metadata::Iso19139') }
 
   describe '#transform' do
     before do