geoblacklight 2.4.0 → 3.0.0

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

@@ -1,8 +1,5 @@
-<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">
+  <li class="list-group-item border-bottom-0">
     <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>
       <%= relations_icon(ancestor, 'pagelines-brands') %>
       <%= ancestor['dc_title_s'] %>

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

@@ -1,8 +1,5 @@
-<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">
+  <li class="list-group-item border-bottom-0">
     <%= link_to solr_document_path(descendant['layer_slug_s']) do %>
       <%= relations_icon(descendant, 'leaf') %>
       <%= descendant['dc_title_s'] %>
@@ -10,7 +7,7 @@
   </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/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[:line]
+    $stderr.printf("Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%).\n", covered_percent, SimpleCov.minimum_coverage[:line])
+    Kernel.exit SimpleCov::ExitCodes::MINIMUM_COVERAGE
+  end
+end
+
+SimpleCovHelper.report_coverage

data/config/initializers/rails_config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Config.setup do |config|
   config.const_name = 'Settings'
 end

data/config/locales/geoblacklight.en.yml

@@ -29,6 +29,7 @@ en:
       data_type: 'Data type'
       placename: 'Placename'
       subject: 'Subject'
+      version: 'GeoBlacklight version %{version}'
     tools:
       login_to_view: 'Login to View and Download'
       open_carto: 'Open in Carto'
@@ -65,10 +66,10 @@ en:
       services_close: 'Close'
     relations:
       ancestor: 'Source Datasets'
-      descendant: 'Derived Datasets (%{count})'
+      descendant: 'Derived Datasets'
       browse_all: "Browse all %{count} records..."
-      title: 'Data Relations'
     metadata:
+      toggle_summary: 'Toggle summary'
       view_metadata: 'View Metadata'
       more_details: 'More details at'
       metadata_error: 'The metadata view for selected schema is not available'

data/geoblacklight.gemspec

@@ -19,30 +19,27 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_rubygems_version = '>= 2.5.2'
 
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', '>= 5.2.4', '< 6.1'
   spec.add_dependency 'blacklight', '~> 7.0'
-  spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'config'
   spec.add_dependency 'faraday', '~> 1.0'
   spec.add_dependency 'faraday_middleware', '~> 1.0.0.rc1'
   spec.add_dependency 'coderay'
-  spec.add_dependency 'geoblacklight-icons', '>= 0.2'
   spec.add_dependency 'deprecation'
   spec.add_dependency 'geo_combine', '~> 0.4'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'handlebars_assets'
-  spec.add_dependency 'webpacker'
+  spec.add_dependency 'webpacker', '~> 4.0'
 
   spec.add_development_dependency 'solr_wrapper'
   spec.add_development_dependency 'rails-controller-testing'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'engine_cart', '~> 2.0'
   spec.add_development_dependency 'capybara', '>= 2.5.0'
   spec.add_development_dependency 'webdrivers'
   spec.add_development_dependency 'factory_bot_rails'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'bixby'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'teaspoon'

data/lib/generators/geoblacklight/assets_generator.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Geoblacklight
+  class AssetsGenerator < Rails::Generators::Base
+    source_root File.expand_path('templates', __dir__)
+
+    desc <<-DESCRIPTION
+      This generator makes the following changes to your application:
+       1. Copies GBL javascript into the application
+       2. Removes stock Rails and Blacklight stylesheets from the application
+       3. Copies GBL stylesheets into the local application
+       4. Sets asset initializer values into the local application
+    DESCRIPTION
+
+    def add_javascript
+      copy_file 'assets/geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
+
+      if Rails.version.to_i == 6
+        append_to_file 'app/assets/javascripts/application.js',
+                       "\n// Required by GeoBlacklight\n//= require geoblacklight"
+      end
+    end
+
+    def remove_stylesheets
+      remove_file 'app/assets/stylesheets/application.css'
+      remove_file 'app/assets/stylesheets/blacklight.scss'
+    end
+
+    def add_stylesheets
+      copy_file 'assets/application.scss', 'app/assets/stylesheets/application.scss'
+      copy_file 'assets/_blacklight.scss', 'app/assets/stylesheets/_blacklight.scss'
+      copy_file 'assets/_customizations.scss', 'app/assets/stylesheets/_customizations.scss'
+      copy_file 'assets/_geoblacklight.scss', 'app/assets/stylesheets/_geoblacklight.scss'
+    end
+
+    def add_initializers
+      append_to_file 'config/initializers/assets.rb',
+                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
+
+      append_to_file 'config/initializers/assets.rb',
+                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
+    end
+  end
+end

data/lib/generators/geoblacklight/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 module Geoblacklight
@@ -30,15 +31,8 @@ module Geoblacklight
       inject_into_file 'config/routes.rb', routes, before: /^end/
     end
 
-    def assets
-      copy_file 'geoblacklight.scss', 'app/assets/stylesheets/geoblacklight.scss'
-      copy_file 'geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
-
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
-
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
+    def generate_assets
+      generate 'geoblacklight:assets'
     end
 
     def create_blacklight_catalog

data/lib/generators/geoblacklight/templates/assets/_blacklight.scss

@@ -0,0 +1 @@
+@import 'blacklight/blacklight';

data/lib/generators/geoblacklight/templates/assets/_customizations.scss

@@ -0,0 +1,28 @@
+// Local Application Customizations
+
+// Set Header Logo
+$logo-image: image_url('blacklight/logo.svg') !default;
+
+.navbar-brand {  /* The main logo image for the Blacklight instance */
+  @if $logo-image {
+    background: transparent $logo-image no-repeat top left;
+  }
+}
+
+// Optional
+// Override default Bootstrap variables here
+
+// Example: Bootstrap Colors
+$blue:    #007bff !default;
+$indigo:  #6610f2 !default;
+$purple:  #6f42c1 !default;
+$pink:    #e83e8c !default;
+$red:     #dc3545 !default;
+$orange:  #fd7e14 !default;
+$yellow:  #ffc107 !default;
+$green:   #28a745 !default;
+$teal:    #20c997 !default;
+$cyan:    #17a2b8 !default;
+
+// Example: Bootstrap Link color
+$link-color: $blue;

data/{app/assets/stylesheets/geoblacklight/application.scss → lib/generators/geoblacklight/templates/assets/_geoblacklight.scss}

@@ -1,2 +1 @@
-@import 'bootstrap';
 @import 'geoblacklight/geoblacklight';

data/lib/generators/geoblacklight/templates/assets/application.scss

@@ -0,0 +1,7 @@
+/*
+*= require leaflet-label
+*/
+@import 'customizations';
+@import 'bootstrap';
+@import 'blacklight';
+@import 'geoblacklight';

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -245,8 +245,9 @@ class CatalogController < ApplicationController
     # Custom tools for GeoBlacklight
     config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
     config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
-    config.add_show_tools_partial :exports, partial: 'exports', if: proc { |_context, _config, options| options[:document] }
-    config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] }
+    config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? }
+    config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? }
+    config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present? }
 
     # Configure basemap provider for GeoBlacklight maps (uses https only basemap
     # providers with open licenses)

data/lib/generators/geoblacklight/templates/settings.yml

@@ -4,12 +4,6 @@ APPLICATION_LOGO_URL: 'http://geoblacklight.org/images/geoblacklight-logo.png'
 # Carto OneClick Service https://carto.com/engine/open-in-carto/
 CARTO_ONECLICK_LINK: 'http://oneclick.carto.com/'
 
-# Hide Carto export link
-# CARTO_HIDE: true
-
-# Hide ArcGIS export link
-# ARCGIS_HIDE: true
-
 # ArcGIS Online Base URL
 ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'
 

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 module Geoblacklight

data/lib/geoblacklight.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/dependencies'
 require 'geoblacklight/engine'
 

data/lib/geoblacklight/bounding_box.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Transforms and parses a bounding box for various formats

data/lib/geoblacklight/catalog_helper_override.rb

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

data/lib/geoblacklight/constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   # Module to declare application level constants and lookup hash
   module Constants

data/lib/geoblacklight/download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class Download
     def initialize(document, options = {})
@@ -14,7 +15,7 @@ module Geoblacklight
     end
 
     def self.file_path
-      Settings.DOWNLOAD_PATH || "#{Rails.root}/tmp/cache/downloads"
+      Settings.DOWNLOAD_PATH || Rails.root.join('tmp', 'cache', 'downloads')
     end
 
     def file_path_and_name

data/lib/geoblacklight/download/geojson_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class GeojsonDownload < Geoblacklight::Download
     GEOJSON_DOWNLOAD_PARAMS = {

data/lib/geoblacklight/download/geotiff_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class GeotiffDownload < Geoblacklight::Download
     GEOTIFF_DOWNLOAD_PARAMS = {

data/lib/geoblacklight/download/hgl_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class HglDownload < Geoblacklight::Download
     def initialize(document, email, options = {})

data/lib/geoblacklight/download/kmz_download.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module Geoblacklight
   class KmzDownload < Geoblacklight::Download
     KMZ_DOWNLOAD_PARAMS = { service: 'wms',
                             version: '1.1.0',
                             request: 'GetMap',
-                            srsName: 'EPSG:900913',
+                            srsName: 'EPSG:3857',
                             format: 'application/vnd.google-earth.kmz',
                             width: 2000, height: 2000 }.freeze
 

data/lib/geoblacklight/download/shapefile_download.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class ShapefileDownload < Geoblacklight::Download
     SHAPEFILE_DOWNLOAD_PARAMS = { service: 'wfs',

data/lib/geoblacklight/engine.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
 require 'blacklight'
-require 'font-awesome-rails'
 require 'coderay'
 require 'config'
 require 'faraday'
 require 'faraday_middleware'
 require 'nokogiri'
-require 'geoblacklight-icons'
 require 'mime/types'
 require 'handlebars_assets'
 

data/lib/geoblacklight/exceptions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   module Exceptions
     class ExternalDownloadFailed < StandardError

data/lib/geoblacklight/geoblacklight_helper_behavior.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   ##
   # Adds helper behavior logic for GeoBlacklight, to used alongside

data/lib/geoblacklight/item_viewer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Geoblacklight
   class ItemViewer
     def initialize(references)

data/lib/geoblacklight/metadata.rb

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

data/lib/geoblacklight/metadata/base.rb

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