Merge branch 'release/0.6.1'

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         env:
           POSTGRES_HOST: 127.0.0.1
           POSTGRES_PORT: 5555
-          POSTGRES_DB: geoblacklight_test
+          POSTGRES_DB: geoblacklight_admin_development
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
         ports:

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

app/models/asset.rb

@@ -55,6 +55,8 @@ def to_aardvark_reference
     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"]

app/models/document.rb

@@ -122,35 +122,35 @@ def a_downloadable_resource?
   #   - 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

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

app/models/geoblacklight_admin.rb

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

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))

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

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"

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

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

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;

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>

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>

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
 

app/views/admin/documents/_json_btaa_aardvark.jbuilder

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

app/views/admin/documents/_json_file.jbuilder

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

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
 

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|

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|

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|

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|

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|

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|

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|

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|

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

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

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

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

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

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

docs/development.md

@@ -8,8 +8,8 @@ bundle install
 ### Create Database
 ```bash
 psql postgres
-DROP DATABASE geoblacklight_development;
-CREATE DATABASE geoblacklight_development;
+DROP DATABASE geoblacklight_admin_development;
+CREATE DATABASE geoblacklight_admin_development;
 ```
 
 ### Run Application

lib/generators/geoblacklight_admin/templates/.env.development.example

@@ -11,7 +11,7 @@ SOLR_URL=http://127.0.0.1:8983/solr/blacklight-core
 
 # PostgreSQL
 POSTGRES_HOST=127.0.0.1
-POSTGRES_PORT=5432
+POSTGRES_PORT=5555
 POSTGRES_DB=geoblacklight_admin_development
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
@@ -28,5 +28,5 @@ BLACKLIGHT_JSON_IDS=/admin/ids.json
 GBL_ADMIN_REFERENCES_MIGRATED=true
 
 # Blazer
-BLAZER_UPLOADS_URL=postgresql://127.0.0.1:5432/geoblacklight_development
+BLAZER_UPLOADS_URL=postgresql://127.0.0.1:5555/geoblacklight_admin_development
 MAPBOX_ACCESS_TOKEN=your-key-here

lib/geoblacklight_admin/version.rb

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

template.rb

@@ -9,7 +9,7 @@
 #
 # 2. Run these lines below to stand up a new GBL + GBL Admin instance:
 #
-# $> rails _7.2.2_ new gbl_admin -m https://raw.githubusercontent.com/geobtaa/geoblacklight_admin/feature/develop/template.rb
+# $> rails _7.2.2_ new gbl_admin -m https://raw.githubusercontent.com/geobtaa/geoblacklight_admin/develop/template.rb
 # $> cd gbl_admin
 # $> bundle exec rake geoblacklight:server
 #

test/controllers/document_distributions_controller_test.rb

@@ -3,7 +3,7 @@
 class DocumentReferencesControllerTest < ActionDispatch::IntegrationTest
   setup do
     @document = documents(:ls)
-    @document_distribution = document_distributions(:one)
+    @document_distribution = document_distributions(:ag_1)
     @file = fixture_file_upload("import_distributions.csv", "text/csv")
 
     get "/users/sign_in"

test/fixtures/document_distributions.yml

@@ -1,8 +1,19 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
+ag_1:
   friendlier_id: 35c8a641589c4e13b7aa11e37f3f00a1_0
-  reference_type_id: 1
-  url: http://foo.com
-  label: Foo
+  reference_type_id: 8
+  url: https://open-iowa.opendata.arcgis.com/datasets/35c8a641589c4e13b7aa11e37f3f00a1_0
+  label: 
   position: 1
+
+ag_2:
+  friendlier_id: 35c8a641589c4e13b7aa11e37f3f00a1_0
+  reference_type_id: 8
+  url: https://open-iowa.opendata.arcgis.com/datasets/35c8a641589c4e13b7aa11e37f3f00a1_0.zip
+  label:
+  position: 2
+ag_3:
+  friendlier_id: 35c8a641589c4e13b7aa11e37f3f00a1_0
+  reference_type_id: 3
+  url: https://services2.arcgis.com/KhKjlwEBlPJd6v51/arcgis/rest/services/AgDistricts/FeatureServer/0
+  label: Agricultural Districts
+  position: 3

test/fixtures/documents.yml

@@ -4,7 +4,7 @@ ag:
   type: Document
   position:
   json_attributes:
-    {"dcat_bbox": "-96.6391,40.3754,-90.1401,43.5012", "locn_geometry": "POLYGON((-80 25, -65 18, -64 33, -80 25))", "b1g_code_s": "03a-04", "dct_title_s": "Agricultural Districts: Iowa", "dct_format_s": "Shapefile", "dct_accessRights_s": "Public", "gbl_resourceClass_sm": ["Datasets"], "b1g_image_ss": null, "b1g_status_s": "Active", "dct_issued_s": "2015-09-03", "geomg_id_s": "35c8a641589c4e13b7aa11e37f3f00a1_0", "gbl_suppressed_b": false, "dct_creator_sm": ["Legislative Services Agency"], "dct_subject_sm": ["Boundaries"], "dcat_keyword_sm": ["iowa", "judicial", "districts", "boundaries"], "dct_language_sm": ["eng"], "dct_spatial_sm": ["Iowa"], "dcat_centroid": "41.9383,-93.3896", "b1g_geonames_sm": [], "dct_identifier_sm": ["35c8a641589c4e13b7aa11e37f3f00a1_0"], "dct_publisher_sm": ["State of Iowa"], "pcdm_memberOf_sm": ["03a-04"], "dct_isPartOf_sm": ["03a-04"], "dcat_theme_sm": ["Theme"], "dct_temporal_sm": ["2015"], "dct_description_sm": ["Iowa Agricultural Districts"], "schema_provider_s": "Iowa", "dct_references_s": [{"value": "https://open-iowa.opendata.arcgis.com/datasets/35c8a641589c4e13b7aa11e37f3f00a1_0", "category": "documentation_external"}, {"value": "https://open-iowa.opendata.arcgis.com/datasets/35c8a641589c4e13b7aa11e37f3f00a1_0.zip", "category": "download"}, {"value": "https://services2.arcgis.com/KhKjlwEBlPJd6v51/arcgis/rest/services/AgDistricts/FeatureServer/0", "category": "arcgis_feature_layer"}], "gbl_resourceType_sm": "Vector", "gbl_georeferenced_b": false, "b1g_child_record_b": false, "dct_rights_sm": [""], "b1g_dct_accrualMethod_s": "ArcGIS Hub", "gbl_dateRange_drsim": ["2015-2015"], "b1g_dateAccessioned_sm": ["2020-04-24"], "gbl_mdVersion_s": "Aardvark", "dct_alternative_sm": ["Ag Districts"], "b1g_dct_accrualPeriodicity_s": null}
+    {"dcat_bbox": "-96.6391,40.3754,-90.1401,43.5012", "locn_geometry": "POLYGON((-80 25, -65 18, -64 33, -80 25))", "b1g_code_s": "03a-04", "dct_title_s": "Agricultural Districts: Iowa", "dct_format_s": "Shapefile", "dct_accessRights_s": "Public", "gbl_resourceClass_sm": ["Datasets"], "b1g_image_ss": null, "b1g_status_s": "Active", "dct_issued_s": "2015-09-03", "geomg_id_s": "35c8a641589c4e13b7aa11e37f3f00a1_0", "gbl_suppressed_b": false, "dct_creator_sm": ["Legislative Services Agency"], "dct_subject_sm": ["Boundaries"], "dcat_keyword_sm": ["iowa", "judicial", "districts", "boundaries"], "dct_language_sm": ["eng"], "dct_spatial_sm": ["Iowa"], "dcat_centroid": "41.9383,-93.3896", "b1g_geonames_sm": [], "dct_identifier_sm": ["35c8a641589c4e13b7aa11e37f3f00a1_0"], "dct_publisher_sm": ["State of Iowa"], "pcdm_memberOf_sm": ["03a-04"], "dct_isPartOf_sm": ["03a-04"], "dcat_theme_sm": ["Theme"], "dct_temporal_sm": ["2015"], "dct_description_sm": ["Iowa Agricultural Districts"], "schema_provider_s": "Iowa", "gbl_resourceType_sm": "Vector", "gbl_georeferenced_b": false, "b1g_child_record_b": false, "dct_rights_sm": [""], "b1g_dct_accrualMethod_s": "ArcGIS Hub", "gbl_dateRange_drsim": ["2015-2015"], "b1g_dateAccessioned_sm": ["2020-04-24"], "gbl_mdVersion_s": "Aardvark", "dct_alternative_sm": ["Ag Districts"], "b1g_dct_accrualPeriodicity_s": null}
   parent_id:
   friendlier_id: 35c8a641589c4e13b7aa11e37f3f00a1_0
   file_data:

test/jobs/export_job_test.rb

@@ -1,7 +1,26 @@
 require "test_helper"
 
 class ExportJobTest < ActiveJob::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    @request = "http://localhost:3000"
+    @current_user = users(:user_001) # Assuming you have a fixture for users
+    @query_params = {ids: [1, 2, 3]}
+    @export_service = ExportCsvService
+  end
+
+  test "job is enqueued" do
+    assert_enqueued_with(job: ExportJob) do
+      ExportJob.perform_later(@request, @current_user, @query_params, @export_service)
+    end
+  end
+
+  test "job is performed" do
+    perform_enqueued_jobs do
+      ExportJob.perform_later(@request, @current_user, @query_params, @export_service)
+    end
+
+    # Add assertions to verify the expected behavior
+    # For example, check if the notification was delivered
+    assert @current_user.notifications.any?
+  end
 end

test/models/geoblacklight_admin/solr_utils_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+class SolrUtilsTest < ActiveSupport::TestCase
+  def setup
+    @solr_url = Blacklight.connection_config[:url]
+    @solr_utils = GeoblacklightAdmin::SolrUtils
+  end
+
+  def test_solr_orphan_geomg_ids
+    assert_respond_to @solr_utils, :solr_orphan_geomg_ids
+  end
+
+  def test_delete_solr_orphans
+    assert_respond_to @solr_utils, :delete_solr_orphans
+  end
+end