geoblacklight_admin 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7dfdea7cb8626ae4e65999624310642a89c81cea03a8d0e58a5649c080091b
-  data.tar.gz: e08e45d57f47e372d574e7cce41e1babd93697741a1261a22dcf816e07a0b74b
+  metadata.gz: 7fcfdbb7ea830459ca48b31a53d53d8ffba6907f65854b0cc98c4405fa724531
+  data.tar.gz: b0f7f43a9fdf214711479393e8b1d485b551b230708d52d9e27172ba970174c5
 SHA512:
-  metadata.gz: b7e2504e7f0fb46e55e0ba3359577a4d6e90842afa5c6be608e79a52d2b278ec39fe24812b68d8ca6d950ff2ef7842905550bb2a1354ba012f82f8b6349da154
-  data.tar.gz: d913fe08b848b6b9a2f2cd730570cecbb1f0e98157540b967306fc903ee7433bdae04a422b7d0b06c20678103bd30440bfaa939b04369c9b9f100bdd55611a65
+  metadata.gz: 6e56308683ec638bc5905254a8719f467c9b40d139389ed800038de75b318e4995e88ba297587042744e79433204556d87d65adcf7a0fe2867bc2b67ee618db2
+  data.tar.gz: 84ec89c486944d06a529caf276072fe426ab350bfcffd18f92cb172561c626d569ee5fe6871d9ef56003950215abce7e008b3be0d7212cd9f183be79463e14f2

data/README.md

@@ -69,8 +69,11 @@ The gem is available as open source under the terms of the [Apache 2.0 License](
 * ~~Debug Rails 7.2 support (remove devise_invitable, see [#915](https://github.com/scambra/devise_invitable/issues/915))~~
 * ~~Separate dct_references_s support into a separate model~~
 * ~~Import/Export dct_references_s outside of the main document model~~
-* Migrate our GBL API controllers to just RSolr-based models
-* DRY up Gem dependencies and Engine routing
+* Data Dictionary: Add support for `document_data_dictionary`
 * Gazetteer: Add GeoNames support
 * Gazetteer: Add Who's On First support
+* Gazetteer: Add Ollama support
+* Gazetteer: Add BTAA spatial file support
+* Migrate our GBL API controllers to just RSolr-based models
+* DRY up Gem dependencies and Engine routing
 * Remove any remaining GEOMG references

data/app/models/asset.rb

@@ -55,6 +55,8 @@ class Asset < Kithe::Asset
     if dct_references_uri_key.present?
       reference_type = ReferenceType.find_by_name(dct_references_uri_key)
       hash[reference_type.reference_uri.to_s] = if reference_type.reference_uri.to_s == "http://schema.org/downloadUrl"
+        logger.debug("Asset#to_aardvark_reference > downloadUrl: #{full_file_url} > #{label.present? ? label : file.metadata["filename"]}")
+
         {
           "url" => full_file_url,
           "label" => label.present? ? label : file.metadata["filename"]

data/app/models/document.rb

@@ -122,35 +122,35 @@ class Document < Kithe::Work
   #   - Use distributable assets
   # @TODO: Remove BEFORE path once we've migrated to DocumentDistributions
   def distributions
-    distributions = ActiveSupport::HashWithIndifferentAccess.new
+    distributions = {}
 
     # AFTER - Add DocumentDistributions to distributions
     if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "true"
       distributions = document_distributions.to_aardvark_distributions
-    end
-
-    # BEFORE - Prep value arrays
-    # @TODO: Remove this once we've migrated to DocumentDistributions
-    send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
-      if ref.category.present?
-        distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] = []
+    else
+      # BEFORE - Prep value arrays
+      # @TODO: Remove this once we've migrated to DocumentDistributions
+      send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
+        if ref.category.present?
+          distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] = []
+        end
       end
-    end
 
-    # BEFORE - Seed value arrays
-    # @TODO: Remove this once we've migrated to DocumentDistributions
-    send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
-      if ref.category.present?
-        distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] << ref.value
+      # BEFORE - Seed value arrays
+      # @TODO: Remove this once we've migrated to DocumentDistributions
+      send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
+        if ref.category.present?
+          distributions[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] << ref.value
+        end
       end
-    end
-    logger.debug("\n\nDocument#distributions > seeded: #{distributions}")
+      logger.debug("\n\nDocument#distributions > seeded: #{distributions}")
 
-    # BEFORE - Apply Multiple Downloads
-    # @TODO: Remove this once we've migrated to DocumentDistributions
-    if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "false"
-      distributions = apply_downloads(distributions)
-      logger.debug("Document#distributions > downloads: #{distributions}")
+      # BEFORE - Apply Multiple Downloads
+      # @TODO: Remove this once we've migrated to DocumentDistributions
+      if ENV["GBL_ADMIN_REFERENCES_MIGRATED"] == "false"
+        distributions = apply_downloads(distributions)
+        logger.debug("Document#distributions > downloads: #{distributions}")
+      end
     end
 
     # BEFORE & AFTER - Apply Distributable Assets

data/app/models/document_distribution.rb

@@ -39,7 +39,7 @@ class DocumentDistribution < ApplicationRecord
         merged["http://schema.org/downloadUrl"] ||= []
         merged["http://schema.org/downloadUrl"] << {
           "url" => dist.values.first,
-          "label" => dist[:label]
+          "label" => dist[:label].present? ? dist[:label] : dist.values.first
         }
       else
         merged[dist.keys.first] = dist.values.first

data/app/models/geoblacklight_admin.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  include GeoblacklightAdmin::IsoLanguageCodes
 end

data/app/views/admin/advanced_search/facets.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.data do
   json.array! @presenter.documents do |document|
     document_url = polymorphic_url(url_for_document(document))

data/app/views/admin/advanced_search/index.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page

data/app/views/admin/api/_field.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.set!(field_name) do
   json.id "#{document_url}##{field_name}"
   json.type "document_value"

data/app/views/admin/api/fetch.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page

data/app/views/admin/api/index.json.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page

data/app/views/admin/document_distributions/_form.html.erb

@@ -21,7 +21,7 @@ document.addEventListener('DOMContentLoaded', function() {
   const labelInput = document.getElementById('label-input');
 
   function toggleLabelInput() {
-    if (distributionSelect.options[distributionSelect.selectedIndex].text === 'Download file') {
+    if (distributionSelect.options[distributionSelect.selectedIndex].text === 'Download') {
       labelInput.disabled = false;
     } else {
       labelInput.disabled = true;

data/app/views/admin/document_distributions/index.html.erb

@@ -18,8 +18,6 @@
     <% if params[:document_id] %>
     <h2 class='h3'>
       <%= link_to(@document.title, admin_document_path(@document)) %>
-      &middot;
-      <%= @document_distributions.count %> distributions
     </h2>
     <% else %>
       <h2 class='h3'>Distributions</h2>

data/app/views/admin/documents/_form_nav.html.erb

@@ -34,7 +34,6 @@
       <% end %>
       <%= link_to admin_document_document_distributions_url(@document), class: "ml-2" do %>
         Distributions
-        <span class="badge badge-light"><%= @document.distributions.size %></span>
       <% end %>
     <% end %>
   </nav>

data/app/views/admin/documents/_json_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # See GBL Aardvark Schema
 # https://docs.google.com/spreadsheets/d/1QQjUzRe8YdPGKK4h0GYoNPTow2zZ1f0KFA0zzZyHAsk/edit?ts=602d52f2#gid=252925024
 

data/app/views/admin/documents/_json_btaa_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Required
 json.set! :gbl_mdVersion_s, "BTAA Aardvark"
 

data/app/views/admin/documents/_json_file.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Required
 json.set! :gbl_mdVersion_s, "BTAA Aardvark"
 

data/app/views/admin/documents/_json_gbl_v1.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # See OpenGeoMetadata Legacy Versions
 # https://opengeometadata.org/docs/gbl-1.0
 

data/app/views/admin/documents/fetch.json_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.map do |document|

data/app/views/admin/documents/fetch.json_btaa_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.map do |document|

data/app/views/admin/documents/fetch.json_file.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.map do |document|

data/app/views/admin/documents/fetch.json_gbl_v1.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.map do |document|

data/app/views/admin/documents/index.json_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.load_all.map do |document|

data/app/views/admin/documents/index.json_btaa_aardvark.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.load_all.map do |document|

data/app/views/admin/documents/index.json_file.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.load_all.map do |document|

data/app/views/admin/documents/index.json_gbl_v1.jbuilder

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 json.ignore_nil!
 
 json.array! @documents.load_all.map do |document|

data/app/views/admin/documents/show.json_aardvark.jbuilder

@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 json.partial! "json_aardvark", document: @document

data/app/views/admin/documents/show.json_btaa_aardvark.jbuilder

@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 json.partial! "json_btaa_aardvark", document: @document

data/app/views/admin/documents/show.json_gbl_v1.jbuilder

@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 json.partial! "json_gbl_v1", document: @document

data/lib/geoblacklight_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Eric Larson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations