geoblacklight 2.4.0 → 3.3.0

data/app/models/concerns/geoblacklight/solr_document.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Geoblacklight
-  # Extends Blacklight::Solr::Document for GeoBlacklight specific functionalit
+  # Extends Blacklight::Solr::Document for GeoBlacklight specific functionality
   module SolrDocument
     extend Blacklight::Solr::Document
 
@@ -34,15 +36,15 @@ module Geoblacklight
     end
 
     def direct_download
-      references.download.to_hash unless references.download.blank?
+      references.download.to_hash if references.download.present?
     end
 
     def hgl_download
-      references.hgl.to_hash unless references.hgl.blank?
+      references.hgl.to_hash if references.hgl.present?
     end
 
     def oembed
-      references.oembed.endpoint unless references.oembed.blank?
+      references.oembed.endpoint if references.oembed.present?
     end
 
     def same_institution?
@@ -50,11 +52,11 @@ module Geoblacklight
     end
 
     def iiif_download
-      references.iiif.to_hash unless references.iiif.blank?
+      references.iiif.to_hash if references.iiif.present?
     end
 
     def data_dictionary_download
-      references.data_dictionary.to_hash unless references.data_dictionary.blank?
+      references.data_dictionary.to_hash if references.data_dictionary.present?
     end
 
     def external_url
@@ -69,18 +71,12 @@ module Geoblacklight
       'http://schema.org/Dataset'
     end
 
-    def bounding_box_as_wsen
-      geom_field = fetch(Settings.FIELDS.GEOMETRY, '')
-      exp = /^\s*ENVELOPE\(
-                  \s*([-\.\d]+)\s*,
-                  \s*([-\.\d]+)\s*,
-                  \s*([-\.\d]+)\s*,
-                  \s*([-\.\d]+)\s*
-                  \)\s*$/x # uses 'x' option for free-spacing mode
-      bbox_match = exp.match(geom_field)
-      return geom_field unless bbox_match # return as-is, not a WKT
-      w, e, n, s = bbox_match.captures
-      "#{w} #{s} #{e} #{n}"
+    def geom_field
+      fetch(Settings.FIELDS.GEOMETRY, '')
+    end
+
+    def geometry
+      @geometry ||= Geoblacklight::Geometry.new(geom_field)
     end
 
     def wxs_identifier
@@ -108,7 +104,7 @@ module Geoblacklight
     end
 
     def method_missing(method, *args, &block)
-      if /.*_url$/ =~ method.to_s
+      if /.*_url$/.match?(method.to_s)
         checked_endpoint(method.to_s.gsub('_url', ''))
       else
         super

data/app/models/concerns/geoblacklight/solr_document/arcgis.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SolrDocument
     module Arcgis
       def arcgis_urls
-        return unless references.esri_webservices.present?
+        return if references.esri_webservices.blank?
         references.esri_webservices.map { |layer| layer.reference[1] if layer }.compact
       end
     end

data/app/models/concerns/geoblacklight/solr_document/carto.rb

@@ -1,21 +1,9 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SolrDocument
     ##
     # Module for providing external Carto download references for a document
     module Carto
-      extend Deprecation
-      self.deprecation_horizon = 'Geoblacklight 2.0.0'
-      ##
-      # Returns a url to a file that should be used with CartoDB integration
-      # @return [String]
-      # @deprecated Use {#carto_reference} instead
-      def cartodb_reference
-        carto_reference
-      end
-      deprecation_deprecate(
-        cartodb_reference: 'use Geoblacklight::SolrDocument::Carto#carto_reference instead'
-      )
-
       ##
       # Returns a url to a file that should be used with CartoDB integration
       # @return [String]

data/app/models/concerns/geoblacklight/solr_document/citation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SolrDocument
     module Citation

data/app/models/concerns/geoblacklight/solr_document/finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SolrDocument
     ##

data/app/models/concerns/geoblacklight/solr_document/inspection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SolrDocument
     ##
@@ -7,7 +8,7 @@ module Geoblacklight
       # Returns boolean about whether document viewer protocol is inspectable
       # @return [Boolean]
       def inspectable?
-        %w(wms feature_layer dynamic_map_layer tiled_map_layer)
+        %w[wms feature_layer dynamic_map_layer tiled_map_layer]
           .include? viewer_protocol
       end
     end

data/app/models/concerns/geoblacklight/spatial_search_behavior.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module SpatialSearchBehavior
     extend ActiveSupport::Concern
@@ -20,9 +21,10 @@ module Geoblacklight
         solr_params[:fq] << "#{Settings.FIELDS.GEOMETRY}:\"Intersects(#{envelope_bounds})\""
 
         if Settings.OVERLAP_RATIO_BOOST
+          solr_params[:bf] ||= []
           solr_params[:overlap] =
-            "{!field uf=* defType=lucene f=solr_bboxtype score=overlapRatio}Intersects(#{envelope_bounds})"
-          solr_params[:bf] = "$overlap^#{Settings.OVERLAP_RATIO_BOOST}"
+            "{!field uf=* defType=lucene f=#{Settings.FIELDS.OVERLAP_FIELD} score=overlapRatio}Intersects(#{envelope_bounds})"
+          solr_params[:bf] << "$overlap^#{Settings.OVERLAP_RATIO_BOOST}"
         end
       end
       solr_params
@@ -60,10 +62,10 @@ module Geoblacklight
 
       # Do not suppress action_documents method calls for individual documents
       # ex. CatalogController#web_services (exportable views)
-      return if solr_params[:q]&.include?('{!lucene}layer_slug_s:')
+      return if solr_params[:q]&.include?("{!lucene}#{Settings.FIELDS.UNIQUE_KEY}:")
 
       solr_params[:fq] ||= []
-      solr_params[:fq] << '-suppressed_b: true'
+      solr_params[:fq] << "-#{Settings.FIELDS.SUPPRESSED}: true"
     end
   end
 end

data/app/presenters/geoblacklight/document_presenter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Adds custom functionality for Geoblacklight document presentation
@@ -12,7 +13,7 @@ module Geoblacklight
       fields_values = []
       @configuration.index_fields.each do |_field_name, field_config|
         val = field_value(field_config)
-        unless val.blank?
+        if val.present?
           val += '.' unless val.end_with?('.')
           fields_values << val
         end

data/app/views/catalog/_arcgis.html.erb

@@ -0,0 +1,4 @@
+<% document ||= @document %>
+<%= link_to(arcgis_link(document.arcgis_urls)) do %>
+  <%= blacklight_icon('esri-globe') %> <%= t('geoblacklight.tools.open_arcgis') %>
+<% end %>

data/app/views/catalog/_carto.html.erb

@@ -0,0 +1,4 @@
+<% document ||= @document %>
+<%= link_to carto_link(document.carto_reference), target: '_blank' do %>
+  <span class='geoblacklight geoblacklight-carto'></span><%= t('geoblacklight.tools.open_carto') %>
+<% end %>

data/app/views/catalog/_document_split.html.erb

@@ -2,5 +2,5 @@
   <div id="documents" class="documents-list col-md-6">
     <%= render documents, :as => :document %>
   </div>
-  <%= content_tag :div, '', id: 'map', class: 'col-md-6', aria: { label: t('geoblacklight.map.label') }, data: { map: 'index', 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
+  <%= content_tag :div, '', id: 'map', class: 'col-md-6', aria: { label: t('geoblacklight.map.label') }, data: { map: results_js_map_selector(controller.controller_name), 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
 </div>

data/app/views/catalog/_downloads_primary.html.erb

@@ -2,7 +2,14 @@
 <% document ||= @document %>
 
 <% if document.direct_download.present? %>
-  <%= render partial: 'download_link', locals: { download_link: download_link_direct(download_text(document.file_format), document) } %>
+  <% if document.direct_download[:download].is_a? Array %>
+    <% document.direct_download[:download].each do |download| %>
+      <%= render partial: 'download_link', locals: { download_link: download_link_file(download['label'], document.id, download['url']) } %>
+    <% end %>
+  <% end %>
+  <% if document.direct_download[:download].is_a? String %>
+    <%= render partial: 'download_link', locals: { download_link: download_link_direct(download_text(document.file_format), document) } %>
+  <% end %>
 <% end %>
 
 <% if document.hgl_download.present? %>

data/app/views/catalog/_header_icons.html.erb

@@ -1,3 +1,3 @@
-<%= geoblacklight_icon(document[Settings.FIELDS.GEOM_TYPE]) %>
-<%= geoblacklight_icon(document[Settings.FIELDS.PROVENANCE]) %>
-<%= geoblacklight_icon(document[Settings.FIELDS.RIGHTS]) %>
+<%= geoblacklight_icon(document[Settings.FIELDS.GEOM_TYPE], classes: 'svg_tooltip') %>
+<%= geoblacklight_icon(document[Settings.FIELDS.PROVENANCE], classes: 'svg_tooltip') %>
+<%= geoblacklight_icon(document[Settings.FIELDS.RIGHTS], classes: 'svg_tooltip') %>

data/app/views/catalog/_home_text.html.erb

@@ -40,4 +40,7 @@
       <%= content_tag :div, '', id: 'map', aria: { label: t('geoblacklight.map.label') }, data: { map: 'home', 'catalog-path'=> search_catalog_path , 'map-bbox' => params[:bbox], basemap: geoblacklight_basemap, leaflet_options: leaflet_options } %>
     </div>
   </div>
+  <div id="geoblacklight-version" class="text-right">
+    <%= t('geoblacklight.home.version', version: Geoblacklight::VERSION ) %>
+  </div>
 </div>

data/app/views/catalog/_index_split_default.html.erb

@@ -1,30 +1,30 @@
 <% # header bar for doc items in index view -%>
-<%= content_tag :div, class: 'documentHeader row', data: { layer_id: document.id, bbox: document.bounding_box_as_wsen } do %>
-  <h3 class="index_title col pl-2">
+<%= content_tag :div, class: 'documentHeader index-split row', data: { layer_id: document.id, geom: document.geometry.geojson } do %>
+  <h3 class="index_title col">
+    <% counter = document_counter_with_offset(document_counter) %>
+    <span class="document-counter">
+      <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
+    </span>
+    <%= link_to_document document, counter: counter %>
+  </h3>
+  <span class='status-icons'>
+    <%= render partial: 'header_icons', locals: { document: document } %>
+
     <button
-      class="caret-toggle btn pl-0 py-0 stretched-link"
+      class="caret-toggle btn"
       data-toggle="collapse"
       data-target="#doc-<%= document.id %>-fields-collapse"
+      aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
       aria-expanded="false"
       aria-controls="doc-<%= document.id %>-fields-collapse">
     </button>
-    <span class="title-wrapper">
-      <% counter = document_counter_with_offset(document_counter) %>
-      <span class="document-counter">
-        <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
-      </span>
-      <%= link_to_document document, counter: counter, title: document[blacklight_config.index.title_field] %>
-    </span>
-    <span class='status-icons'>
-      <%= render partial: 'header_icons', locals: { document: document } %>
-    </span>
-  </h3>
+  </span>
+<% end %>
 
-  <div class='col-md-12 more-info-area'>
-    <div id="doc-<%= document.id %>-fields-collapse" class='collapse'>
-      <small>
-        <%= geoblacklight_present(:index_fields_display, document) %>
-      </small>
-    </div>
+<div class='more-info-area'>
+  <div id="doc-<%= document.id %>-fields-collapse" class='collapse'>
+    <small>
+      <%= geoblacklight_present(:index_fields_display, document) %>
+    </small>
   </div>
-<% end %>
+</div>

data/app/views/catalog/_show_default_viewer_container.html.erb

@@ -6,7 +6,7 @@
       <%= render_help_text_entry('viewer_protocol', document.viewer_protocol) %>
     <% end %>
 
-    <%= content_tag :div, id: 'map', aria: { label: t('geoblacklight.map.label') }, data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => document.wxs_identifier, 'map-bbox' => document.bounding_box_as_wsen, 'catalog-path'=> search_catalog_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } do %>
+    <%= content_tag :div, id: 'map', aria: { label: t('geoblacklight.map.label') }, data: { map: 'item', protocol: document.viewer_protocol.camelize, url: document.viewer_endpoint, 'layer-id' => document.wxs_identifier, 'map-geom' => document.geometry.geojson, 'catalog-path'=> search_catalog_path, available: document_available?, inspect: show_attribute_table?, basemap: geoblacklight_basemap, leaflet_options: leaflet_options } do %>
     <% end %>
   </div>
 </div>

data/app/views/download/hgl.html.erb

@@ -1,25 +1,27 @@
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal">
+  <h1 class="modal-title"><%= t('geoblacklight.download.hgl_request') %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
     <span aria-hidden="true">&times;</span>
   </button>
- <%= content_tag :h4, t('geoblacklight.download.hgl_request'), class: 'text-center' %>
 </div>
 <div class="modal-body">
   <form class="form-horizontal" role="form" id="hglRequest">
     <p><%= t('geoblacklight.download.hgl_instructions')%></p>
     <div class="form-group">
-      <label for="requestEmail" class="col-sm-2 control-label"><%= t('geoblacklight.download.hgl_email')%></label>
-      <div class="col-sm-6">
-        <input class="form-control" type="email" id="requestEmail" />
-      </div>
-      <input type="hidden" id="requestUrl"
-        value="<%= download_hgl_path(id: @document) %>" />
-      <div class="col-sm-2">
-        <button type="submit" class="btn btn-primary"><%= t('geoblacklight.download.hgl_request_button')%></button>
+      <div class="row">
+        <label for="requestEmail" class="col-sm-2 control-label"><%= t('geoblacklight.download.hgl_email')%></label>
+        <div class="col-sm-6">
+          <input class="form-control" type="email" id="requestEmail" />
+        </div>
+        <input type="hidden" id="requestUrl"
+          value="<%= download_hgl_path(id: @document) %>" />
+        <div class="col-sm-2">
+          <button type="submit" class="btn btn-primary"><%= t('geoblacklight.download.hgl_request_button')%></button>
+        </div>
       </div>
     </div>
   </form>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('geoblacklight.download.hgl_close')%></button>
+  <button type="button" class="btn btn-default hide-without-js" data-dismiss="modal"><%= t('geoblacklight.references.services_close')%></button>
 </div>

data/app/views/relation/_ancestors.html.erb

@@ -1,11 +1,8 @@
-<li class="list-group-item relations-ancestors">
-  <b><%= t('geoblacklight.relations.ancestor') %></b>
-</li>
 <% @relations.ancestors['docs'].each do |ancestor| %>
-  <li class="list-group-item">
-    <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>
+  <li class="list-group-item border-bottom-0">
+    <%= link_to solr_document_path(ancestor[Settings.FIELDS.UNIQUE_KEY]) do %>
       <%= relations_icon(ancestor, 'pagelines-brands') %>
-      <%= ancestor['dc_title_s'] %>
+      <%= ancestor[Settings.FIELDS.TITLE] %>
     <% end %>
   </li>
 <% end %>

data/app/views/relation/_descendants.html.erb

@@ -1,16 +1,13 @@
-<li class="list-group-item relations-descendants">
-  <b><%= t('geoblacklight.relations.descendant', count: @relations.descendants['numFound']) %></b>
-</li>
 <% @relations.descendants['docs'][0..2].each do |descendant| %>
-  <li class="list-group-item">
-    <%= link_to solr_document_path(descendant['layer_slug_s']) do %>
+  <li class="list-group-item border-bottom-0">
+    <%= link_to solr_document_path(descendant[Settings.FIELDS.UNIQUE_KEY]) do %>
       <%= relations_icon(descendant, 'leaf') %>
-      <%= descendant['dc_title_s'] %>
+      <%= descendant[Settings.FIELDS.TITLE] %>
     <% end %>
   </li>
 <% end %>
 <% unless (@relations.descendants['numFound'].to_i <= 3) %>
-  <li class="list-group-item">
+  <li class="list-group-item border-bottom-0">
     <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.link_id]}}) do %>
       <%= t('geoblacklight.relations.browse_all', count: @relations.descendants['numFound']) %>
     <% end %>

data/app/views/relation/index.html.erb

@@ -1,13 +1,25 @@
 <% unless @relations.empty? %>
-  <div class="card relations">
-    <div class="card-header">
-      <%= t('geoblacklight.relations.title') %>
+  <% unless @relations.ancestors['numFound'].to_i.zero? %>
+    <div class="card relations">
+      <div class="card-header">
+        <h2 class="mb-0 h6"><%= t('geoblacklight.relations.ancestor') %></h2>
+      </div>
+
+      <ul class="list-group list-group-flush">
+        <%= render 'ancestors' %>
+      </ul>
     </div>
+  <% end %>
 
-    <ul class="list-group list-group-flush">
-      <%= render 'ancestors' unless @relations.ancestors['numFound'].to_i == 0 %>
-      <%= render 'descendants' unless @relations.descendants['numFound'].to_i == 0 %>
-    </ul>
+  <% unless @relations.descendants['numFound'].to_i.zero? %>
+    <div class="card relations">
+      <div class="card-header">
+        <h2 class="mb-0 h6"><%= t('geoblacklight.relations.descendant') %></h2>
+      </div>
 
-  </div>
+      <ul class="list-group list-group-flush">
+        <%= render 'descendants' %>
+      </ul>
+    </div>
+  <% end %>
 <% end %>

data/app/views/relation/index.json.jbuilder

@@ -1,3 +1,4 @@
-json.ancestors@relations.ancestors
+# frozen_string_literal: true
+json.ancestors @relations.ancestors
 json.descendants @relations.descendants
 json.current_doc @relations.search_id

data/app/views/shared/_header_navbar.html.erb

@@ -1,5 +1,3 @@
-<%= render_aria_labels(@aria_labels) %>
-
 <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
   <div class="<%= container_classes %>">
     <%= link_to application_name, root_path, class: 'mb-0 navbar-logo' %>

data/babel.config.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["@babel/plugin-transform-runtime"],
+  "presets": ["@babel/preset-env"]
+}

data/bin/coverage.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+# Borrowed from https://github.com/pulibrary/figgy/blob/master/scripts/combine_coverage.rb
+require 'active_support/inflector'
+require 'simplecov'
+
+class SimpleCovHelper
+  def self.report_coverage(base_dir: './coverage_results')
+    min_cov = ENV['MINIMUM_COVERAGE'] || 100
+    SimpleCov.configure do
+      minimum_coverage(min_cov.to_i)
+    end
+    new(base_dir: base_dir).merge_results
+  end
+
+  attr_reader :base_dir
+
+  def initialize(base_dir:)
+    @base_dir = base_dir
+  end
+
+  def all_results
+    Dir["#{base_dir}/.resultset*.json"]
+  end
+
+  def merge_results
+    results = all_results.map { |file| SimpleCov::Result.from_hash(JSON.parse(File.read(file))) }
+    results = SimpleCov::ResultMerger.merge_results(*results)
+    results.format!
+    covered_percent = results.covered_percent.round(2)
+    return unless covered_percent < SimpleCov.minimum_coverage
+    $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage)
+    Kernel.exit SimpleCov::ExitCodes::MINIMUM_COVERAGE
+  end
+end
+
+SimpleCovHelper.report_coverage