geoblacklight 6.0.0.pre.alpha.6 → 6.0.0.pre.alpha.7

data/lib/geoblacklight/configuration.rb

@@ -30,11 +30,26 @@ module Geoblacklight
     # WMS Parameters
     attr_accessor :wms_params # typed as Hash
 
-    # Enable catalog#show sidebar static map for items with the following viewer protocols
-    attr_accessor :sidebar_static_map # typed as Array
-
     attribute :iiif_drag_drop_link, :string, default: "@manifest?manifest=@manifest"
 
+    # Configure basemap provider for GeoBlacklight maps
+    # Valid basemaps include:
+    # 'positron'
+    # 'dark_matter'
+    # 'positron_lite'
+    # 'world_antique'
+    # 'world_eco'
+    # 'flat_blue'
+    # 'midnight_commander'
+    # 'openstreetmap_hot'
+    # 'openstreetmap_standard'
+
+    # Basemap used in light mode
+    attribute :basemap_provider, :string, default: "positron"
+
+    # Basemap used in dark mode
+    attribute :dark_basemap_provider, :string, default: "dark_matter"
+
     # Homepage Map Geometry
     # Leave null to default to entire world
     # Add a stringified GeoJSON object to scope initial render (example from UMass)
@@ -125,8 +140,6 @@ module Geoblacklight
           note_prefix: "Warning: "
         )
       }
-
-      @sidebar_static_map = ["iiif", "iiif_manifest"]
     end
 
     def fields

data/lib/geoblacklight/engine.rb

@@ -3,6 +3,7 @@
 require "blacklight"
 require "coderay"
 require "config"
+require "commonmarker"
 require "faraday"
 require "faraday/follow_redirects"
 require "geoblacklight/version"

data/lib/geoblacklight/item_viewer.rb

@@ -77,7 +77,7 @@ module Geoblacklight
     end
 
     def viewer_preference
-      [cog, pmtiles, oembed, index_map, tilejson, xyz, wmts, tms, wms, iiif_manifest, iiif, tiled_map_layer, dynamic_map_layer,
+      [oembed, cog, pmtiles, index_map, tilejson, xyz, wmts, tms, wms, iiif_manifest, iiif, tiled_map_layer, dynamic_map_layer,
         image_map_layer, feature_layer].compact.map(&:to_hash).first
     end
   end

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "6.0.0-alpha.6"
+  VERSION = "6.0.0-alpha.7"
 end

data/schema/readme.md

@@ -2,6 +2,6 @@
 
 This directory contains a [JSON schema vocabulary](http://json-schema.org) file. It is provided for documentation and testing purposes.
 
-* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0+.
+- geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0+.
 
 For more information on the metadata schema for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)

data/spec/components/geoblacklight/citation_component_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Geoblacklight::Document::CitationComponent, type: :component do
 
       it "creates a citation with the identifier link" do
         expect(page)
-          .to have_text "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. http://purl.stanford.edu/cg357zz032"
+          .to have_text "East View Geospatial. (2010-04-01). Roads, Port-au-Prince, Haiti, 2010. [Shapefile]. East View Geospatial. https://spatial.lib.berkeley.edu/viewpublic/berkeley-s76d73"
       end
     end
 

data/spec/components/geoblacklight/document_component_spec.rb

@@ -89,4 +89,14 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
       expect(page).to have_css("div#leaflet-viewer")
     end
   end
+
+  context "when the document does not have previewable content" do
+    let(:fixture) { "solr_documents/actual-papermap1.json" }
+
+    it "does not render the viewer" do
+      expect(page).not_to have_css("div#leaflet-viewer")
+      expect(page).not_to have_css("div#openlayers-viewer")
+      expect(page).not_to have_css("div#mirador")
+    end
+  end
 end

data/spec/components/geoblacklight/metadata_component_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Geoblacklight::MetadataComponent, type: :component do
+  let(:metadata) do
+    instance_double(
+      Geoblacklight::Metadata::Base,
+      endpoint: "https://example.com/metadata.xml",
+      transform: "<div>test</div>",
+      type: :fgdc
+    )
+  end
+  let(:references) { instance_double(Geoblacklight::References, shown_metadata: [metadata]) }
+  let(:document) { instance_double(SolrDocument, references: references) }
+
+  it "renders the metadata navigation and transformed content" do
+    render_inline(described_class.new(document: document))
+
+    expect(page).to have_css(".metadata-view")
+    expect(page).to have_css(".pill-metadata.active[href='#fgdc']", text: "FGDC")
+    expect(page).to have_css("#fgdc.tab-pane.active #metadata-container", text: "test")
+  end
+
+  context "when the metadata cannot be transformed" do
+    before do
+      allow(metadata).to receive(:transform).and_raise(Geoblacklight::MetadataTransformer::TransformError)
+      allow(metadata).to receive(:to_xml).and_return("<data></data>")
+    end
+
+    it "renders the XML markup" do
+      render_inline(described_class.new(document: document))
+
+      expect(page).to have_css("#metadata-markup-container .CodeRay", text: "data")
+    end
+  end
+
+  shared_examples "missing metadata" do |error_class|
+    before do
+      allow(metadata).to receive(:transform).and_raise(error_class)
+    end
+
+    it "renders the missing metadata message" do
+      render_inline(described_class.new(document: document))
+
+      expect(page).to have_css("#metadata-error-container")
+    end
+  end
+
+  context "when the metadata cannot be parsed" do
+    include_examples "missing metadata", Geoblacklight::MetadataTransformer::ParseError
+  end
+
+  context "when the metadata type is unsupported" do
+    include_examples "missing metadata", Geoblacklight::MetadataTransformer::TypeError
+  end
+
+  context "with an unexpected error" do
+    before do
+      allow(metadata).to receive(:transform).and_raise(ArgumentError)
+    end
+
+    it "raises the error" do
+      expect { render_inline(described_class.new(document: document)) }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/components/geoblacklight/metadata_description_markdown_component_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Geoblacklight::MetadataDescriptionMarkdownComponent, type: :component do
+  subject(:component) { described_class.new(field:, show: true) }
+
+  let(:field) do
+    instance_double(Blacklight::FieldPresenter,
+      key: "dct_description_sm",
+      label: "Description",
+      render_field?: true,
+      values: ["a **short**", "description"])
+  end
+
+  before do
+    render_inline(component)
+  end
+
+  it "renders the description field" do
+    expect(page).to have_css("dt.blacklight-dct_description_sm", text: "Description")
+  end
+
+  it "wraps the values in a truncate abstract" do
+    expect(page).to have_css("div.truncate-abstract[data-read-more-text='Read more'][data-close-text='Close']")
+  end
+
+  it "transforms each markdown value into HTML" do
+    expect(page).to have_css("div.truncate-abstract p", count: 2)
+    expect(page).to have_css("div.truncate-abstract p strong", text: "short")
+  end
+
+  describe "#markdown_to_html" do
+    it "transforms markdown into HTML" do
+      expect(component.markdown_to_html("a **short** description")).to eq "<p>a <strong>short</strong> description</p>\n"
+    end
+  end
+end

data/spec/components/geoblacklight/viewer_help_text_component_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe Geoblacklight::ViewerHelpTextComponent, type: :component do
   context "when the help text exists for an existing viewer protocol" do
     it "shows correct help text title for wms" do
       render_inline(described_class.new(feature, key))
+      expect(page).to have_css(".help-text", count: 1)
       expect(page).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.wms.title"))
     end
   end

data/spec/controllers/catalog_controller_spec.rb

@@ -3,6 +3,14 @@
 require "spec_helper"
 
 RSpec.describe CatalogController, type: :controller do
+  describe ".blacklight_config" do
+    it "uses the metadata description component for the description field" do
+      description_field = described_class.blacklight_config.show_fields[Geoblacklight.configuration.fields.description]
+
+      expect(description_field.component).to eq Geoblacklight::MetadataDescriptionMarkdownComponent
+    end
+  end
+
   describe "#web_services" do
     it "returns a document based off an id" do
       get :web_services, params: {id: "mit-f6rqs4ucovjk2"}
@@ -11,61 +19,6 @@ RSpec.describe CatalogController, type: :controller do
     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
-      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
-      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"
-    end
-
-    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" => "*:*"}
-        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"
-      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"}
-        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
-      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
-        blacklight_config.default_per_page = 20
-        get :index
-        expect(response).to have_http_status :ok
-        expect(assigns(:response).docs).not_to be_empty
-        expect(assigns(:response).docs.length).to eq 20
-      end
-    end
-  end
-
   describe "#raw" do
     it "returns a JSON representation of a Solr Document" do
       get :raw, params: {id: "tufts-cambridgegrid100-04"}

data/spec/features/configurable_basemap_spec.rb

@@ -10,7 +10,7 @@ RSpec.feature "Configurable basemap", js: true do
 
   feature "without provided basemap config" do
     before do
-      CatalogController.blacklight_config.basemap_provider = nil
+      Geoblacklight.configuration.basemap_provider = nil
     end
     scenario "has Carto map" do
       visit root_path
@@ -18,21 +18,21 @@ RSpec.feature "Configurable basemap", js: true do
     end
   end
 
-  feature "using darkMatter" do
+  feature "using dark matter" do
     before do
-      CatalogController.blacklight_config.basemap_provider = "darkMatter"
+      Geoblacklight.configuration.basemap_provider = "dark_matter"
     end
-    scenario "has darkMatter map" do
+    scenario "has dark matter map" do
       visit root_path
       expect(page).to have_css "img[src*='dark_all']", visible: :all
     end
   end
 
-  feature "using openstreetmapHot" do
+  feature "using openstreetmap hot" do
     before do
-      CatalogController.blacklight_config.basemap_provider = "openstreetmapHot"
+      Geoblacklight.configuration.basemap_provider = "openstreetmap_hot"
     end
-    scenario "has openstreetmapHot map" do
+    scenario "has openstreetmap hot map" do
       visit root_path
       expect(page).to have_css "img[src*='hot']", visible: :all
     end

data/spec/features/home_page_spec.rb

@@ -7,22 +7,6 @@ RSpec.feature "Home page", js: true do # use js: true for tests which require js
     visit root_path
   end
 
-  scenario "search bar" do
-    expect(page).not_to have_css "#search-navbar"
-    expect(page).to have_css "h1", text: "Explore and discover..."
-    expect(page).to have_css "h2", text: "Find the maps and data you need"
-    expect(page).to have_css "form.search-query-form"
-  end
-
-  scenario "find by category" do
-    expect(page).to have_css ".category-block", count: 4
-    expect(page).to have_css ".home-facet-link", count: 36
-    expect(page).to have_css "a.more_facets_link", count: 4
-    click_link "Counties"
-    expect(page).to have_css ".filter-name", text: "Subject"
-    expect(page).to have_css ".filter-value", text: "Counties"
-  end
-
   scenario "map should be visible" do
     within "#main-container" do
       expect(page).to have_css("#leaflet-viewer")
@@ -37,14 +21,4 @@ RSpec.feature "Home page", js: true do # use js: true for tests which require js
     end
     expect(page).to have_css "#documents"
   end
-
-  scenario "can search by placename" do
-    click_link "New York, New York"
-    results = page.all(:css, "article.document")
-    expect(results.count).to equal(4)
-  end
-
-  scenario "pages should have meta tag with geoblacklight version" do
-    expect(page.body).to include("geoblacklight-version")
-  end
 end

data/spec/features/index_view_spec.rb

@@ -8,19 +8,6 @@ RSpec.feature "Index view", js: true do
     visit search_catalog_path(q: "*")
   end
 
-  scenario "should have documents and map on page" do
-    visit search_catalog_path(f: {Geoblacklight.configuration.fields.provider => ["Stanford"]})
-    expect(page).to have_css("#documents")
-    expect(page).to have_css(".document", count: 5)
-    expect(page).to have_css("#leaflet-viewer")
-  end
-
-  scenario "should have sort and per_page on page" do
-    visit search_catalog_path(f: {Geoblacklight.configuration.fields.provider => ["Stanford"]})
-    expect(page).to have_css("#sort-dropdown")
-    expect(page).to have_css("#per_page-dropdown")
-  end
-
   scenario "hover on record should produce bounding box on map" do
     # Needed to find an svg element on the page
     visit search_catalog_path(f: {Geoblacklight.configuration.fields.provider => ["Stanford"]})
@@ -47,15 +34,4 @@ RSpec.feature "Index view", js: true do
       expect(page).to have_content("Subject Population")
     end
   end
-
-  scenario "should have schema.org props listed" do
-    visit search_catalog_path(f: {Geoblacklight.configuration.fields.provider => ["Stanford"]})
-    within(".documentHeader", match: :first) do
-      expect(page).to have_css("a[itemprop='name']")
-      find(".dropdown-toggle").click
-    end
-    within(".more-info-area", match: :first) do
-      expect(page).to have_css("small[itemprop='description']")
-    end
-  end
 end

data/spec/features/layer_preview_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 
 RSpec.feature "Layer preview", js: true do
   scenario "Restricted layer should show bounding box" do
-    visit solr_document_path("stanford-cg357zz0321")
+    visit solr_document_path("berkeley-s76d73")
     within("#leaflet-viewer") do
       expect(page).to have_css("path")
     end

data/spec/features/metadata_panel_spec.rb

@@ -2,79 +2,28 @@
 
 require "spec_helper"
 
-RSpec.feature "Metadata tools" do
-  feature "when metadata references are available", js: true do
-    let(:iso19139) { File.read(Rails.root.join("..", "spec", "fixtures", "iso19139", "stanford-cg357zz0321.xml")) }
-    let(:fgdc) { File.read(Rails.root.join("..", "spec", "fixtures", "fgdc", "harvard-g7064-s2-1834-k3.xml")) }
-    let(:mods) { File.read(Rails.root.join("..", "spec", "fixtures", "mods", "stanford-cg357zz0321.mods")) }
-    let(:fgdc_response) { instance_double(Faraday::Response) }
-    let(:fgdc_connection) { instance_double(Faraday::Connection) }
-    let(:iso19139_response) { instance_double(Faraday::Response) }
-    let(:iso19139_connection) { instance_double(Faraday::Connection) }
-    let(:response) { instance_double(Faraday::Response) }
-    let(:connection) { instance_double(Faraday::Connection) }
-
-    before do
-      allow(iso19139_response).to receive(:body).and_return(iso19139)
-      allow(iso19139_response).to receive(:status).and_return(200)
-      allow(iso19139_connection).to receive(:get).and_return(iso19139_response)
-      allow(Faraday).to receive(:new).with(url: "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml").and_return(iso19139_connection)
-
-      allow(fgdc_response).to receive(:body).and_return(fgdc)
-      allow(fgdc_response).to receive(:status).and_return(200)
-      allow(fgdc_connection).to receive(:get).and_return(fgdc_response)
-      allow(Faraday).to receive(:new).with(url: "https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml").and_return(fgdc_connection)
+RSpec.feature "Metadata tool", js: true do
+  let(:fgdc) { File.read(Rails.root.join("..", "spec", "fixtures", "fgdc", "SANB_a2725322-fgdc.xml")) }
+  let(:response) { instance_double(Faraday::Response, body: fgdc, status: 200) }
+  let(:connection) { instance_double(Faraday::Connection, get: response) }
+
+  before do
+    allow(Faraday).to receive(:new).and_call_original
+    allow(Faraday).to receive(:new)
+      .with(url: "https://stacks.stanford.edu/file/druid:bc576pk4911/SANB_a2725322-fgdc.xml")
+      .and_return(connection)
+  end
 
-      allow(response).to receive(:body).and_return(mods)
-      allow(response).to receive(:status).and_return(200)
-      allow(connection).to receive(:get).and_return(response)
-      allow(Faraday).to receive(:new).with(url: "http://purl.stanford.edu/cg357zz0321.mods").and_return(connection)
+  scenario "opens metadata in a modal" do
+    visit solr_document_path("stanford-bc576pk4911")
 
-      allow(Faraday).to receive(:new).with(hash_including(url: %r{solr/blacklight-core})).and_call_original
-    end
+    click_link "Metadata"
 
-    scenario "shows up as HTML" do
-      visit solr_document_path "harvard-g7064-s2-1834-k3"
-      expect(page).to have_css "li.metadata a", text: "Metadata"
-      click_link "Metadata"
-      using_wait_time 15 do
-        within ".metadata-view" do
-          expect(page).to have_css ".pill-metadata", text: "FGDC"
-          expect(page).to have_css "dt", text: "Identification Information"
-          expect(page).to have_css "dt", text: "Metadata Reference Information"
-        end
+    using_wait_time 15 do
+      within ".modal-content" do
+        expect(page).to have_css(".metadata-view")
+        expect(page).to have_css(".pill-metadata", text: "FGDC")
       end
     end
-    context "when the metadata is in the XML" do
-      let(:mods) { File.read(Rails.root.join("..", "spec", "fixtures", "mods", "fb897vt9938.mods")) }
-      let(:response) { instance_double(Faraday::Response) }
-      let(:connection) { instance_double(Faraday::Connection) }
-
-      before do
-        allow(response).to receive(:body).and_return(mods)
-        allow(response).to receive(:status).and_return(200)
-        allow(connection).to receive(:get).and_return(response)
-        allow(Faraday).to receive(:new).with(url: "http://purl.stanford.edu/fb897vt9938.mods").and_return(connection)
-        allow(Faraday).to receive(:new).and_call_original
-      end
-
-      scenario "shows up as XML" do
-        visit solr_document_path "stanford-cg357zz0321"
-        expect(page).to have_css "li.metadata a", text: "Metadata"
-        click_link "Metadata"
-        using_wait_time 15 do
-          within ".metadata-view" do
-            expect(page).to have_css ".pill-metadata", text: "MODS"
-            expect(page).to have_css ".CodeRay"
-          end
-        end
-      end
-    end
-  end
-  feature "when metadata references are not available" do
-    scenario "is not in tools" do
-      visit solr_document_path "mit-f6rqs4ucovjk2"
-      expect(page).not_to have_css "li.metadata a", text: "Metadata"
-    end
   end
 end

data/spec/features/relations_spec.rb

@@ -3,24 +3,6 @@
 require "spec_helper"
 
 RSpec.feature "Display related documents" do
-  scenario "Record with dct_source_sm value(s) should have parent(s)" do
-    visit relations_solr_document_path("nyu_2451_34502")
-    expect(page).to have_css(".relations .card-header h2", text: "Source records...")
-  end
-
-  scenario "Record that is pointed to by others should have children" do
-    visit relations_solr_document_path("nyu_2451_34635")
-    expect(page).to have_css(".relations .card-header h2", text: "Derived records...")
-  end
-
-  scenario "Relations should respond to json" do
-    visit relations_solr_document_path("nyu_2451_34635", format: "json")
-    response = JSON.parse(page.body)
-    expect(response["relations"]).not_to respond_to("source_ancestors")
-    expect(response["relations"]["source_descendants"]["docs"].first[Geoblacklight.configuration.fields.id]).to eq "nyu_2451_34502"
-    expect(response["current_doc"]).to eq "nyu_2451_34635"
-  end
-
   scenario "Record with relations should render widget in catalog#show", js: true do
     visit solr_document_path("nyu_2451_34635")
     expect(page).to have_css(".card.relations", visible: :all)

data/spec/features/search_spec.rb

@@ -3,11 +3,6 @@
 require "spec_helper"
 
 RSpec.feature "Search" do
-  scenario "Suppressed records are hidden" do
-    visit "/?q=Sanborn+Map+Company"
-    expect(page).to have_css ".document", count: 1
-  end
-
   scenario "When searching child records from a parent record, supressed records are not hidden", js: true do
     visit "/catalog/princeton-1r66j405w"
 
@@ -18,21 +13,4 @@ RSpec.feature "Search" do
     click_link "Browse all 4 records...", visible: :all
     expect(page).to have_css ".document", count: 4
   end
-
-  scenario "When sorting by year desc, highest value sorts first" do
-    visit "/?f%5Bschema_provider_s%5D%5B%5D=University+of+Minnesota&sort=gbl_indexYear_im+desc%2C+dct_title_sort+asc"
-
-    first_doc = find(".document", match: :first)
-
-    # Doc with gbl_indexYear_im value: [2014, 2030]
-    expect(first_doc["data-document-id"]).to eq("02236876-9c21-42f6-9870-d2562da8e44f")
-  end
-
-  scenario "When sorting by year, missing values sort last" do
-    visit "/?f%5Bschema_provider_s%5D%5B%5D=University+of+Minnesota&sort=gbl_indexYear_im+desc%2C+dct_title_sort+asc"
-    last_doc = find_all(".document").last
-
-    # Doc without gbl_indexYear_im value
-    expect(last_doc["data-document-id"]).to eq("05d-03-nogeomtype")
-  end
 end

data/spec/features/sms_spec.rb

@@ -3,15 +3,15 @@
 require "spec_helper"
 
 RSpec.feature "SMS tool", js: true do
-  scenario "shows up in tools" do
-    visit solr_document_path "stanford-cg357zz0321"
-    expect(page).to have_css "li.sms a", text: "SMS This"
+  scenario "opens the SMS form in a modal" do
+    visit solr_document_path("stanford-bc576pk4911")
+
     click_link "SMS This"
-    within ".modal-body" do
-      expect(page).to have_css "input", count: 1
-      expect(page).to have_css "label", text: "Phone Number:"
-      expect(page).to have_css "select", count: 1
-      expect(page).to have_css "label", text: "Carrier"
+
+    within ".modal-content" do
+      expect(page).to have_css("h1", text: "SMS This")
+      expect(page).to have_css("label", text: "Phone Number:")
+      expect(page).to have_css("label", text: "Carrier")
     end
   end
 end