geoblacklight 2.2.0 → 3.0.1

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,8 +1,6 @@
-<%= 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-brand' %>
+    <%= link_to application_name, root_path, class: 'mb-0 navbar-logo' %>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>

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

@@ -1,6 +1,8 @@
 en:
   geoblacklight:
     bbox_label: 'Bounding Box'
+    citation:
+      retrieved_from: 'Retrieved from %{document_url}'
     download:
       download: 'Download'
       download_link: 'Original %{download_format}'
@@ -27,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'
@@ -40,6 +43,8 @@ en:
       jpg: 'JPG'
       esri_geodatabase: 'ESRI Geodatabase'
       sqlite_database: 'SQLite Database'
+    map:
+      label: 'Zoomable map'
     references:
       wms: 'Web Mapping Service (WMS)'
       wms_abv: 'WMS'
@@ -61,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'
@@ -102,62 +107,42 @@ en:
         wms:
           title: Web Map Service (WMS)
           content: A Web Map Service displays a geospatial dataset as map images.
-    aria-labels:
-      arrow-circle-down: Arrow within a circle, pointing down (icon)
-      baruch-cuny: Baruch College (logo)
-      berkeley: University of California, Berkeley (logo)
-      book: Book (icon)
-      bookmark: Bookmark (icon)
-      cd-rom: CD-Rom (icon)
-      chicago: The University of Chicago (logo)
-      columbia: Columbia University (logo)
-      cornell: Cornell University (logo)
-      dvd-rom: DVD-Rom (icon)
-      email: Email (icon)
-      esri-globe: Esri Global (logo)
-      globe: Globe (icon)
-      harvard: Harvard University (logo)
-      home: Home (icon)
-      illinois: University of Illinois (logo)
-      image: Image (icon)
-      indiana: Indiana University (logo)
-      iowa: University of Iowa (logo)
-      leaf: Leaf (icon)
-      lewis-clark: Lewis & Clark (logo)
-      line: Line (icon)
-      map-marker: Map marker (icon)
-      map: Map (icon)
-      maryland: University of Maryland (logo)
-      massgis: MassGIS (logo)
-      metadata: Metadata (icon)
-      michigan-state: Michigan State University (logo)
-      michigan: University of Michigan (logo)
-      minnesota: University of Minnesota (logo)
-      mit: Massachusetts Institute of Technology (logo)
-      mixed: Mixed (icon)
-      multilinestring: Multi-line string  (icon)
-      multipoint: Multi-point (icon)
-      multipolygon: Multi-polygon (icon)
-      nyu: New York University (logo)
-      ohio-state: The Ohio State University (logo)
-      pagelines-brands: Pagelines brands (icon)
-      paper-map: Paper map (icon)
-      penn-state: Penn State University (logo)
-      point: Point (icon)
-      polygon: Polygon (icon)
-      polyline: Polyline (icon)
-      princeton: Princeton University (logo)
-      public: Public content (icon)
-      purdue: Purdue University (logo)
-      raster: Raster (icon)
-      restricted: Restricted content (icon)
-      sms: SMS (icon)
-      stanford: Stanford University (logo)
-      table: Table (icon)
-      tags: Tags (icon)
-      texas: The University of Texas at Austin (logo)
-      tufts: Tufts University (logo)
-      ucla: University of California, Los Angeles (logo)
-      uva: University of Virginia (logo)
-      web_services: Web services (icon)
-      wisconsin: University of Wisconsin (logo)
+  blacklight:
+    icon:
+      arrow-circle-down: Arrow within a circle, pointing down
+      baruch-cuny: Baruch College
+      berkeley: University of California, Berkeley
+      cd-rom: CD-Rom
+      chicago: The University of Chicago
+      columbia: Columbia University
+      cornell: Cornell University
+      dvd-rom: DVD-Rom
+      esri-globe: Esri Global
+      harvard: Harvard University
+      illinois: University of Illinois
+      indiana: Indiana University
+      iowa: University of Iowa
+      lewis-clark: Lewis & Clark
+      maryland: University of Maryland
+      massgis: MassGIS
+      michigan-state: Michigan State University
+      michigan: University of Michigan
+      minnesota: University of Minnesota
+      mit: Massachusetts Institute of Technology
+      multilinestring: Multi-line string
+      multipoint: Multi-point
+      multipolygon: Multi-polygon
+      nyu: New York University
+      ohio-state: The Ohio State University
+      penn-state: Penn State University
+      princeton: Princeton University
+      public: Public content
+      purdue: Purdue University
+      restricted: Restricted content
+      sms: SMS
+      stanford: Stanford University
+      texas: The University of Texas at Austin
+      tufts: Tufts University
+      ucla: University of California, Los Angeles
+      uva: University of Virginia
+      wisconsin: University of Wisconsin

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'
-  spec.add_dependency 'faraday_middleware'
+  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
@@ -91,6 +85,11 @@ module Geoblacklight
       gsub_file('config/locales/blacklight.en.yml', 'Blacklight', 'GeoBlacklight')
     end
 
+    # Ensure that assets/images exists
+    def create_image_assets_directory
+      FileUtils.mkdir_p('app/assets/images') unless File.directory?('app/assets/images')
+    end
+
     def bundle_install
       Bundler.with_clean_env do
         run 'bundle install'

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/{geoblacklight.js → assets/geoblacklight.js}

@@ -7,4 +7,3 @@
 //= require geoblacklight/downloaders
 //= require leaflet-iiif
 //= require esri-leaflet
-//= require readmore

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

@@ -238,14 +238,16 @@ class CatalogController < ApplicationController
     config.add_results_collection_tool(:sort_widget)
     config.add_results_collection_tool(:per_page_widget)
     config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:citation)
     config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
     config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
 
     # 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)
@@ -257,6 +259,8 @@ class CatalogController < ApplicationController
     # 'worldEco'
     # 'flatBlue'
     # 'midnightCommander'
+    # 'openstreetmapHot'
+    # 'openstreetmapStandard'
 
     config.basemap_provider = 'positron'
 

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'
 
@@ -44,6 +38,7 @@ FIELDS:
   :TEMPORAL: 'dct_temporal_sm'
   :TITLE: 'dc_title_s'
   :SOURCE: 'dc_source_sm'
+  :ISSUED: 'dct_issued_s'
 
 # Institution deployed at
 INSTITUTION: 'Stanford'
@@ -61,6 +56,9 @@ TIMEOUT_DOWNLOAD: 16
 # (For WMS inspection) timeout and open_timeout parameters for Faraday
 TIMEOUT_WMS: 4
 
+# Use the geometry type for the data relations icon
+USE_GEOM_FOR_RELATIONS_ICON: false
+
 # Web services shown in tool panel
 WEBSERVICES_SHOWN:
   - 'wms'

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails/generators'
 
 module Geoblacklight
@@ -7,7 +8,7 @@ module Geoblacklight
     desc 'Integrate Webpacker for GeoBlacklight'
 
     def webpacker_install
-      run 'bundle exec rails webpacker:install --force'
+      run 'bundle exec rails webpacker:install'
     end
 
     def webpacker_config

data/lib/geoblacklight.rb

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