geoblacklight 4.0.0 → 4.1.0

data/spec/components/geoblacklight/display_note_component_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Geoblacklight::DisplayNoteComponent, type: :component do
+  subject(:rendered) do
+    render_inline_to_capybara_node(described_class.new(**kwargs))
+  end
+
+  describe "prefixed" do
+    let(:kwargs) { {display_note: "Warning: Full force applied."} }
+    it "prefixed, includes display note and icon" do
+      expect(rendered).to have_selector("div.gbl-display-note.alert.alert-warning")
+      expect(rendered).to have_selector("span.blacklight-icons > svg")
+      expect(rendered).to have_text("Warning: Full force applied.")
+    end
+  end
+
+  describe "non-prefixed" do
+    let(:kwargs) { {display_note: "Simple note."} }
+    it "non-prefixed, includes only default display note" do
+      expect(rendered).to have_selector("div.gbl-display-note.alert.alert-secondary")
+      expect(rendered).to_not have_selector("span.blacklight-icons > svg")
+      expect(rendered).to have_text("Simple note.")
+    end
+  end
+end

data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
   subject(:rendered) do
@@ -7,7 +8,7 @@ RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
   end
 
   # Build a search
-  let(:context) { { whatever: :value } }
+  let(:context) { {whatever: :value} }
   let(:service) { Blacklight::SearchService.new(config: blacklight_config, user_params: user_params, **context) }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:user_params) { {} }
@@ -15,25 +16,25 @@ RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
   let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
   let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
 
-  describe 'homepage' do
+  describe "homepage" do
     before do
       (@response, @document_list) = service.search_results
     end
 
     let(:kargs) do
       {
-        icon: 'home',
-        label: 'geoblacklight.home.institution',
+        icon: "home",
+        label: "geoblacklight.home.institution",
         facet_field: Settings.FIELDS.PROVIDER,
         response: @response
       }
     end
 
-    it 'includes facet links' do
-      expect(rendered).to have_selector('div.category-block')
-      expect(rendered).to have_selector('div.category-icon')
-      expect(rendered).to have_selector('a.home-facet-link')
-      expect(rendered).to have_selector('a.more_facets_link')
+    it "includes facet links" do
+      expect(rendered).to have_selector("div.category-block")
+      expect(rendered).to have_selector("div.category-icon")
+      expect(rendered).to have_selector("a.home-facet-link")
+      expect(rendered).to have_selector("a.more_facets_link")
     end
   end
 end

data/spec/components/geoblacklight/icon_facet_item_component_spec.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 RSpec.describe Geoblacklight::IconFacetItemComponent, type: :component do
   subject(:rendered) do
     render_inline_to_capybara_node(described_class.new(suppress_link: true, **kwargs))
   end
 
-  let(:kwargs) { { facet_item: facet_item } }
-  let(:facet_item) { instance_double(Blacklight::FacetItemPresenter, label: 'Stanford', value: 'stanford', hits: 5, href: nil, selected?: false, facet_config: facet_config) }
-  let(:facet_config) { Blacklight::Configuration::FacetField.new(field: 'provider_facet', label: 'Provider') }
+  let(:kwargs) { {facet_item: facet_item} }
+  let(:facet_item) { instance_double(Blacklight::FacetItemPresenter, label: "Stanford", value: "stanford", hits: 5, href: nil, selected?: false, facet_config: facet_config) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(field: "provider_facet", label: "Provider") }
 
-  it 'prepends the icon to the facet item label' do
-    expect(rendered).to have_selector('span.facet-label', text: 'Stanford')
-    expect(rendered).to have_selector('span.facet-label svg title', text: 'Stanford University')
+  it "prepends the icon to the facet item label" do
+    expect(rendered).to have_selector("span.facet-label", text: "Stanford")
+    expect(rendered).to have_selector("span.facet-label svg title", text: "Stanford University")
   end
 end

data/spec/config/initializers/rails_config_spec.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe 'Config' do
-  it 'Loads new Aardvark relationships' do
-    expect(Settings).to respond_to('RELATIONSHIPS_SHOWN')
+require "spec_helper"
+
+describe "Config" do
+  it "Loads new v4.1 Settings defaults" do
+    expect(Settings).to respond_to("RELATIONSHIPS_SHOWN")
+    expect(Settings.FIELDS.DISPLAY_NOTE).to be_present
+    expect(Settings.DISPLAY_NOTES_SHOWN).to respond_to(:danger)
+    expect(Settings.SIDEBAR_STATIC_MAP).to include("iiif")
+
     [:field, :query_type, :icon, :label].each do |method|
-      expect(Settings.RELATIONSHIPS_SHOWN.MEMBER_OF).to respond_to(method)
+      expect(Settings.RELATIONSHIPS_SHOWN.MEMBER_OF_ANCESTORS).to respond_to(method)
     end
   end
-
-  it 'Loads new v3.4 Settings.FIELDS defaults' do
-    expect(Settings.HOMEPAGE_MAP_GEOM).to be_nil
-  end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -1,61 +1,62 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 describe CatalogController, type: :controller do
-  describe '#web_services' do
-    it 'returns a document based off an id' do
-      get :web_services, params: { id: 'mit-f6rqs4ucovjk2' }
+  describe "#web_services" do
+    it "returns a document based off an id" do
+      get :web_services, params: {id: "mit-f6rqs4ucovjk2"}
       expect(response).to have_http_status :ok
       expect(assigns(:documents)).not_to be_nil
     end
   end
 
-  describe '.default_solr_params' do
-    it 'sets the number of rows returned by Solr to 10 and does not filter the results' do
+  describe ".default_solr_params" do
+    it "sets the number of rows returned by Solr to 10 and does not filter the results" do
       get :index
       expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
       expect(assigns(:response).docs.length).to eq 10
     end
 
-    it 'sets the starting document index to 0' do
+    it "sets the starting document index to 0" do
       get :index
       expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
-      expect(assigns(:response).docs.first.id).to eq 'stanford-cg357zz0321'
+      expect(assigns(:response).docs.first.id).to eq "stanford-cg357zz0321"
     end
 
-    context 'with altered default parameters' do
+    context "with altered default parameters" do
       let(:blacklight_config) { Blacklight::Configuration.new }
 
       before do
         allow(controller).to receive_messages blacklight_config: blacklight_config
       end
 
-      it 'sets the starting document index' do
-        blacklight_config.default_solr_params = { start: 2, 'q.alt' => '*:*' }
+      it "sets the starting document index" do
+        blacklight_config.default_solr_params = {:start => 2, "q.alt" => "*:*"}
         get :index
         expect(response).to have_http_status :ok
         expect(assigns(:response).docs).not_to be_empty
-        expect(assigns(:response).docs.first.id).to eq 'mit-001145244'
+        expect(assigns(:response).docs.first.id).to eq "mit-001145244"
       end
 
-      it 'filters using a default DisMax query when no query is provided by the client' do
-        blacklight_config.default_solr_params = { start: 10, 'q.alt' => '{!dismax}id:nyu' }
+      it "filters using a default DisMax query when no query is provided by the client" do
+        blacklight_config.default_solr_params = {:start => 10, "q.alt" => "{!dismax}id:nyu"}
         get :index
         expect(response).to have_http_status :ok
         expect(assigns(:response).docs).to be_empty
       end
     end
 
-    context 'with altered per page parameters' do
+    context "with altered per page parameters" do
       let(:blacklight_config) { Blacklight::Configuration.new }
 
       before do
         allow(controller).to receive_messages blacklight_config: blacklight_config
       end
 
-      it 'alters the number of documents returned from Solr' do
+      it "alters the number of documents returned from Solr" do
         blacklight_config.default_per_page = 20
         get :index
         expect(response).to have_http_status :ok
@@ -65,19 +66,19 @@ describe CatalogController, type: :controller do
     end
   end
 
-  describe '#raw' do
-    it 'returns a JSON representation of a Solr Document' do
-      get :raw, params: { id: 'tufts-cambridgegrid100-04' }
+  describe "#raw" do
+    it "returns a JSON representation of a Solr Document" do
+      get :raw, params: {id: "tufts-cambridgegrid100-04"}
       expect(response).to have_http_status :ok
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
-      expect(response_values).to include 'gbl_mdVersion_s' => 'Aardvark'
-      expect(response_values).to include Settings.FIELDS.TITLE => '100 Foot Grid Cambridge MA 2004'
-      expect(response_values).to include Settings.FIELDS.IDENTIFIER => ['urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04']
-      expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => 'Public'
-      expect(response_values).to include Settings.FIELDS.PROVIDER => 'Tufts'
-      expect(response_values).to include Settings.FIELDS.ID => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)'
+      expect(response_values).to include "gbl_mdVersion_s" => "Aardvark"
+      expect(response_values).to include Settings.FIELDS.TITLE => "100 Foot Grid Cambridge MA 2004"
+      expect(response_values).to include Settings.FIELDS.IDENTIFIER => ["urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04"]
+      expect(response_values).to include Settings.FIELDS.ACCESS_RIGHTS => "Public"
+      expect(response_values).to include Settings.FIELDS.PROVIDER => "Tufts"
+      expect(response_values).to include Settings.FIELDS.ID => "tufts-cambridgegrid100-04"
+      expect(response_values).to include Settings.FIELDS.GEOMETRY => "ENVELOPE(-71.163984,-71.052581,42.408316,42.34757)"
     end
   end
 end

data/spec/controllers/download_controller_spec.rb

@@ -1,120 +1,121 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 describe DownloadController, type: :controller do
-  describe '#file' do
-    describe 'restricted file' do
-      it 'redirects to login for authentication' do
-        get :file, params: { id: 'stanford-cg357zz0321-shapefile', format: 'zip' }
+  describe "#file" do
+    describe "restricted file" do
+      it "redirects to login for authentication" do
+        get :file, params: {id: "stanford-cg357zz0321-shapefile", format: "zip"}
         expect(response).to have_http_status :unauthorized
       end
     end
-    describe 'public file' do
-      it 'initiates download' do
+    describe "public file" do
+      it "initiates download" do
         allow(controller).to receive(:render) # Needed for testing with Rails 4
         expect(controller).to receive(:send_file)
-        get :file, params: { id: 'mit-f6rqs4ucovjk2-shapefile', format: 'zip' }
+        get :file, params: {id: "mit-f6rqs4ucovjk2-shapefile", format: "zip"}
       end
     end
   end
-  describe '#show' do
-    describe 'restricted file' do
-      it 'redirects to login for authentication' do
-        get :show, params: { id: 'stanford-cg357zz0321', format: 'json' }
+  describe "#show" do
+    describe "restricted file" do
+      it "redirects to login for authentication" do
+        get :show, params: {id: "stanford-cg357zz0321", format: "json"}
         expect(response).to have_http_status :unauthorized
       end
     end
-    describe 'public file' do
+    describe "public file" do
       let(:shapefile_download) { instance_double(Geoblacklight::ShapefileDownload) }
 
       before do
         allow(Geoblacklight::ShapefileDownload).to receive(:new).and_return(shapefile_download)
       end
 
-      it 'initiates download creation' do
-        allow(shapefile_download).to receive(:get).and_return('success')
-        get :show, params: { id: 'mit-f6rqs4ucovjk2', type: 'shapefile' }
+      it "initiates download creation" do
+        allow(shapefile_download).to receive(:get).and_return("success")
+        get :show, params: {id: "mit-f6rqs4ucovjk2", type: "shapefile"}
         expect(response).to have_http_status :ok
       end
     end
 
-    context 'when requesting GeoJSON files' do
-      let(:id) { 'tufts-cambridgegrid100-04' }
-      let(:type) { 'geojson' }
+    context "when requesting GeoJSON files" do
+      let(:id) { "tufts-cambridgegrid100-04" }
+      let(:type) { "geojson" }
       let(:geojson_download) { instance_double(Geoblacklight::GeojsonDownload) }
 
       before do
-        allow(geojson_download).to receive(:get).and_return('file.json')
+        allow(geojson_download).to receive(:get).and_return("file.json")
         allow(Geoblacklight::GeojsonDownload).to receive(:new).and_return(geojson_download)
       end
 
-      it 'downloads the files and notifies the user' do
+      it "downloads the files and notifies the user" do
         expect(Geoblacklight::GeojsonDownload).to receive(:new)
-        get :show, params: { id: id, type: type }
+        get :show, params: {id: id, type: type}
 
-        expect(response.body).to include 'success'
-        expect(response.body).to include 'Your file file.json is ready for download'
+        expect(response.body).to include "success"
+        expect(response.body).to include "Your file file.json is ready for download"
       end
     end
 
-    context 'when requesting GeoTIFF files' do
-      let(:id) { 'tufts-cambridgegrid100-04' }
-      let(:type) { 'geotiff' }
+    context "when requesting GeoTIFF files" do
+      let(:id) { "tufts-cambridgegrid100-04" }
+      let(:type) { "geotiff" }
       let(:geotiff_download) { instance_double(Geoblacklight::GeotiffDownload) }
 
       before do
-        allow(geotiff_download).to receive(:get).and_return('file.tiff')
+        allow(geotiff_download).to receive(:get).and_return("file.tiff")
         allow(Geoblacklight::GeotiffDownload).to receive(:new).and_return(geotiff_download)
       end
 
-      it 'downloads the files and notifies the user' do
+      it "downloads the files and notifies the user" do
         expect(Geoblacklight::GeotiffDownload).to receive(:new)
-        get :show, params: { id: id, type: type }
+        get :show, params: {id: id, type: type}
 
-        expect(response.body).to include 'success'
-        expect(response.body).to include 'Your file file.tiff is ready for download'
+        expect(response.body).to include "success"
+        expect(response.body).to include "Your file file.tiff is ready for download"
       end
     end
   end
 
-  describe '#hgl' do
+  describe "#hgl" do
     let(:hgl_download) { instance_double(Geoblacklight::HglDownload) }
 
-    it 'requests file' do
-      allow(hgl_download).to receive(:get).and_return('success')
+    it "requests file" do
+      allow(hgl_download).to receive(:get).and_return("success")
       allow(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)
 
-      get :hgl, params: { id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com' }
+      get :hgl, params: {id: "harvard-g7064-s2-1834-k3", email: "foo@example.com"}
       expect(response).to have_http_status :ok
     end
 
-    it 'renders form' do
+    it "renders form" do
       allow(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)
 
-      get :hgl, params: { id: 'harvard-g7064-s2-1834-k3' }
-      expect(response).to render_template('hgl')
+      get :hgl, params: {id: "harvard-g7064-s2-1834-k3"}
+      expect(response).to render_template("hgl")
     end
 
-    context 'when an error occurs while downloading a file' do
+    context "when an error occurs while downloading a file" do
       let(:exception) { Geoblacklight::Exceptions::ExternalDownloadFailed.new(url: nil) }
 
-      it 'uses the default error message when the exception does not have a URL' do
+      it "uses the default error message when the exception does not have a URL" do
         allow(Geoblacklight::HglDownload).to receive(:new).and_raise(exception)
 
-        get :hgl, params: { id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com' }
-        expect(response.body).to include('danger')
-        expect(response.body).to include('Sorry, the requested file could not be downloaded')
+        get :hgl, params: {id: "harvard-g7064-s2-1834-k3", email: "foo@example.com"}
+        expect(response.body).to include("danger")
+        expect(response.body).to include("Sorry, the requested file could not be downloaded")
       end
     end
 
-    context 'when downloading the requested file fails' do
-      it 'flashes the error message' do
+    context "when downloading the requested file fails" do
+      it "flashes the error message" do
         allow(hgl_download).to receive(:get).and_return(nil)
         allow(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)
 
-        get :hgl, params: { id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com' }
-        expect(response.body).to include('danger')
-        expect(response.body).to include('Sorry, the requested file could not be downloaded')
+        get :hgl, params: {id: "harvard-g7064-s2-1834-k3", email: "foo@example.com"}
+        expect(response.body).to include("danger")
+        expect(response.body).to include("Sorry, the requested file could not be downloaded")
       end
     end
   end

data/spec/controllers/relation_controller_spec.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 describe RelationController, type: :controller do
-  describe '#index' do
-    it 'returns a listing of related documents for a record' do
-      get :index, params: { id: 'nyu_2451_34502' }
+  describe "#index" do
+    it "returns a listing of related documents for a record" do
+      get :index, params: {id: "nyu_2451_34502"}
       expect(response).to have_http_status :ok
       expect(assigns(:relations)).not_to be_nil
     end

data/spec/controllers/wms_controller_spec.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
+require "spec_helper"
 
 describe WmsController, type: :controller do
   let(:wms_layer) { instance_double(Geoblacklight::WmsLayer) }
-  let(:feature_info) { { values: ['fid', 'layer:example'] } }
+  let(:feature_info) { {values: ["fid", "layer:example"]} }
   let(:params) do
-    { 'format' => 'json', 'URL' => 'http://www.example.com/', 'LAYERS' => 'layer:example',
-      'BBOX' => '-74, 40, -68, 43', 'WIDTH' => '500', 'HEIGHT' => '400',
-      'QUERY_LAYERS' => 'layer:example', 'X' => '277', 'Y' => '195' }
+    {"format" => "json", "URL" => "http://www.example.com/", "LAYERS" => "layer:example",
+     "BBOX" => "-74, 40, -68, 43", "WIDTH" => "500", "HEIGHT" => "400",
+     "QUERY_LAYERS" => "layer:example", "X" => "277", "Y" => "195"}
   end
 
   before do
@@ -15,17 +16,17 @@ describe WmsController, type: :controller do
     allow(wms_layer).to receive(:feature_info).and_return(feature_info)
   end
 
-  describe '#handle' do
-    it 'returns feature info as json' do
+  describe "#handle" do
+    it "returns feature info as json" do
       get :handle, params: params
       expect(response.body).to eq(feature_info.to_json)
     end
   end
 
-  describe '#wms_params' do
+  describe "#wms_params" do
     let(:wms_params) { controller.instance_eval { wms_params } }
 
-    it 'returns only permitted params' do
+    it "returns only permitted params" do
       get :handle, params: params
       expect(wms_params.to_h).to eq(params)
     end

data/spec/factories/user.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
-    password { 'password' }
-    password_confirmation { 'password' }
+    password { "password" }
+    password_confirmation { "password" }
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Blacklight Bookmarks' do
-  scenario 'index has created bookmarks' do
-    visit solr_document_path 'nyu-2451-34564'
-    click_button 'Bookmark'
+require "spec_helper"
+
+feature "Blacklight Bookmarks" do
+  scenario "index has created bookmarks" do
+    visit solr_document_path "nyu-2451-34564"
+    click_button "Bookmark"
     visit bookmarks_path
-    expect(page).to have_css '.document', count: 1
+    expect(page).to have_css ".document", count: 1
   end
 end

data/spec/features/configurable_basemap_spec.rb

@@ -1,34 +1,35 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Configurable basemap', js: true do
-  scenario 'defaults to positron' do
+require "spec_helper"
+
+feature "Configurable basemap", js: true do
+  scenario "defaults to positron" do
     visit root_path
     expect(page).to have_css "img[src*='carto']"
   end
-  feature 'without provided basemap config' do
+  feature "without provided basemap config" do
     before do
       CatalogController.blacklight_config.basemap_provider = nil
     end
-    scenario 'has Carto map' do
+    scenario "has Carto map" do
       visit root_path
       expect(page).to have_css "img[src*='carto']"
     end
   end
-  feature 'using darkMatter' do
+  feature "using darkMatter" do
     before do
-      CatalogController.blacklight_config.basemap_provider = 'darkMatter'
+      CatalogController.blacklight_config.basemap_provider = "darkMatter"
     end
-    scenario 'has darkMatter map' do
+    scenario "has darkMatter map" do
       visit root_path
       expect(page).to have_css "img[src*='dark_all']"
     end
   end
-  feature 'using openstreetmapHot' do
+  feature "using openstreetmapHot" do
     before do
-      CatalogController.blacklight_config.basemap_provider = 'openstreetmapHot'
+      CatalogController.blacklight_config.basemap_provider = "openstreetmapHot"
     end
-    scenario 'has openstreetmapHot map' do
+    scenario "has openstreetmapHot map" do
       visit root_path
       expect(page).to have_css "img[src*='hot']"
     end

data/spec/features/data_dictionary_download_spec.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-feature 'Data dictionary download tool' do
-  feature 'when data_dictionary reference present' do
-    scenario 'shows up in tools' do
-      visit solr_document_path 'nyu_2451_34502'
-      expect(page).to have_css 'li.data_dictionary a', text: 'Documentation'
+require "spec_helper"
+
+feature "Data dictionary download tool" do
+  feature "when data_dictionary reference present" do
+    scenario "shows up in tools" do
+      visit solr_document_path "nyu_2451_34502"
+      expect(page).to have_css "li.data_dictionary a", text: "Documentation"
     end
   end
-  feature 'when data_dictionary reference absent' do
-    scenario 'download tool is not rendered' do
-      visit solr_document_path 'stanford-cg357zz0321'
-      expect(page).not_to have_css 'li.data_dictionary a', text: 'Documentation'
+  feature "when data_dictionary reference absent" do
+    scenario "download tool is not rendered" do
+      visit solr_document_path "stanford-cg357zz0321"
+      expect(page).not_to have_css "li.data_dictionary a", text: "Documentation"
     end
   end
 end