RubyGems - geoblacklight - Versions diffs - 2.4.0 → 3.3.0 - Mend

geoblacklight 2.4.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (223) hide show

data/package.json CHANGED Viewed

@@ -1,4 +1,20 @@
 {
   "name": "geoblacklight",
-  "version": "2.1.2"
+  "version": "2.1.2",
+  "private": true,
+  "license": "Apache-2.0",
+  "private": true,
+  "scripts": {
+    "test": "jest -c jest.config.js"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.12.16",
+    "@babel/core": "^7.12.16",
+    "@babel/plugin-transform-runtime": "^7.12.15",
+    "@babel/preset-env": "^7.12.16",
+    "@testing-library/dom": "^7.29.4",
+    "@testing-library/jest-dom": "^5.11.9",
+    "jest": "^26.6.3",
+    "jest-fixtures": "^0.6.0"
+  }
 }

data/setupJest.js ADDED Viewed

@@ -0,0 +1,14 @@
+import { JSDOM } from 'jsdom';
+import $ from 'jquery';
+const GeoBlacklight = require('./app/assets/javascripts/geoblacklight/geoblacklight');
+const jsdom = new JSDOM('<html></html>', { pretendToBeVisual: true });
+const { window } = jsdom;
+global.GeoBlacklight = GeoBlacklight;
+global.window = window;
+global.jQuery = $;
+global.$ = global.jQuery;
+import * as L from 'leaflet.js.erb';
+global.leaflet = L;

data/solr/conf/schema.xml CHANGED Viewed

@@ -143,13 +143,11 @@
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_d"/>
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers"/>
+               geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />
     <!-- 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"/>
   </types>
   <!-- for scoring formula -->

data/spec/config/initializers/rails_config_spec.rb ADDED Viewed

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'spec_helper'
+describe 'Config' do
+  it 'Loads new v3.3 Settings.FIELDS defaults' do
+    expect(Settings.FIELDS.IDENTIFIER).to eq 'dc_identifier_s'
+    expect(Settings.FIELDS.LANGUAGE).to eq 'dc_language_s'
+    expect(Settings.FIELDS.LAYER_MODIFIED).to eq 'layer_modified_dt'
+    expect(Settings.FIELDS.SOURCE).to eq 'dc_source_sm'
+    expect(Settings.FIELDS.SUPPRESSED).to eq 'suppressed_b'
+    expect(Settings.FIELDS.TYPE).to eq 'dc_type_s'
+    expect(Settings.FIELDS.UNIQUE_KEY).to eq 'layer_slug_s'
+  end
+end

data/spec/controllers/catalog_controller_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 describe CatalogController, type: :controller do
@@ -71,12 +72,12 @@ describe CatalogController, type: :controller do
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
       expect(response_values).to include 'geoblacklight_version' => '1.0'
-      expect(response_values).to include 'dc_title_s' => '100 Foot Grid Cambridge MA 2004'
-      expect(response_values).to include 'dc_identifier_s' => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
-      expect(response_values).to include 'dc_rights_s' => 'Public'
-      expect(response_values).to include 'dct_provenance_s' => 'Tufts'
-      expect(response_values).to include 'layer_slug_s' => 'tufts-cambridgegrid100-04'
-      expect(response_values).to include 'solr_geom' => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
+      expect(response_values).to include Settings.FIELDS.TITLE => '100 Foot Grid Cambridge MA 2004'
+      expect(response_values).to include Settings.FIELDS.IDENTIFIER => 'urn:geodata.tufts.edu:Tufts.CambridgeGrid100_04'
+      expect(response_values).to include Settings.FIELDS.RIGHTS => 'Public'
+      expect(response_values).to include Settings.FIELDS.PROVENANCE => 'Tufts'
+      expect(response_values).to include Settings.FIELDS.UNIQUE_KEY => 'tufts-cambridgegrid100-04'
+      expect(response_values).to include Settings.FIELDS.GEOMETRY => 'ENVELOPE(-71.163984, -71.052581, 42.408316, 42.34757)'
     end
   end
 end

data/spec/controllers/download_controller_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 describe DownloadController, type: :controller do

data/spec/controllers/relation_controller_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 describe RelationController, type: :controller do

data/spec/controllers/wms_controller_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 describe WmsController, type: :controller do

data/spec/factories/user.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }

data/spec/features/bookmarks_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Blacklight Bookmarks' do

data/spec/features/configurable_basemap_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Configurable basemap', js: true do

data/spec/features/data_dictionary_download_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Data dictionary download tool' do

data/spec/features/download_layer_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Download layer' do
@@ -40,7 +41,7 @@ feature 'Download layer' do
   end
   scenario 'clicking jpg download button should redirect to external image' do
     visit solr_document_path('princeton-02870w62c')
-    expect(page).to have_css("a.btn.btn-default[href='https://libimages.princeton.edu/loris/pudl0076/map_pownall/00000001.jp2/full/full/0/default.jpg']", text: 'Original JPG')
+    expect(page).to have_css("a.btn.btn-default[href='https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/full/full/0/default.jpg']", text: 'Original JPG')
   end
   scenario 'options should be available under toggle' do
     visit solr_document_path('mit-f6rqs4ucovjk2')

data/spec/features/empty_search_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Empty search' do

data/spec/features/esri_viewer_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'feature_layer reference', js: true do
@@ -24,11 +25,6 @@ feature 'feature_layer reference', js: true do
     expect(Nokogiri::HTML.parse(page.body).css('g').length).to eq 23
     fail
   end
-  scenario 'displays image map layer' do
-    visit solr_document_path '32653ed6-8d83-4692-8a06-bf13ffe2c018'
-    expect(page).to have_css '.leaflet-control-zoom', visible: true
-    expect(page).to have_css 'img.leaflet-image-layer', visible: true
-  end
   scenario 'displays tiled map layer' do
     visit solr_document_path 'nyu-test-soil-survey-map'
     expect(page).to have_css '.leaflet-control-zoom', visible: true

data/spec/features/exports_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Export features' do
@@ -5,7 +6,7 @@ feature 'Export features' do
     feature 'Open in Carto' do
       scenario 'shows up in tools' do
         visit solr_document_path 'tufts-cambridgegrid100-04'
-        expect(page).to have_css 'li.exports a', text: 'Open in Carto'
+        expect(page).to have_css 'li.carto a', text: 'Open in Carto'
         click_link 'Open in Carto'
       end
     end
@@ -14,23 +15,14 @@ feature 'Export features' do
     feature 'Open in ArcGIS Online' do
       scenario 'shows up in tools' do
         visit solr_document_path '90f14ff4-1359-4beb-b931-5cb41d20ab90'
-        expect(page).to have_css 'li.exports a', text: 'Open in ArcGIS Online'
+        expect(page).to have_css 'li.arcgis a', text: 'Open in ArcGIS Online'
       end
     end
   end
   feature 'when restricted or no wfs' do
     scenario 'is not in tools' do
       visit solr_document_path 'princeton-02870w62c'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
-    end
-  end
-  context 'when carto is configured not to display' do
-    before do
-      allow(Settings).to receive(:CARTO_HIDE).and_return(true)
-    end
-    it 'will not display the carto link' do
-      visit solr_document_path 'tufts-cambridgegrid100-04'
-      expect(page).not_to have_css 'li.exports a', text: 'Open in Carto'
+      expect(page).not_to have_css 'li.carto a', text: 'Open in Carto'
     end
   end
 end

data/spec/features/help_text_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Help Text' do

data/spec/features/home_page_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Home page', js: true do # use js: true for tests which require js, but it slows things down
@@ -37,4 +38,9 @@ feature 'Home page', js: true do # use js: true for tests which require js, but
     end
     expect(page).to have_css '#documents'
   end
+  scenario 'can search by placename' do
+    click_link 'Minnesota, United States'
+    results = page.all(:css, 'article.document')
+    expect(results.count).to equal(3)
+  end
 end

data/spec/features/iiif_viewer_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'iiif reference' do

data/spec/features/index_map_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Index map' do

data/spec/features/layer_inspection_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Layer inspection', js: true do

data/spec/features/layer_opacity_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Layer opacity', js: true do

data/spec/features/layer_preview_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Layer preview', js: true do

data/spec/features/layer_with_no_references_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'layer with no wms or iiif' do

data/spec/features/linkified_attribute_table_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Attribute table values', js: true do

data/spec/features/metadata_panel_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Metadata tools' do

data/spec/features/missing_metadata_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Missing metadata', js: true do

data/spec/features/multiple_downloads_spec.rb ADDED Viewed

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require 'spec_helper'
+feature 'Multiple downloads' do
+  feature 'when item has multiple downloads in dct_references_s' do
+    scenario 'downloads are listed in download card' do
+      visit solr_document_path 'cugir-007950'
+      within '.card.downloads' do
+        expect(page).to have_link 'Shapefile', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip'
+        expect(page).to have_link 'PDF', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf'
+        expect(page).to have_link 'KMZ', href: 'https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz'
+      end
+    end
+  end
+end

data/spec/features/oembed_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Oembed layer' do

data/spec/features/relations_spec.rb CHANGED Viewed

@@ -1,52 +1,33 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'Display related documents' do
-  let(:expected_json_resp) do
-    {
-      'ancestors' =>
-        {
-          'numFound' => 0,
-          'start' => 0,
-          'docs' => []
-        },
-      'descendants' =>
-            {
-              'numFound' => 1,
-              'start' => 0,
-              'docs' =>
-                    [
-                      {
-                        'dc_title_s' => '2015 New York City Subway Complexes and Ridership',
-                        'layer_slug_s' => 'nyu_2451_34502',
-                        'layer_geom_type_s' => 'Point'
-                      }
-                    ]
-            },
-      'current_doc' => 'nyu_2451_34635'
-    }
-  end
   scenario 'Record with dc_source_sm value(s) should have parent(s)' do
     visit relations_solr_document_path('nyu_2451_34502')
-    expect(page).to have_css('ul b', text: 'Source Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Source Datasets')
   end
   scenario 'Record that is pointed to by others should have children' do
     visit relations_solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('ul b', text: 'Derived Datasets')
+    expect(page).to have_css('.relations .card-header h2', text: 'Derived Datasets')
   end
   scenario 'Relations should respond to json' do
     visit relations_solr_document_path('nyu_2451_34635', format: 'json')
-    expect(page.body).to eq(expected_json_resp.to_json)
+    response = JSON.parse(page.body)
+    expect(response['ancestors']['numFound']).to eq 0
+    expect(response['descendants']['docs'].first[Settings.FIELDS.UNIQUE_KEY]).to eq 'nyu_2451_34502'
+    expect(response['current_doc']).to eq 'nyu_2451_34635'
   end
   scenario 'Record with relations should render widget in catalog#show', js: true do
     visit solr_document_path('nyu_2451_34635')
-    expect(page).to have_css('div.card-header', text: 'Data Relations')
+    expect(page).to have_css('.card.relations')
+    expect(page).to have_css('div.card-header', text: 'Derived Datasets')
   end
   scenario 'Record without relations should not render widget in catalog#show', js: true do
     visit solr_document_path('harvard-g7064-s2-1834-k3')
-    expect(page).to have_no_css('div.panel-heading', text: 'Data Relations')
+    expect(page).to have_no_css('.card.relations')
   end
 end

data/spec/features/saved_searches_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'saved searches' do

data/spec/features/search_bar_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'search bar' do

data/spec/features/search_results_map_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'search results map', js: true do
@@ -5,12 +6,6 @@ feature 'search results map', js: true do
     visit search_catalog_path(q: 'Minnesota')
     expect(page).to have_css '#map'
   end
-  scenario 'present on a search result page' do
-    visit root_path
-    click_link 'Minnesota, United States'
-    results = page.all(:css, 'article.document')
-    expect(results.count).to equal(3)
-  end
   scenario 'view is scoped to Minnesota' do
     visit root_path
     click_link 'Minnesota, United States'

data/spec/features/search_results_overlap_ratio_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 feature 'spatial search results overlap ratio' do
@@ -7,7 +8,7 @@ feature 'spatial search results overlap ratio' do
     # BBox param is the US upper midwest and Canada, roughly centered on the state of Minnesota
     visit search_catalog_path(
       bbox: '-103.196521 39.21962 -84.431873 53.63497',
-      'f[dct_provenance_s][]': 'Minnesota'
+      "f[#{Settings.FIELDS.PROVENANCE}][]": 'Minnesota'
     )
     # MN State result
@@ -29,20 +30,20 @@ feature 'spatial search results overlap ratio' do
     # BBox param is the center to western edge of New York state and Canada, roughly centered on Lake Ontario
     visit search_catalog_path(
       bbox: '-83.750499 40.41709 -74.368175 47.963663',
-      'f[dct_provenance_s][]': 'Cornell'
+      "f[#{Settings.FIELDS.PROVENANCE}][]": 'Cornell'
     )
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best
-    expect(position_in_result_page(page, 'cugir-008186')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186')).to be < 4
     # NY State result
     # Bigger bbox / result bbox overlaps bbox param best (score tie)
-    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 3
+    expect(position_in_result_page(page, 'cugir-008186-no-downloadurl')).to be < 4
     # NY Adirondak Region result
     # Smaller bbox / result bbox overlaps bbox param the least
-    expect(position_in_result_page(page, 'cugir-007741')).to eq 3
+    expect(position_in_result_page(page, 'cugir-007741')).to eq 4
   end
 end