geoblacklight 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab935fd48ab2b28973a24d5f5c4fccc9ef1d67174108270c02d3fa07e4aca57
-  data.tar.gz: ef8b40ef25477de5c2ed4ef18dd9df95da1ad8fd2887190dc103462e39df00da
+  metadata.gz: f61832ee1c73971aba39a0274862bfcb02da7bb159e3b442ae4d510a617a6fd8
+  data.tar.gz: 21611d0326e071ac549f546668f474b9889eef2611f3a58976efe18b82401d24
 SHA512:
-  metadata.gz: f943750b581ee558dfc1ce54e3534790c731e962b2b6c2f3e9f990dff3b4e30a54f22a440464fbf33039fd820408c663c432a7626838e814868d63df861e7765
-  data.tar.gz: '086a56ad83e6ab1e82b36943f4212adbac1899b12f4f464bce5a788a7df3f9f38f0279f675c4726e88ad5fe6a9bff19ce486e92b213b19ea3a6bb3fc4d1236f9'
+  metadata.gz: 9c053aa4af51bbf0a1ed10e34b4937cc66d4659296eada0dec44a2a69e087d5391d23de1a31593abed3b06ea71cc028c167cb454f8063c4dc73f99fb20155a01
+  data.tar.gz: 29afb9d926d461f10fde92c864511e83ccaf6a1bdc505c0cfe1144c6981c0ee2e312db1576731599000cb917104a9613aadc564e7093591fefa4e96f270c3ecb

data/.circleci/config.yml

@@ -1,21 +1,32 @@
 ---
-version: 2
+version: 2.1
 jobs:
-  rails_5_2_3:
+  build:
     working_directory: ~/geoblacklight
+    parameters:
+      ruby_version:
+        type: string
+        default: '2.5.7'
+      solr_port:
+        type: string
+        default: '8983'
+      rails_version:
+        type: string
+        default: '5.1.7'
     docker:
-      - image: circleci/ruby:2.5.1-node-browsers
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          # We need both GEM_HOME and BUNDLE_PATH because of the test app
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          CI: true
-          RAILS_ENV: test
-          RAILS_VERSION: 5.2.3
+      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers-legacy
       - image: solr:7-alpine
-        command: bin/solr -cloud -noprompt -f -p 8983
+        command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
+    environment:
+      GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      RAILS_ENV: test
+      RACK_ENV: test
+      RAILS_VERSION: <<parameters.rails_version>>
+      COVERAGE: true
+    parallelism: 4
     steps:
       - checkout
       # Update chrome
@@ -23,86 +34,46 @@ jobs:
       - run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
       - run: sudo apt-get update
       - run: sudo apt-get -y install google-chrome-stable
-      # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-2-0-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
+      # Restore bundle and internal test app from the cache
+      - restore_cache:
+          keys:
+            - geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
       # Install gems
       - run: bundle check || bundle install
-      # Run the test suites
-      - run: bundle exec rake engine_cart:generate
-      - run:
-          name: Wait for Solr
-          command: dockerize -wait tcp://localhost:8983 -timeout 1m
-      - run:
-          name: Load config into solr
-          command: |
-            cd .internal_test_app/solr/conf
-            zip -1 -r solr_config.zip ./*
-            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8983/solr/admin/configs?action=UPLOAD&name=solrconfig"
-            curl -H 'Content-type: application/json' http://localhost:8983/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
-      - run:
-          name: Seed Solr
-          command: |
-            cd .internal_test_app
-            bundle exec rake geoblacklight:index:seed
-            bundle exec rake geoblacklight:downloads:mkdir
+      # Store bundle cache
+      - save_cache:
+          key: geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+          paths:
+            - /home/circleci/geoblacklight/vendor/bundle
+        # Restore internal test app from the cache
+      - restore_cache:
+          keys:
+            - geoblacklight-internal-test-app-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/Gemfile.extra" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+      # Generate the internal test app
       - run:
-          name: Compile the assets for Webpack
+          name: Generate test app
           command: |
-            cd .internal_test_app
-            rm config/webpacker.yml
-            bundle exec rails webpacker:install
-            bundle exec rails webpacker:compile
-      - run:
-          name: Run the RSpec test suites
-          command: bundle exec rake geoblacklight:coverage
-      - run:
-          name: Run the Teaspoon test suites
-          command: bundle exec rake teaspoon
-      # Store bundle cache
-      - type: cache-save
-        name: Store bundle cache
-        key: geoblacklight-bundle-5-2-0-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
-        paths:
-          - /home/circleci/geoblacklight/vendor/bundle
-  rails_5_1_7:
-    working_directory: ~/geoblacklight
-    docker:
-      - image: circleci/ruby:2.4.4-node-browsers
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          RAILS_ENV: test
-          RAILS_VERSION: 5.1.7
-      - image: solr:7-alpine
-        command: bin/solr -cloud -noprompt -f -p 8983
-    steps:
-      - checkout
-      # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-1-7-{{ checksum "Gemfile" }}-{{ checksum "geoblacklight.gemspec" }}-3f5eff
-      # Install gems and run specs
-      - run: bundle check || bundle install
-      # Run the test suites
-      - run: bundle exec rake engine_cart:generate
+            [ -e ./.internal_test_app ] || bundle exec rake engine_cart:generate
+      - save_cache:
+          name: Save test app cache
+          key: geoblacklight-internal-test-app-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/Gemfile.extra" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+          paths:
+            - ./.internal_test_app
       - run:
           name: Wait for Solr
-          command: dockerize -wait tcp://localhost:8983 -timeout 1m
+          command: dockerize -wait tcp://localhost:<<parameters.solr_port>> -timeout 1m
       - run:
           name: Load config into solr
           command: |
             cd .internal_test_app/solr/conf
             zip -1 -r solr_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8983/solr/admin/configs?action=UPLOAD&name=solrconfig"
-            curl -H 'Content-type: application/json' http://localhost:8983/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
+            curl -H 'Content-type: application/json' http://localhost:<<parameters.solr_port>>/api/collections/ -d '{create: {name: blacklight-core, config: solrconfig, numShards: 1}}'
       - run:
           name: Seed Solr
           command: |
             cd .internal_test_app
+            bundle check || bundle install
             bundle exec rake geoblacklight:index:seed
             bundle exec rake geoblacklight:downloads:mkdir
       - run:
@@ -114,39 +85,111 @@ jobs:
             bundle exec rails webpacker:compile
       - run:
           name: Run the RSpec test suites
-          command: bundle exec rake geoblacklight:coverage
+          command: bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
       - run:
           name: Run the Teaspoon test suites
           command: bundle exec rake teaspoon
-      # Store bundle cache
-      - type: cache-save
-        name: Store bundle cache
-        key: geoblacklight-bundle-5-1-7-{{ checksum "Gemfile" }}-{{ checksum "geoblacklight.gemspec" }}-3f5eff
-        paths:
-          - /home/circleci/geoblacklight/vendor/bundle
+
   rubocop:
     working_directory: ~/geoblacklight
+    parameters:
+      ruby_version:
+        type: string
+        default: '2.5.7'
+      rails_version:
+        type: string
+        default: '5.1.7'
     docker:
-      - image: circleci/ruby:2.5.1-node-browsers
-        environment:
-          GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
-          BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
-          RAILS_ENV: test
+      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers-legacy
+    environment:
+      GEM_HOME: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_PATH: /home/circleci/geoblacklight/vendor/bundle
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      RAILS_ENV: test
+      RACK_ENV: test
+      RAILS_VERSION: <<parameters.rails_version>>
     steps:
       - checkout
       # Restore bundle cache
-      - type: cache-restore
-        name: Restore bundle cache
-        key: geoblacklight-bundle-5-2-3-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-3f5eff
+      - restore_cache:
+          keys:
+            - geoblacklight-bundle-{{ checksum "geoblacklight.gemspec" }}-{{ checksum "Gemfile" }}-<< parameters.ruby_version >>-<< parameters.rails_version >>
+          paths:
+            - /home/circleci/geoblacklight/vendor/bundle
       # Install gems and run rubocop
       - run: bundle check || bundle install
       - run: bundle exec rake rubocop
+
 workflows:
   version: 2
-  build_accept_deploy:
+  build:
+    jobs:
+      - build:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.1
+          name: "ruby2-6_rails5-2"
+      - build:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.1
+          name: "ruby2-5_rails5-2"
+      - rubocop:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.1
+          name: "rubocop_ruby2-6_rails5-2"
+      - rubocop:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.1
+          name: "rubocop_ruby2-5_rails5-2"
+
+      - build:
+          ruby_version: 2.6.5
+          name: "ruby2-6_rails5-1"
+      - build:
+          ruby_version: 2.5.7
+          name: "ruby2-5_rails5-1"
+      - rubocop:
+          ruby_version: 2.6.5
+          name: "rubocop_ruby2-6_rails5-1"
+      - rubocop:
+          ruby_version: 2.5.7
+          name: "rubocop_ruby2-5_rails5-1"
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
     jobs:
-      - rails_5_2_3
-      - rails_5_1_7
+      - build:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.1
+          name: "ruby2-6_rails5-2"
+      - build:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.1
+          name: "ruby2-5_rails5-2"
+      - rubocop:
+          ruby_version: 2.6.5
+          rails_version: 5.2.4.1
+          name: "rubocop_ruby2-6_rails5-2"
+      - rubocop:
+          ruby_version: 2.5.7
+          rails_version: 5.2.4.1
+          name: "rubocop_ruby2-5_rails5-2"
+
+      - build:
+          ruby_version: 2.6.5
+          name: "ruby2-6_rails5-1"
+      - build:
+          ruby_version: 2.5.7
+          name: "ruby2-5_rails5-1"
+      - rubocop:
+          ruby_version: 2.6.5
+          name: "rubocop_ruby2-6_rails5-1"
       - rubocop:
-          requires:
-            - rails_5_2_3
+          ruby_version: 2.5.7
+          name: "rubocop_ruby2-5_rails5-1"

data/.rubocop_todo.yml

@@ -46,13 +46,6 @@ Lint/UnusedBlockArgument:
 Metrics/BlockLength:
   Max: 247
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'app/presenters/geoblacklight/document_presenter.rb'
-
 # Offense count: 2
 # Configuration parameters: CustomIncludeMethods.
 RSpec/EmptyExampleGroup:
@@ -161,12 +154,6 @@ Style/HashSyntax:
   Exclude:
     - 'lib/tasks/geoblacklight.rake'
 
-# Offense count: 2
-Style/MethodMissing:
-  Exclude:
-    - 'app/models/concerns/geoblacklight/solr_document.rb'
-    - 'lib/geoblacklight/references.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:

data/Gemfile

@@ -31,14 +31,9 @@ else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
+end
 
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
+if File.exists?('spec/test_app_templates/Gemfile.extra')
+  eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
 end
 # END ENGINE_CART BLOCK

data/app/assets/javascripts/geoblacklight/basemaps.js

@@ -63,5 +63,23 @@ GeoBlacklight.Basemaps = {
       retina: '@2x',
       detectRetina: false
     }
+  ),
+  openstreetmapHot: L.tileLayer(
+    'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>', 
+      maxZoom: 19,
+      worldCopyJump: true,
+      retina: '@2x',
+      detectRetina: false
+    }
+  ),
+  openstreetmapStandard: L.tileLayer(
+    'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+      attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+      maxZoom: 19,
+      worldCopyJump: true,
+      retina: '@2x',
+      detectRetina: false
+    }
   )
 };

data/app/assets/javascripts/geoblacklight/modules/results.js

@@ -50,8 +50,10 @@ Blacklight.onLoad(function() {
     // set hover listeners on map
     $('#content')
       .on('mouseenter', '#documents [data-layer-id]', function() {
-        var bounds = L.bboxToBounds($(this).data('bbox'));
-        geoblacklight.addBoundsOverlay(bounds);
+        if($(this).data('bbox').length > 0) {
+          var bounds = L.bboxToBounds($(this).data('bbox'));
+          geoblacklight.addBoundsOverlay(bounds);
+        }
       })
       .on('mouseleave', '#documents [data-layer-id]', function() {
         geoblacklight.removeBoundsOverlay();

data/app/assets/stylesheets/geoblacklight/_blacklight_overrides.scss

@@ -4,7 +4,7 @@
 
 $logo-image: image_url('blacklight/logo.svg') !default
 
-.navbar-brand {  /* The main logo image for the Blacklight instance */
+.navbar-logo {  /* The main logo image for the Blacklight instance */
   @if $logo-image {
     background: transparent $logo-image no-repeat top left;
   }

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

@@ -45,7 +45,7 @@ module Geoblacklight
     end
 
     def same_institution?
-      fetch(Settings.FIELDS.PROVENANCE).casecmp(Settings.INSTITUTION.downcase).zero?
+      fetch(Settings.FIELDS.PROVENANCE, '').casecmp(Settings.INSTITUTION.downcase).zero?
     end
 
     def iiif_download

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

@@ -2,7 +2,7 @@
 
 <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/geoblacklight.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   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'

data/lib/generators/geoblacklight/install_generator.rb

@@ -91,6 +91,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/catalog_controller.rb

@@ -257,6 +257,8 @@ class CatalogController < ApplicationController
     # 'worldEco'
     # 'flatBlue'
     # 'midnightCommander'
+    # 'openstreetmapHot'
+    # 'openstreetmapStandard'
 
     config.basemap_provider = 'positron'
 

data/lib/generators/geoblacklight/webpacker_generator.rb

@@ -7,7 +7,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/download.rb

@@ -55,8 +55,8 @@ module Geoblacklight
 
     ##
     # Initiates download from a remote source url using the `request_params`.
-    # Will catch Faraday::Error::ConnectionFailed and
-    # Faraday::Error::TimeoutError
+    # Will catch Faraday::ConnectionFailed and
+    # Faraday::TimeoutError
     # @return [Faraday::Request] returns a Faraday::Request object
     def initiate_download
       conn = Faraday.new(url: url)
@@ -65,11 +65,11 @@ module Geoblacklight
         request.options.timeout = timeout
         request.options.open_timeout = timeout
       end
-    rescue Faraday::Error::ConnectionFailed
+    rescue Faraday::ConnectionFailed
       raise Geoblacklight::Exceptions::ExternalDownloadFailed,
             message: 'Download connection failed',
             url: conn.url_prefix.to_s
-    rescue Faraday::Error::TimeoutError
+    rescue Faraday::TimeoutError
       raise Geoblacklight::Exceptions::ExternalDownloadFailed,
             message: 'Download timed out',
             url: conn.url_prefix.to_s

data/lib/geoblacklight/metadata/base.rb

@@ -54,10 +54,10 @@ module Geoblacklight
           return response.body unless response.nil? || response.status == 404
           Geoblacklight.logger.error "Could not reach #{@reference.endpoint}"
           ''
-        rescue Faraday::Error::ConnectionFailed => error
+        rescue Faraday::ConnectionFailed => error
           Geoblacklight.logger.error error.inspect
           ''
-        rescue Faraday::Error::TimeoutError => error
+        rescue Faraday::TimeoutError => error
           Geoblacklight.logger.error error.inspect
           ''
         rescue OpenSSL::SSL::SSLError => error

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/geoblacklight/wms_layer.rb

@@ -24,10 +24,10 @@ module Geoblacklight
         request.options.timeout = Settings.TIMEOUT_WMS
         request.options.open_timeout = Settings.TIMEOUT_WMS
       end
-    rescue Faraday::Error::ConnectionFailed => error
+    rescue Faraday::ConnectionFailed => error
       Geoblacklight.logger.error error.inspect
       { error: error.inspect }
-    rescue Faraday::Error::TimeoutError => error
+    rescue Faraday::TimeoutError => error
       Geoblacklight.logger.error error.inspect
       { error: error.inspect }
     end

data/solr/conf/schema.xml

@@ -147,8 +147,8 @@
     <!-- Adding field type for bboxField that enables, among other things, overlap ratio calculations -->
     <fieldType name="bbox" class="solr.BBoxField"
            geo="true" distanceUnits="kilometers" numberType="pdouble" />
-    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>   
-   
+    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+
 
   </types>
 
@@ -169,8 +169,8 @@
   <copyField source="layer_slug_s"       dest="layer_slug_ti"       maxChars="100"/>
 
   <!-- core text search -->
-  <copyField source="*_ti"               dest="text" />
-  <copyField source="*_tmi"              dest="text" />
+  <copyField source="*_s"                dest="text" />
+  <copyField source="*_sm"               dest="text" />
 
   <!-- for sorting text fields -->
   <copyField source="dct_provenance_s"   dest="dct_provenance_sort"/>
@@ -192,7 +192,7 @@
   <copyField source="dct_provenance_s" dest="suggest"/>
   <copyField source="dc_subject_sm" dest="suggest"/>
   <copyField source="dct_spatial_sm" dest="suggest"/>
-  
+
   <!-- for bbox value -->
   <copyField source="solr_geom" dest="solr_bboxtype"/>
 </schema>

data/spec/controllers/download_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Geoblacklight::DownloadController, type: :controller do
+describe DownloadController, type: :controller do
   describe '#file' do
     describe 'restricted file' do
       it 'redirects to login for authentication' do

data/spec/controllers/wms_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Geoblacklight::WmsController, type: :controller do
+describe WmsController, type: :controller do
   let(:wms_layer) { instance_double('Geoblacklight::WmsLayer') }
   let(:feature_info) { { values: ['fid', 'layer:example'] } }
   let(:params) do

data/spec/features/configurable_basemap_spec.rb

@@ -23,4 +23,13 @@ feature 'Configurable basemap', js: true do
       expect(page).to have_css "img[src*='dark_all']"
     end
   end
+  feature 'using openstreetmapHot' do
+    before do
+      CatalogController.blacklight_config.basemap_provider = 'openstreetmapHot'
+    end
+    scenario 'has openstreetmapHot map' do
+      visit root_path
+      expect(page).to have_css "img[src*='hot']"
+    end
+  end
 end

data/spec/features/esri_viewer_spec.rb

@@ -13,7 +13,6 @@ feature 'feature_layer reference', js: true do
     expect(page).to have_css 'img.leaflet-image-layer', visible: true
   end
   scenario 'displays dynamic layer (single layer)' do
-    pending 'external service disabled cors access'
     visit solr_document_path '4669301e-b4b2-4c8b-bf40-01b968a2865b'
     expect(page).to have_css '.leaflet-control-zoom', visible: true
     expect(page).to have_css 'img.leaflet-image-layer', visible: true

data/spec/features/missing_metadata_spec.rb

@@ -9,4 +9,16 @@ feature 'Missing metadata', js: true do
     visit solr_document_path('aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20')
     expect(page).to have_css('#map')
   end
+  scenario 'Yields error free show page for no layer_geom_type_s' do
+    visit solr_document_path('05d-03-noGeomType')
+    expect(page).to have_css('#map')
+  end
+  scenario 'Yields error free show page for no dct_provenance_s' do
+    visit solr_document_path('99-0001-noProvenance')
+    expect(page).to have_css('#map')
+  end
+  scenario 'Yields error free show page for no solr_geom' do
+    visit solr_document_path('05d-p16022coll246-noGeo')
+    expect(page).to have_css('#map')
+  end
 end

data/spec/features/split_view.html.erb_spec.rb

@@ -30,7 +30,7 @@ feature 'Index view', js: true do
       expect(page).to have_css('div.card.facet-limit', text: 'Data type')
       expect(page).to have_css('div.card.facet-limit', text: 'Format')
     end
-    click_link 'Institution'
+    click_button 'Institution'
     using_wait_time 120 do
       expect(page).to have_css('a.facet-select', text: 'Minnesota', visible: true)
       expect(page).to have_css('a.facet-select', text: 'MIT', visible: true)

data/spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json

@@ -0,0 +1,30 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2019-12-16T15:57:35Z",
+  "layer_slug_s": "99-0001-noProvenance",
+  "dc_identifier_s": "99-0001-noProvenance",
+  "dc_title_s": "Social Explorer",
+  "dct_temporal_sm": [
+    "1790-present"
+  ],
+  "dc_description_s": "Requires creating a free account or logging in through an organization with licensed access. This interactive website includes the entire US census history from 1790 to 2000, the American Community Survey (ACS), and the Religious Congregations and Membership Study (RCMS) from 1980 to 2000? the most complete census available on religion in the U.S. Overall, the site contains 39 billion data points, 200,000 variables, and 15,000 interactive maps",
+  "dc_subject_sm": [
+    "Society"
+  ],
+  "dc_type_sm": [
+    "Interactive Resource"
+  ],
+  "dc_rights_s": "Restricted",
+  "layer_geom_type_s": "Table",
+  "solr_geom": "ENVELOPE(-179.9,-64.4,71.6,-14.8)",
+  "dc_publisher_sm": [
+    "Social Explorer"
+  ],
+  "dc_creator_sm": [
+    "Queens College (New York, N.Y.). Department of Sociology"
+  ],
+  "dct_spatial_sm": [
+    "United States"
+  ],
+  "dct_references_s": "{\"http://schema.org/url\":\"https://www.socialexplorer.com/\"}"
+}

data/spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json

@@ -0,0 +1,17 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2020-01-17T15:31:30Z",
+  "layer_slug_s": "05d-03-noGeomType",
+  "dc_identifier_s": "05d-03-noGeomType",
+  "dc_title_s": "University of Minnesota Digital Conservancy DRUM",
+  "dc_description_s": "DRUM is a publicly available collection of digital research data generated by University of Minnesota researchers, students, and staff. Anyone can search and download the data housed in the repository, instantly or by request.",
+  "dc_publisher_sm": [
+    "University of Minnesota Digital Conservancy"
+  ],
+  "dc_type_sm": [
+    "Collection"
+  ],
+  "dct_provenance_s": "Minnesota",
+  "dc_rights_s": "Public",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://conservancy.umn.edu/handle/11299/166578\"}"
+}

data/spec/fixtures/solr_documents/metadata_no_solr_geom.json

@@ -0,0 +1,23 @@
+{
+  "geoblacklight_version": "1.0",
+  "layer_modified_dt": "2020-01-23T14:01:19Z",
+  "layer_slug_s": "05d-p16022coll246-noGeo",
+  "dc_identifier_s": "05d-p16022coll246-noGeo",
+  "dc_title_s": "Ames Library of South Asia Maps",
+  "dc_description_s": "A collection of maps covering Asia held by the University of Minnesota's Ames Library of South Asia.",
+  "dc_publisher_sm": [
+    "University of Minnesota"
+  ],
+  "dc_type_sm": [
+    "Collection"
+  ],
+  "layer_geom_type_s": "Table",
+  "dct_provenance_s": "Minnesota",
+  "dct_spatial_sm": [
+    "Asia",
+    "India",
+    "Afghanistan"
+  ],
+  "dc_rights_s": "Public",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://umedia.lib.umn.edu/search?facets[collection_name_s][]=Ames+Library+of+South+Asia+Maps\"}"
+}

data/spec/lib/geoblacklight/download_spec.rb

@@ -141,14 +141,14 @@ describe Geoblacklight::Download do
 
     it 'raises Geoblacklight::Exceptions::ExternalDownloadFailed with a connection failure' do
       expect(faraday_connection).to receive(:url_prefix).and_return 'http://www.example.com/wms'
-      expect(faraday_connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new('Failed'))
+      expect(faraday_connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new('Failed'))
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(faraday_connection)
       expect { download.initiate_download }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed)
     end
 
     it 'raises Geoblacklight::Exceptions::ExternalDownloadFailed with a connection timout' do
       expect(faraday_connection).to receive(:url_prefix).and_return 'http://www.example.com/wms'
-      expect(faraday_connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+      expect(faraday_connection).to receive(:get).and_raise(Faraday::TimeoutError)
       expect(Faraday).to receive(:new).with(url: 'http://www.example.com/wms').and_return(faraday_connection)
       expect { download.initiate_download }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed)
     end

data/spec/lib/geoblacklight/metadata/base_spec.rb

@@ -30,7 +30,7 @@ describe Geoblacklight::Metadata::Base do
       subject { metadata.document }
 
       before do
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed, 'test connection failures')
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed, 'test connection failures')
       end
 
       it 'returns nil when a connection error' do
@@ -73,7 +73,7 @@ describe Geoblacklight::Metadata::Base do
 
     context 'when attempts to connect to an endpoint URL fail' do
       before do
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed, 'test connection failures')
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed, 'test connection failures')
       end
 
       it 'returns true' do
@@ -144,7 +144,7 @@ describe Geoblacklight::Metadata::Base do
     context 'when requesting the metadata resource times out' do
       before do
         allow(geocombine_metadata).to receive(:to_html).and_return('')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>')
       end
 

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -73,7 +73,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection fails' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::ConnectionFailed wrapped=#<StandardError: test connection error>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::ConnectionFailed.new(StandardError.new('test connection error')))
+        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new(StandardError.new('test connection error')))
       end
 
       it 'logs the Faraday error' do
@@ -86,7 +86,7 @@ describe Geoblacklight::WmsLayer do
     context 'when the HTTP connection times out' do
       before do
         allow(Geoblacklight.logger).to receive(:error).with('#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>')
-        allow(connection).to receive(:get).and_raise(Faraday::Error::TimeoutError)
+        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
       end
 
       it 'logs the Faraday error' do

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'sprockets', '< 4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,30 +73,30 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -429,7 +429,6 @@ files:
 - app/assets/images/blacklight/leaf.svg
 - app/assets/images/blacklight/lewis-clark.svg
 - app/assets/images/blacklight/line.svg
-- app/assets/images/blacklight/logo.png
 - app/assets/images/blacklight/logo.svg
 - app/assets/images/blacklight/map-marker.svg
 - app/assets/images/blacklight/map.svg
@@ -717,6 +716,9 @@ files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
+- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
+- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
+- spec/fixtures/solr_documents/metadata_no_solr_geom.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -776,6 +778,7 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html
 - spec/test_app_templates/metadata/fgdc.xml
@@ -822,7 +825,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -888,6 +891,9 @@ test_files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
+- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
+- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
+- spec/fixtures/solr_documents/metadata_no_solr_geom.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -947,6 +953,7 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/teaspoon_env.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html
 - spec/test_app_templates/metadata/fgdc.xml