geoblacklight 4.1.1 → 4.3.0

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

@@ -26,9 +26,14 @@ GeoBlacklight.Util = {
     });
     if (data.iiifUrl && !data.thumbnailUrl) {
       var manifest = $.getJSON(data.iiifUrl, function(manifestResponse) {
-        if (manifestResponse.thumbnail['@id'] !== null) {
-          data.thumbnailUrl = manifestResponse.thumbnail['@id'];
-          thumbDeferred.resolve();
+        try {
+          if (manifestResponse.thumbnail['@id'] !== null) {
+            data.thumbnailUrl = manifestResponse.thumbnail['@id'];
+            thumbDeferred.resolve();
+          }
+        }
+        catch(err) {
+          cb(HandlebarsTemplates["index_map_info"](data));
         }
       });
     } else {

data/app/assets/javascripts/geoblacklight/templates/index_map_info.hbs

@@ -8,12 +8,21 @@
     {{#if thumbnailUrl}}
       {{#if websiteUrl}}
         <a href="{{websiteUrl}}">
-          <img src="{{thumbnailUrl}}" class="img-responsive">
+          <img src="{{thumbnailUrl}}" class="img-fluid">
         </a>
       {{else}}
         <img src="{{thumbnailUrl}}">
       {{/if}}
     {{/if}}
+    {{#if thumbUrl}}
+      {{#if websiteUrl}}
+        <a href="{{websiteUrl}}">
+          <img src="{{thumbUrl}}" class="img-fluid">
+        </a>
+      {{else}}
+        <img src="{{thumbUrl}}">
+      {{/if}}
+    {{/if}}
     <dl class="row dl-invert document-metadata">
       {{#if websiteUrl}}
         <dt class="col-sm-3">Website:</dt>
@@ -23,10 +32,22 @@
         <dt class="col-sm-3">Download:</dt>
         <dd class="col-sm-9"><a href="{{downloadUrl}}">{{downloadUrl}}</a></dd>
       {{/if}}
+      {{#if download}}
+        <dt class="col-sm-3">Download:</dt>
+        <dd class="col-sm-9"><a href="{{download}}">{{download}}</a></dd>
+      {{/if}}
+      {{#if iiifUrl}}
+        <dt class="col-sm-3">iiif URL:</dt>
+        <dd class="col-sm-9"><a href="{{iiifUrl}}">{{iiifUrl}}</a></dd>
+      {{/if}}
       {{#if recordIdentifier}}
         <dt class="col-sm-3">Record Identifier:</dt>
         <dd class="col-sm-9">{{recordIdentifier}}</dd>
       {{/if}}
+      {{#if recId}}
+        <dt class="col-sm-3">Record Identifier:</dt>
+        <dd class="col-sm-9">{{recId}}</dd>
+      {{/if}}
       {{#if label}}
         <dt class="col-sm-3">Label:</dt>
         <dd class="col-sm-9">{{label}}</dd>

data/app/assets/javascripts/geoblacklight/viewers/cog.js

@@ -0,0 +1,5 @@
+//= require geoblacklight/viewers/viewer
+
+GeoBlacklight.Viewer.Cog = GeoBlacklight.Viewer.extend({
+  load: function() {}
+});

data/app/assets/javascripts/geoblacklight/viewers/pmtiles.js

@@ -0,0 +1,5 @@
+//= require geoblacklight/viewers/viewer
+
+GeoBlacklight.Viewer.Pmtiles = GeoBlacklight.Viewer.extend({
+  load: function() {}
+});

data/app/controllers/download_controller.rb

@@ -7,7 +7,7 @@ class DownloadController < ApplicationController
   rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|
     Geoblacklight.logger.error exception.message + " " + exception.url
     flash[:danger] = view_context
-      .tag.span(flash_error_message(exception),
+      .tag.span(t("geoblacklight.download.error"),
         data: {
           download: "error",
           download_id: params[:id],
@@ -55,26 +55,6 @@ class DownloadController < ApplicationController
     end
   end
 
-  protected
-
-  ##
-  # Creates an error flash message with failed download url
-  # @param [Geoblacklight::Exceptions::ExternalDownloadFailed] Download failed
-  # exception
-  # @return [String] error message to display in flash
-  def flash_error_message(exception)
-    if exception.url.present?
-      t("geoblacklight.download.error_with_url",
-        link: view_context
-                        .link_to(exception.url,
-                          exception.url,
-                          target: "blank"))
-        .html_safe
-    else
-      t("geoblacklight.download.error")
-    end
-  end
-
   private
 
   def download_file_path_and_name

data/app/frontend/clover/clover_initializer.js

@@ -0,0 +1,29 @@
+import { createElement } from 'react'
+import { createRoot } from 'react-dom/client'
+import Viewer from '@samvera/clover-iiif/viewer'
+
+export default class CloverInitializer {
+  constructor () {
+    this.element = document.getElementById('clover-viewer')
+    if (this.element) {
+      this.iiif_content = this.element.attributes['iiif_content'].value
+    }
+  }
+
+  run () {
+    if (!this.iiif_content) return false
+    const root = createRoot(document.getElementById('clover-viewer'))
+    root.render(createElement(Viewer, { id: this.iiif_content, options: this.config }))
+  }
+
+  get config () {
+    return {
+      showTitle: false,
+      showIIIFBadge: false,
+      informationPanel: {
+        renderToggle: false,
+        renderAbout: false
+      }
+    }
+  }
+}

data/app/frontend/entrypoints/application.js

@@ -0,0 +1,28 @@
+// To see this message, add the following to the `<head>` section in your
+// views/layouts/application.html.erb
+//
+//    <%= vite_client_tag %>
+//    <%= vite_javascript_tag 'application' %>
+console.log('Vite ⚡️ Rails - Engine')
+
+// If using a TypeScript entrypoint file:
+//     <%= vite_typescript_tag 'application' %>
+//
+// If you want to use .jsx or .tsx, add the extension:
+//     <%= vite_javascript_tag 'application.jsx' %>
+
+console.log('Visit the guide for more information: ', 'https://vite-ruby.netlify.app/guide/rails')
+
+// Example: Load Rails libraries in Vite.
+//
+// import * as Turbo from '@hotwired/turbo'
+// Turbo.start()
+//
+// import ActiveStorage from '@rails/activestorage'
+// ActiveStorage.start()
+//
+// // Import all channels.
+// const channels = import.meta.globEager('./**/*_channel.js')
+
+// Example: Import a stylesheet in app/frontend/index.css
+// import '~/index.css'

data/app/frontend/entrypoints/clover.js

@@ -0,0 +1,5 @@
+import CloverInitializer from '@/clover/clover_initializer'
+
+document.addEventListener('DOMContentLoaded', () => {
+  new CloverInitializer().run()
+})

data/app/frontend/entrypoints/ol.js

@@ -0,0 +1,5 @@
+import OlInitializer from '@/openlayers/ol_initializer'
+
+document.addEventListener('DOMContentLoaded', () => {
+  new OlInitializer().run()
+})

data/app/frontend/openlayers/basemaps.js

@@ -0,0 +1,47 @@
+export  const openLayersBasemaps = {
+  darkMatter: {
+    url:'https://{a-d}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  positron: {
+    url: 'https://{a-d}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  positronLite: {
+    url: 'https://{a-d}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  worldAntique: {
+    url: 'https://cartocdn_{a-d}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  worldEco: {
+    url: 'https://cartocdn_{a-d}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  flatBlue: {
+    url: 'https://cartocdn_{a-d}.global.ssl.fastly.net/base-flatblue/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+    maxZoom: 18
+  },
+  midnightCommander: {
+    url: 'https://cartocdn_{a-d}.global.ssl.fastly.net/base-midnight/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://carto.com/attributions">Carto</a>',
+      maxZoom: 18
+  },
+  openstreetmapHot: {
+    url: 'https://{a-c}.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
+  },
+  openstreetmapStandard: {
+    url: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+    maxZoom: 19
+  }
+}

data/app/frontend/openlayers/ol_initializer.js

@@ -0,0 +1,105 @@
+import '../stylesheets/openlayers.css'
+import { Map, View } from 'ol'
+import TileLayer from 'ol/layer/Tile'
+import VectorTile from 'ol/layer/VectorTile'
+import XYZ from 'ol/source/XYZ'
+import GeoJSON from 'ol/format/GeoJSON'
+import { useGeographic } from 'ol/proj'
+import {
+  Style, Stroke, Fill, Circle
+} from 'ol/style'
+import GeoTIFF from 'ol/source/GeoTIFF'
+import WebGLTileLayer from 'ol/layer/WebGLTile'
+import { FullScreen, defaults as defaultControls } from 'ol/control'
+import { PMTilesVectorSource } from 'ol-pmtiles'
+import { openLayersBasemaps }  from './basemaps'
+
+export default class OlInitializer {
+  constructor () {
+    this.element = document.getElementById('ol-map')
+    if (this.element) {
+      this.data = this.element.dataset
+      this.extent = new GeoJSON().readFeatures(this.data.mapGeom)[0].getGeometry().getExtent()
+    }
+  }
+
+  run () {
+    if (!this.element) return false
+    if (this.data.protocol === 'Pmtiles') {
+      this.initializePmtiles()
+    } else if (this.data.protocol === 'Cog') {
+      this.initializeCog()
+    }
+  }
+
+  baseLayer () {
+    const basemap = openLayersBasemaps[this.data.basemap]
+    const layer = new TileLayer({
+      source: new XYZ({
+        attributions: basemap["attribution"],
+        url: basemap["url"],
+        maxZoom: basemap["maxZoom"]
+      })
+    })
+    return layer
+  }
+
+  initializePmtiles () {
+    const vectorLayer = new VectorTile({
+      declutter: true,
+      source: new PMTilesVectorSource({
+        url: this.data.url
+      }),
+      style: new Style({
+        stroke: new Stroke({
+          color: '#7070B3',
+          width: 1
+        }),
+        fill: new Fill({
+          color: '#FFFFFF'
+        }),
+        image: new Circle({
+          radius: 7,
+          fill: new Fill({
+            color: '#7070B3'
+          }),
+          stroke: new Stroke({
+            color: '#FFFFFF',
+            width: 2
+          })
+        })
+      })
+    })
+
+    useGeographic()
+    const map = new Map({
+      controls: defaultControls().extend([new FullScreen()]),
+      layers: [this.baseLayer(), vectorLayer],
+      target: 'ol-map'
+    })
+    map.getView().fit(this.extent, map.getSize())
+  }
+
+  initializeCog () {
+    const source = new GeoTIFF({
+      sources: [{ url: this.data.url }]
+    })
+
+    source.getView().then((view) => {
+      const map = new Map({
+        controls: defaultControls().extend([new FullScreen()]),
+        target: 'ol-map',
+        layers: [
+          this.baseLayer(),
+          new WebGLTileLayer({
+            source
+          })
+        ],
+        view: new View({
+          center: view.center
+        })
+      })
+      map.getView().fit(view.extent, map.getSize())
+    })
+  }
+}

data/app/frontend/stylesheets/openlayers.css

@@ -0,0 +1 @@
+@import "../../../node_modules/ol/ol.css";

data/app/helpers/geoblacklight_helper.rb

@@ -245,4 +245,58 @@ module GeoblacklightHelper
       "index"
     end
   end
+
+  def viewer_container
+    if openlayers_container?
+      ol_viewer
+    elsif iiif_manifest_container?
+      iiif_manifest_viewer
+    else
+      leaflet_viewer
+    end
+  end
+
+  def openlayers_container?
+    return false unless @document
+    @document.item_viewer.pmtiles || @document.item_viewer.cog
+  end
+
+  def leaflet_viewer
+    tag.div(nil,
+      id: "map",
+      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?,
+        :basemap => geoblacklight_basemap,
+        :leaflet_options => leaflet_options
+      })
+  end
+
+  def ol_viewer
+    tag.div(nil,
+      id: "ol-map",
+      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?,
+        :basemap => geoblacklight_basemap,
+        :leaflet_options => leaflet_options
+      })
+  end
+
+  def iiif_manifest_container?
+    return false unless @document
+    @document&.item_viewer&.viewer_preference&.key?(:iiif_manifest)
+  end
+
+  def iiif_manifest_viewer
+    tag.div(nil, id: "clover-viewer", iiif_content: @document.viewer_endpoint)
+  end
 end

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

@@ -7,7 +7,7 @@
   </div>
   <div class="modal-body" data-clipboard-target="source">
     <div class="alert alert-info d-none" role="alert">
-      Citation copied to clipboard
+      <%= t('geoblacklight.clipboard.citation') %>
       <button type="button" class="close" data-dismiss="alert" aria-label="Close">
         <span aria-hidden="true">&times;</span>
       </button>

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

@@ -23,7 +23,6 @@
       </div>
     <% 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-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 %>
+    <%= viewer_container %>
   </div>
 </div>

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

@@ -4,5 +4,10 @@
   <label for='<%= reference.type%>_webservice'>
     <%= "#{formatted_name_reference(reference.type)}" %>
   </label>
-  <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' readonly='readonly' class='form-control'>
+  <div class='input-group'>  
+    <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' readonly='readonly' class='form-control'>
+    <div class="input-group-append">
+      <button button type="button" class="btn btn-primary" data-action="copyToClipboard" data-clipboard-value='<%= reference.endpoint %>'><%= t('blacklight.modal.copy') %></button>
+    </div>
+  </div>
 </div>

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

@@ -4,5 +4,10 @@
 
 <div class="form-group form-inline">
   <label for="wfs_abv_webservice" class="mr-2"><%= t('geoblacklight.references.wfs_abv')%> <code><%= t('geoblacklight.references.wfs_label')%></code></label>
-  <input id="wfs_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control">
+  <div class='input-group'>
+    <input id="wfs_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control">
+    <div class="input-group-append">
+      <button button type="button" class="btn btn-primary"  data-action="copyToClipboard" data-clipboard-value='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
+    </div>
+  </div>
 </div>

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

@@ -4,5 +4,10 @@
 
 <div class="form-group form-inline">
   <label for="wms_abv_webservice" class="mr-2"><%= t('geoblacklight.references.wms_abv')%> <code><%= t('geoblacklight.references.wms_label')%></code></label>
-  <input id="wms_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control">
+  <div class='input-group'>
+    <input id="wms_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control" data-action="copyToClipboard" data-clipboard-value='<%= document.wxs_identifier %>'>
+    <div class="input-group-append">
+      <button button type="button" class="btn btn-primary"  data-action="copyToClipboard" data-clipboard-value='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
+    </div>
+  </div>
 </div>

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

@@ -5,8 +5,24 @@
   </button>
 </div>
 <div class="modal-body web-services-modal-body">
+  <div class="alert alert-info d-none" role="alert">
+  <%= t('geoblacklight.clipboard.web_service') %>
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
   <%= render partial: 'web_services' %>
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default hide-without-js" data-dismiss="modal"><%= t('geoblacklight.references.services_close')%></button>
 </div>
+
+<script>
+    $('[data-action="copyToClipboard"]').on('click', function() {
+        let text = $(this).data('clipboard-value');       
+        navigator.clipboard.writeText(text)
+            .then(() => {
+                $('.alert').removeClass('d-none');
+            })
+    });
+</script>

data/bin/vite

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'vite' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("vite_ruby", "vite")

data/config/locales/geoblacklight.en.yml

@@ -4,6 +4,9 @@ en:
     location: 'Location'
     citation:
       retrieved_from: 'Retrieved from %{document_url}'
+    clipboard:
+      citation: Citation copied to clipboard
+      web_service: Web service copied to clipboard
     download:
       download: 'Download'
       download_link: 'Original %{download_format}'
@@ -14,8 +17,7 @@ en:
       hgl_close: 'Close'
       hgl_instructions: 'Please enter your email address. You will receive a link to download the layer when it is ready.' ## new variable
       hgl_email: 'Email'
-      error: 'Sorry, the requested file could not be downloaded'
-      error_with_url: 'Sorry, the requested file could not be downloaded. Try downloading it directly from: %{link}'
+      error: 'Sorry, the requested file could not be downloaded.'
       export_formats: 'Export Formats'
       export_link: 'Export %{download_format}'
       export_shapefile_link: 'Shapefile'
@@ -70,6 +72,8 @@ en:
       tilejson: 'TileJSON Document'
       xyz: 'XYZ Tiles'
       wmts: 'Web Map Tile Service'
+      pmtiles: 'PMTiles Layer'
+      cog: 'COG Layer'
     relations:
       member_of_ancestors: 'Belongs to collection...'
       member_of_descendants: 'Collection records...'
@@ -98,6 +102,9 @@ en:
       click_map: 'Click on map to inspect values'
     help_text:
       viewer_protocol:
+        cog:
+          title: COG Layer
+          content: A Cloud Optimized GeoTIFF
         dynamic_map_layer:
           title: ArcGIS Dynamic Map Layer
           content: An ArcGIS Dynamic Map Layer represents vector data (points, lines, and polygons). Map image layers are dynamically rendered image tiles.
@@ -119,6 +126,9 @@ en:
         oembed:
           title: Embedded Content
           content: This content is embedded through a third-party viewer.
+        pmtiles:
+          title: PMTiles Layer
+          content: A PMTiles layer is a single-file archive format for tiled data.
         tiled_map_layer:
           title: ArcGIS Tiled Map Layer
           content: An ArcGIS Tiled Map Layer Service displays set of web-accessible tiles that reside on a server.

data/config/vite.json

@@ -0,0 +1,14 @@
+{
+  "all": {
+    "sourceCodeDir": "app/frontend",
+    "publicOutputDir": "geoblacklight-vite",
+    "watchAdditionalPaths": []
+  },
+  "development": {
+    "autoBuild": true,
+    "port": 3037
+  },
+  "test": {
+    "autoBuild": true
+  }
+}

data/geoblacklight.gemspec

@@ -17,16 +17,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency "rails", ">= 6.1", "< 7.1"
-  spec.add_dependency "blacklight", ">= 7.0", "<= 7.33"
+  spec.add_dependency "rails", ">= 6.1", "< 7.2"
+  spec.add_dependency "blacklight", "~> 7.0"
   spec.add_dependency "config"
-  spec.add_dependency "faraday", ">= 1.0"
+  spec.add_dependency "faraday", "~> 2.0"
   spec.add_dependency "coderay"
   spec.add_dependency "deprecation"
-  spec.add_dependency "geo_combine", "~> 0.8"
+  spec.add_dependency "geo_combine", "~> 0.9"
   spec.add_dependency "mime-types"
   spec.add_dependency "handlebars_assets"
   spec.add_dependency "rgeo-geojson"
+  spec.add_dependency "sprockets-rails", "~> 3.0"
+  spec.add_dependency "vite_rails", "~> 3.0"
 
   spec.add_development_dependency "solr_wrapper"
   spec.add_development_dependency "rails-controller-testing"
@@ -35,8 +37,8 @@ Gem::Specification.new do |spec|
   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 "simplecov", "~> 0.17.1"
+  spec.add_development_dependency "database_cleaner", "~> 2.0"
+  spec.add_development_dependency "simplecov", "~> 0.22"
   spec.add_development_dependency "foreman"
   spec.add_development_dependency "standardrb", "1.0.1"
   spec.add_development_dependency "webmock", "~> 3.14"