geoblacklight 6.0.0.pre.alpha.3 → 6.0.0.pre.alpha.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.alpha.3
+  version: 6.0.0.pre.alpha.5
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 2026-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rsolr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -436,14 +422,16 @@ files:
 - app/components/geoblacklight/display_note_component.rb
 - app/components/geoblacklight/document/citation_component.html.erb
 - app/components/geoblacklight/document/citation_component.rb
+- app/components/geoblacklight/document/download_link_component.html.erb
+- app/components/geoblacklight/document/download_link_component.rb
+- app/components/geoblacklight/document/download_links_component.html.erb
+- app/components/geoblacklight/document/download_links_component.rb
 - app/components/geoblacklight/document/relations_container_component.html.erb
 - app/components/geoblacklight/document/relations_container_component.rb
 - app/components/geoblacklight/document/sidebar_component.html.erb
 - app/components/geoblacklight/document/sidebar_component.rb
 - app/components/geoblacklight/document_component.html.erb
 - app/components/geoblacklight/document_component.rb
-- app/components/geoblacklight/download_links_component.html.erb
-- app/components/geoblacklight/download_links_component.rb
 - app/components/geoblacklight/header_component.html.erb
 - app/components/geoblacklight/header_component.rb
 - app/components/geoblacklight/header_icons_component.html.erb
@@ -479,12 +467,10 @@ files:
 - app/components/geoblacklight/web_services_wfs_component.rb
 - app/components/geoblacklight/web_services_wms_component.html.erb
 - app/components/geoblacklight/web_services_wms_component.rb
-- app/controllers/download_controller.rb
 - app/controllers/relation_controller.rb
 - app/controllers/wms_controller.rb
 - app/helpers/geoblacklight_helper.rb
 - app/javascript/geoblacklight/controllers/clipboard_controller.js
-- app/javascript/geoblacklight/controllers/downloads_controller.js
 - app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js
 - app/javascript/geoblacklight/controllers/oembed_viewer_controller.js
 - app/javascript/geoblacklight/controllers/openlayers_viewer_controller.js
@@ -556,12 +542,6 @@ files:
 - lib/geoblacklight/configuration/settings_builder.rb
 - lib/geoblacklight/constants.rb
 - lib/geoblacklight/deprecation.rb
-- lib/geoblacklight/download.rb
-- lib/geoblacklight/download/csv_download.rb
-- lib/geoblacklight/download/geojson_download.rb
-- lib/geoblacklight/download/geotiff_download.rb
-- lib/geoblacklight/download/kmz_download.rb
-- lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
 - lib/geoblacklight/geometry.rb
@@ -581,7 +561,6 @@ files:
 - lib/geoblacklight/relation/descendants.rb
 - lib/geoblacklight/relation/relation_response.rb
 - lib/geoblacklight/routes.rb
-- lib/geoblacklight/routes/downloadable.rb
 - lib/geoblacklight/routes/exportable.rb
 - lib/geoblacklight/routes/wms.rb
 - lib/geoblacklight/version.rb
@@ -622,7 +601,6 @@ files:
 - spec/components/geoblacklight/viewer_help_text_component_spec.rb
 - spec/components/geoblacklight/web_services_component_spec.rb
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
 - spec/controllers/wms_controller_spec.rb
 - spec/factories/user.rb
@@ -631,23 +609,17 @@ files:
 - spec/features/citations_spec.rb
 - spec/features/configurable_basemap_spec.rb
 - spec/features/data_dictionary_download_spec.rb
-- spec/features/download_layer_spec.rb
 - spec/features/empty_search_spec.rb
-- spec/features/esri_viewer_spec.rb
 - spec/features/exports_spec.rb
 - spec/features/full_screen_control_spec.rb
 - spec/features/help_text_spec.rb
 - spec/features/home_page_spec.rb
-- spec/features/index_map_spec.rb
 - spec/features/index_view_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_opacity_spec.rb
 - spec/features/layer_preview_spec.rb
-- spec/features/layer_with_no_references_spec.rb
-- spec/features/linkified_attribute_table_spec.rb
 - spec/features/metadata_panel_spec.rb
 - spec/features/missing_metadata_spec.rb
-- spec/features/multiple_downloads_spec.rb
 - spec/features/oembed_spec.rb
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
@@ -657,7 +629,6 @@ files:
 - spec/features/search_results_map_spec.rb
 - spec/features/search_results_overlap_ratio_spec.rb
 - spec/features/search_spec.rb
-- spec/features/show_page_download_spec.rb
 - spec/features/show_page_metadata_spec.rb
 - spec/features/sms_spec.rb
 - spec/features/suppressed_records_spec.rb
@@ -750,12 +721,6 @@ files:
 - spec/lib/geoblacklight/configuration/leaflet_layers_config_spec.rb
 - spec/lib/geoblacklight/configuration/settings_builder_spec.rb
 - spec/lib/geoblacklight/configuration_spec.rb
-- spec/lib/geoblacklight/download/csv_download_spec.rb
-- spec/lib/geoblacklight/download/geojson_download_spec.rb
-- spec/lib/geoblacklight/download/geotiff_download_spec.rb
-- spec/lib/geoblacklight/download/kmz_download_spec.rb
-- spec/lib/geoblacklight/download/shapefile_download_spec.rb
-- spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
@@ -785,7 +750,6 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
-- spec/tasks/geoblacklight_spec.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - template.rb
 homepage: http://github.com/geoblacklight/geoblacklight

data/app/components/geoblacklight/download_links_component.html.erb

@@ -1,31 +0,0 @@
-<div data-controller="downloads" class="downloads-sidebar">
-    <%# the dropdown-toggle class gives us the little arrow %>
-    <button type="button" class="btn btn-primary dropdown-toggle sidebar-btn" id="downloads-button" data-bs-toggle="collapse" data-bs-target="#downloads-collapse" aria-expanded="false" aria-controls="downloads-collapse">
-    <%= t('geoblacklight.download.download') %>
-    </button>
-    <div class="collapse" id="downloads-collapse">
-        <div class="card card-body">
-            <%# Renders the options of the downloads dropdown button %>
-            <% if document.direct_download.present? %>
-            <% if document.direct_download[:download].is_a? Array %>
-                <% document.direct_download[:download].each do |download| %>
-                <%= download_link_file(download['label'], document.id, download['url']) %>
-                <% end %>
-            <% end %>
-            <% if document.direct_download[:download].is_a? String %>
-                <%= download_link_file(download_text(document.file_format), document.id, document.direct_download[:download]) %>
-            <% end %>
-            <% end %>
-
-            <% if document.iiif_download.present? %>
-            <%= download_link_iiif %>
-            <% end %>
-
-            <% if document.download_types.present? %>
-            <% document.download_types.each do |type| %>
-                <%= download_link_generated(type.first, document) %>
-            <% end %>
-            <% end %>
-        </div>
-    </div>
-</div>

data/app/components/geoblacklight/download_links_component.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  # Display expandable file download links in sidebar
-  class DownloadLinksComponent < ViewComponent::Base
-    attr_reader :document
-
-    def initialize(document:)
-      @document = document
-      super()
-    end
-
-    def render?
-      downloadable? && (document.direct_download.present? || document.iiif_download.present? || document.download_types.present?)
-    end
-
-    def downloadable?
-      helpers.document_available?(@document) && @document.downloadable?
-    end
-
-    def download_link_file(label, id, url)
-      link_to(
-        label,
-        url,
-        "contentUrl" => url,
-        :data => {
-          download: "trigger",
-          download_type: "direct",
-          download_id: id
-        }
-      )
-    end
-
-    # Generates the link markup for the IIIF JPEG download
-    # @return [String]
-    def download_link_iiif
-      link_to(
-        download_text("JPG"),
-        iiif_jpg_url,
-        "contentUrl" => iiif_jpg_url,
-        :data => {
-          download: "trigger"
-        }
-      )
-    end
-
-    def download_link_generated(download_type, document)
-      link_to(
-        t("geoblacklight.download.export_link", download_format: export_format_label(download_type)),
-        "",
-        data: {
-          download_path: download_path(document.id, type: download_type),
-          download: "trigger",
-          action: "downloads#download:once",
-          download_type: download_type,
-          download_id: document.id,
-          download_preparing_message: t("geoblacklight.download.preparing"),
-          download_ready_message: t("geoblacklight.download.ready", type: download_type),
-          download_failed_message: t("geoblacklight.download.failed", type: download_type)
-        }
-      )
-    end
-
-    ##
-    # Wraps download text with proper_case_format
-    #
-    def download_text(format)
-      download_format = proper_case_format(format)
-      value = t("geoblacklight.download.download_link", download_format: download_format)
-      value.html_safe
-    end
-
-    # Format labels are customized for exports - look up the appropriate key.
-    def export_format_label(format)
-      t("geoblacklight.download.export_#{format.to_s.parameterize(separator: "_")}_link")
-    end
-
-    # Looks up properly formatted names for formats
-    def proper_case_format(format)
-      t("geoblacklight.formats.#{format.to_s.parameterize(separator: "_")}")
-    end
-
-    def iiif_jpg_url
-      @document.references.iiif.endpoint.sub! "info.json", "full/full/0/default.jpg"
-    end
-  end
-end

data/app/controllers/download_controller.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-class DownloadController < ApplicationController
-  include Blacklight::Catalog
-
-  rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|
-    Geoblacklight.logger.error exception.message + " " + exception.url
-    flash.now[:danger] = view_context
-      .tag.span(t("geoblacklight.download.error"),
-        data: {
-          download: "error",
-          download_id: params[:id],
-          download_type: "generated-#{params[:type]}"
-        })
-    respond_to do |format|
-      format.json { render json: [flash, ""], response: response, status: 500 }
-      format.html { render json: [flash, ""], response: response, status: 500 }
-    end
-  end
-
-  def show
-    @document = search_service.fetch params[:id]
-    restricted_should_authenticate
-    response = check_type
-    validate response
-    respond_to do |format|
-      format.json { render json: [flash, download_file_path(response)], response: response }
-      format.html { render json: [flash, download_file_path(response)], response: response }
-    end
-  end
-
-  def file
-    # Grab the solr document to check if it should be public or not
-    @document = search_service.fetch(file_name_to_id(params[:id]))
-    restricted_should_authenticate
-    send_file download_file_path_and_name, x_sendfile: true
-  end
-
-  private
-
-  def download_file_path_and_name
-    "#{Geoblacklight::Download.file_path}/#{params[:id]}.#{params[:format]}"
-  end
-
-  def check_type
-    case params[:type]
-    when "shapefile"
-      Geoblacklight::ShapefileDownload.new(@document).get
-    when "kmz"
-      Geoblacklight::KmzDownload.new(@document).get
-    when "geojson"
-      Geoblacklight::GeojsonDownload.new(@document).get
-    when "geotiff"
-      Geoblacklight::GeotiffDownload.new(@document).get
-    when "csv"
-      Geoblacklight::CsvDownload.new(@document).get
-    end
-  end
-
-  def validate(response)
-    flash.now[:success] = view_context.link_to(t("geoblacklight.download.success", title: response),
-      download_file_path(response),
-      data: {download: "trigger",
-             download_id: params[:id],
-             download_type: "generated-#{params[:type]}"})
-  end
-
-  # Checks whether a document is public, if not require user to authenticate
-  def restricted_should_authenticate
-    authenticate_user! unless @document.public?
-  end
-
-  def file_name_to_id(file_name)
-    file_name.split("-")[0..-2].join("-")
-  end
-end

data/app/javascript/geoblacklight/controllers/downloads_controller.js

@@ -1,64 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  download(ev) {
-    ev.preventDefault()
-    if (this.downloading) {
-      return
-    }
-    this.downloading = true
-    ev.target.classList.add("download-in-progress")
-    const url = ev.target.dataset.downloadPath
-    ev.target.removeAttribute("href")
-    ev.target.innerHTML = `<div class="spinner-border spinner-border-sm float-end"></div> ${ev.target.dataset.downloadPreparingMessage}`
-
-    fetch(url)
-      .then((response) => {
-        if (!response.ok) {
-          return response.json().then((errorData) => {
-            const exception = new Error("Network response was not ok")
-            exception.data = errorData // Attach the parsed JSON data to the error object
-            throw exception
-          })
-        }
-        return response.json()
-      })
-      .then((data) => this.complete(data, ev.target))
-      .catch((error) => this.error(error, ev.target))
-  }
-
-  complete(data, target) {
-    this.downloading = false
-    target.classList.remove("download-in-progress")
-    target.classList.add("download-complete")
-    target.innerHTML = target.dataset.downloadReadyMessage
-    target.href = data[1]
-    this.renderMessage(data[0])
-    //target.click();
-  }
-
-  error(exception, target) {
-    this.downloading = false
-    target.classList.remove("download-in-progress")
-    target.classList.add("download-complete")
-    target.innerHTML = target.dataset.downloadFailedMessage
-    console.log(exception)
-
-    this.renderMessage(exception.data[0])
-  }
-
-  renderMessage(message) {
-    let flashContainer = document.querySelector("div.flash_messages")
-    if (!flashContainer) {
-      flashContainer = document.createElement("div")
-      flashContainer.className = "flash_messages"
-      document.getElementById("document").prepend(flashContainer)
-    }
-    Object.entries(message).forEach(([idx, msg]) => {
-      const flash = document.createElement("div")
-      flash.className = `alert alert-${msg[0]} alert-dismissible fade show`
-      flash.innerHTML = `${msg[1]}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>`
-      flashContainer.appendChild(flash)
-    })
-  }
-}

data/lib/geoblacklight/download/csv_download.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class CsvDownload < Geoblacklight::Download
-    CSV_DOWNLOAD_PARAMS = {service: "wfs",
-                           version: "2.0.0",
-                           request: "GetFeature",
-                           srsName: "EPSG:4326",
-                           outputformat: "csv"}.freeze
-
-    def initialize(document, options = {})
-      request_params = CSV_DOWNLOAD_PARAMS.merge(typeName: document.wxs_identifier)
-      super(document, {
-        type: "csv",
-        extension: "csv",
-        request_params: request_params,
-        content_type: "text/csv",
-        service_type: "wfs"
-      }.merge(options))
-    end
-  end
-end

data/lib/geoblacklight/download/geojson_download.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class GeojsonDownload < Geoblacklight::Download
-    GEOJSON_DOWNLOAD_PARAMS = {
-      service: "wfs",
-      version: "2.0.0",
-      request: "GetFeature",
-      srsName: "EPSG:4326",
-      outputformat: "application/json"
-    }.freeze
-
-    def initialize(document, options = {})
-      request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document.wxs_identifier)
-      super(document, {
-        type: "geojson",
-        extension: "geojson",
-        request_params: request_params,
-        content_type: "application/json",
-        service_type: "wfs"
-      }.merge(options))
-    end
-  end
-end

data/lib/geoblacklight/download/geotiff_download.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class GeotiffDownload < Geoblacklight::Download
-    GEOTIFF_DOWNLOAD_PARAMS = {
-      format: "image/geotiff",
-      width: 4096
-    }.freeze
-
-    def initialize(document, options = {})
-      request_params = GEOTIFF_DOWNLOAD_PARAMS.merge(layers: document.wxs_identifier)
-      super(document, {
-        type: "geotiff",
-        extension: "tif",
-        request_params: request_params,
-        content_type: "image/geotiff",
-        service_type: "wms",
-        reflect: true
-      }.merge(options))
-    end
-  end
-end

data/lib/geoblacklight/download/kmz_download.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class KmzDownload < Geoblacklight::Download
-    KMZ_DOWNLOAD_PARAMS = {service: "wms",
-                           version: "1.1.0",
-                           request: "GetMap",
-                           srsName: "EPSG:3857",
-                           format: "application/vnd.google-earth.kmz",
-                           width: 2000, height: 2000}.freeze
-
-    def initialize(document, options = {})
-      bbox_wsen = document.geometry.bounding_box
-      request_params = KMZ_DOWNLOAD_PARAMS.merge(layers: document.wxs_identifier, bbox: bbox_wsen)
-      super(document, {
-        type: "kmz",
-        extension: "kmz",
-        request_params: request_params,
-        content_type: "application/vnd.google-earth.kmz",
-        service_type: "wms"
-      }.merge(options))
-    end
-  end
-end

data/lib/geoblacklight/download/shapefile_download.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class ShapefileDownload < Geoblacklight::Download
-    SHAPEFILE_DOWNLOAD_PARAMS = {service: "wfs",
-                                 version: "2.0.0",
-                                 request: "GetFeature",
-                                 srsName: "EPSG:4326",
-                                 outputformat: "SHAPE-ZIP"}.freeze
-
-    def initialize(document, options = {})
-      request_params = SHAPEFILE_DOWNLOAD_PARAMS.merge(typeName: document.wxs_identifier)
-      super(document, {
-        type: "shapefile",
-        extension: "zip",
-        request_params: request_params,
-        content_type: "application/zip",
-        service_type: "wfs"
-      }.merge(options))
-    end
-  end
-end

data/lib/geoblacklight/download.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class Download
-    def initialize(document, options = {})
-      @document = document
-      @options = options
-    end
-
-    def downloadable?
-      @document.downloadable?
-    end
-
-    def file_name
-      "#{@document.id}-#{@options[:type]}.#{@options[:extension]}"
-    end
-
-    def self.file_path
-      Geoblacklight.configuration.download_path
-    end
-
-    def file_path_and_name
-      "#{self.class.file_path}/#{file_name}"
-    end
-
-    def download_exists?
-      File.file?(file_path_and_name)
-    end
-
-    def get
-      if download_exists?
-        file_name
-      else
-        create_download_file
-      end
-    end
-
-    ##
-    # Creates temporary file on file system and renames it if download completes
-    # successfully. Will raise and rescue if the wrong file format is downloaded
-    # @return [String] filename of the completed download
-    def create_download_file
-      download = initiate_download
-
-      File.open("#{file_path_and_name}.tmp", "wb") do |file|
-        fail Geoblacklight::Exceptions::WrongDownloadFormat unless matches_mimetype?(download)
-        file.write download.body
-      end
-      File.rename("#{file_path_and_name}.tmp", file_path_and_name)
-      file_name
-    rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
-      Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} " \
-                                 "received #{download.headers["content-type"]}"
-      File.delete("#{file_path_and_name}.tmp")
-      raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: "Wrong download type"
-    end
-
-    ##
-    # Initiates download from a remote source url using the `request_params`.
-    # Will catch Faraday::ConnectionFailed and
-    # Faraday::TimeoutError
-    # @return [Faraday::Request] returns a Faraday::Request object
-    def initiate_download
-      conn = Faraday.new(url: url)
-      conn.get do |request|
-        request.params = @options[:request_params]
-        request.options.timeout = timeout
-        request.options.open_timeout = timeout
-      end
-    rescue Faraday::ConnectionFailed
-      raise Geoblacklight::Exceptions::ExternalDownloadFailed,
-        message: "Download connection failed",
-        url: conn.url_prefix.to_s
-    rescue Faraday::TimeoutError
-      raise Geoblacklight::Exceptions::ExternalDownloadFailed,
-        message: "Download timed out",
-        url: conn.url_prefix.to_s
-    end
-
-    ##
-    # Creates a download url for the object
-    # @return [String]
-    def url_with_params
-      url + "/?" + URI.encode_www_form(@options[:request_params])
-    end
-
-    private
-
-    def matches_mimetype?(download)
-      MIME::Type.simplified(download.headers["content-type"]) == @options[:content_type]
-    end
-
-    ##
-    # Returns timeout for the download request. `timeout` passed as an option to
-    # the Geoblacklight::Download class
-    # @return [Fixnum] download timeout in seconds
-    def timeout
-      @options[:timeout] || Geoblacklight.configuration.timeout_download
-    end
-
-    ##
-    # URL for download
-    # @return [String] URL that is checked in download
-    def url
-      url = @document.references.public_send(@options[:service_type]).endpoint
-      url += "/reflect" if @options[:reflect]
-      url
-    end
-  end
-end

data/lib/geoblacklight/routes/downloadable.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  module Routes
-    class Downloadable
-      def initialize(defaults = {})
-        @defaults = defaults
-      end
-
-      def call(mapper, _options = {})
-        mapper.get "file/:id", action: "file", as: :file
-      end
-    end
-  end
-end