geoblacklight 2.1.2 → 3.0.0

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/metadata_download_button_spec.js

@@ -2,7 +2,7 @@
 
 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://test2domain" id="bar">another test element</a>');
+    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>');
 
     it('creates a new instance and sets the download button @href value', function() {
       var button = new GeoBlacklight.MetadataDownloadButton('#foo');

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
@@ -9,11 +10,11 @@ describe Geoblacklight::Metadata::Base do
     Geoblacklight::Reference.new(['http://www.loc.gov/mods/v3', 'http://purl.stanford.edu/cg357zz0321.mods'])
   end
 
-  describe '#document' do
-    before do
-      allow(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(connection)
-    end
+  before do
+    allow(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(connection)
+  end
 
+  describe '#document' do
     context 'with valid XML data at an endpoint URL' do
       before do
         allow(response).to receive(:status).and_return(200)
@@ -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
@@ -40,6 +41,20 @@ describe Geoblacklight::Metadata::Base do
     end
   end
 
+  context 'when attempts to connect to an endpoint URL raise an OpenSSL error' do
+    subject { metadata.document }
+
+    before do
+      expect(Geoblacklight.logger).to receive(:error).with(/dh key too small/)
+      allow(connection).to receive(:get).and_raise(OpenSSL::SSL::SSLError, 'dh key too small')
+    end
+
+    it 'returns nil when a connection error' do
+      expect(subject).to be_a Nokogiri::XML::Document
+      expect(subject.children.empty?).to be true
+    end
+  end
+
   describe '#blank?' do
     before do
       allow(Faraday).to receive(:new).with(url: 'http://purl.stanford.edu/cg357zz0321.mods').and_return(connection)
@@ -59,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
@@ -130,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

data/spec/lib/geoblacklight/metadata_transformer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::MetadataTransformer do
@@ -9,10 +10,10 @@ describe Geoblacklight::MetadataTransformer do
 
   describe '.instance' do
     context 'with FGDC metadata' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Fgdc')
@@ -24,10 +25,10 @@ describe Geoblacklight::MetadataTransformer do
     end
 
     context 'with ISO19139 metadata' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Iso19139')
@@ -39,10 +40,10 @@ describe Geoblacklight::MetadataTransformer do
     end
 
     context 'without a metadata type' do
-      let(:metadata) { instance_double(Geoblacklight::Metadata::Base) }
       subject do
         described_class.instance(metadata)
       end
+      let(:metadata) { instance_double(Geoblacklight::Metadata::Base) }
 
       before do
         allow(klass).to receive(:name).and_return('Geoblacklight::Metadata::Base')

data/spec/lib/geoblacklight/reference_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Reference do
@@ -31,4 +32,34 @@ describe Geoblacklight::Reference do
       expect(typical_reference.to_hash).to eq wms: 'http://hgl.harvard.edu:8080/geoserver/wms'
     end
   end
+
+  describe 'reference' do
+    context 'key has one trailing slash' do
+      let(:iso19139_reference) do
+        described_class.new(['http://www.isotc211.org/schemas/2005/gmd/', 'https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml'])
+      end
+
+      it 'removes the trailing slash' do
+        expect(iso19139_reference.send(:uri)).to eq 'http://www.isotc211.org/schemas/2005/gmd'
+      end
+    end
+    context 'key does not have trailing slashes' do
+      let(:iso19139_reference) do
+        described_class.new(['http://www.isotc211.org/schemas/2005/gmd', 'https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml'])
+      end
+
+      it 'will return the key' do
+        expect(iso19139_reference.send(:uri)).to eq 'http://www.isotc211.org/schemas/2005/gmd'
+      end
+    end
+    context 'key has trailing slashes' do
+      let(:fgdc_reference) do
+        described_class.new(['http://www.opengis.net/cat/csw/csdgm////', 'https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml'])
+      end
+
+      it 'removes the trailing slashes' do
+        expect(fgdc_reference.send(:uri)).to eq 'http://www.opengis.net/cat/csw/csdgm'
+      end
+    end
+  end
 end

data/spec/lib/geoblacklight/references_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::References do
@@ -133,7 +134,7 @@ describe Geoblacklight::References do
     context 'with an overridden order for the formats' do
       let(:settings_klass) { class_double('Settings').as_stubbed_const }
       before do
-        allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w(iso19139 mods)
+        allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
         allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FILE_FORMAT: 'dc_format_s')
       end
       it 'is ordered by the configuration' do
@@ -166,8 +167,6 @@ describe Geoblacklight::References do
     end
     it 'returns nil if there is no direct download' do
       expect(typical_ogp_shapefile.preferred_download).to be_nil
-    end
-    it 'returns nil if there is no direct download' do
       expect(typical_ogp_geotiff.preferred_download).to be_nil
     end
   end

data/spec/lib/geoblacklight/relation/ancestors_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Relation::Ancestors do
@@ -7,7 +8,7 @@ describe Geoblacklight::Relation::Ancestors do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding ancestor documents' do
-      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s'])
+      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
     end
   end
 

data/spec/lib/geoblacklight/relation/descendants_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::Relation::Descendants do
@@ -7,7 +8,7 @@ describe Geoblacklight::Relation::Descendants do
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding descendant documents' do
-      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s'])
+      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
     end
   end
 

data/spec/lib/geoblacklight/relation/relation_response_spec.rb

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

data/spec/lib/geoblacklight/view_helper_override_spec.rb

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

data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::FeatureInfoResponse do
@@ -28,14 +29,14 @@ describe Geoblacklight::FeatureInfoResponse do
     it 'returns a formated response' do
       expect(response.format).not_to be_nil
       expect(response.format[:values].length).to eq 2
-      expect(response.format[:values][0]).to eq %w(Header1 value1)
-      expect(response.format[:values][1]).to eq %w(Header2 value2)
+      expect(response.format[:values][0]).to eq %w[Header1 value1]
+      expect(response.format[:values][1]).to eq %w[Header2 value2]
     end
     it 'returns a formated response when multiple features are retrieved' do
       expect(response_multiple_features.format).not_to be_nil
       expect(response_multiple_features.format[:values].length).to eq 2
-      expect(response_multiple_features.format[:values][0]).to eq %w(Header1 value1)
-      expect(response_multiple_features.format[:values][1]).to eq %w(Header2 value2)
+      expect(response_multiple_features.format[:values][0]).to eq %w[Header1 value1]
+      expect(response_multiple_features.format[:values][1]).to eq %w[Header2 value2]
     end
   end
 

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Geoblacklight::WmsLayer do
@@ -73,7 +74,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection fails' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::ConnectionFailed wrapped=#<StandardError: test connection error>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new(StandardError.new('test connection error')))
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new(StandardError.new('test connection error')))
       end
 
       it 'logs the Faraday error' do
@@ -86,7 +87,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection times out' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
       end
 
       it 'logs the Faraday error' do