geoblacklight 4.0.0.pre.rc2 → 4.0.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e016f04146c4adb059ab8e46fc9ab057bc6f3fbaddc93db8bc08f1cbd4f9109
-  data.tar.gz: 32ce106b04443cbcf338542e6cf249fac74fd1d3631ec07f8bd91f71cef65b5d
+  metadata.gz: c79db293440e20eec134b810891862224cc2ffd664c0e0b1899235bd6c577d52
+  data.tar.gz: 20fd4af3b5cb75b5902370b464da4d50f0afdb081d143e566275fd6ec7f6ece6
 SHA512:
-  metadata.gz: 434df1f2da05c35bc5aa86c3209810f6cc6cba302153a42e005aea9997ea59e1049deba575d720da8b8324c16d2cc14774507a591fba76bb043b94e39c7ad0c4
-  data.tar.gz: 4150a0c44452e67547212301a17ee1ace802784034845b7832f5cbcb82f686c9dbab68f93d6b61dcef54f5405fc7ab35312d4b100055f00a276f14efa2db7cc1
+  metadata.gz: 814e2426bdd9024a0d68b4750f2a9b02ac45e8bdf52f8a0c1d54004ae1f3140bce2b93223982ebfc19e960561c6afaaef939f8c7909d91949f15cb1151d34a33
+  data.tar.gz: 72113af4255d38766e2916ddeac83796daaf3f8079e6eeac631603e9768fb38fc213a12460b0151a0bf9943da33fa4bee9e4b902f0b43e58b299aa1dc19b2d10

data/.github/workflows/ruby.yml

@@ -33,6 +33,11 @@ jobs:
             rails_version: 6.1
             bundler_version: 2.1.1
             faraday_version: '~> 1.0'
+          - ruby_version: '3.0'
+            rails_version: '7.0.2.2'
+            bundler_version: 2.1.1
+            faraday_version: '>= 2'
+
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -70,6 +70,11 @@ RSpec/AnyInstance:
     - 'spec/models/concerns/geoblacklight/solr_document/finder_spec.rb'
     - 'spec/features/download_layer_spec.rb'
 
+RSpec/Capybara/SpecificMatcher:
+  Exclude:
+    - spec/components/geoblacklight/*
+    - spec/features/*
+
 RSpec/DescribeClass:
   Exclude:
     - spec/tasks/*
@@ -85,6 +90,7 @@ RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/lib/geoblacklight/download/hgl_download_spec.rb'
     - 'spec/lib/geoblacklight/document_presenter_spec.rb'
+    - 'spec/lib/geoblacklight/references_spec.rb'
 
 # TODO: Investigate use of OpenStruct in specs
 Style/OpenStructUse:

data/.solr_wrapper

@@ -1,4 +1,4 @@
-url: https://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.zip
+url: https://archive.apache.org/dist/lucene/solr/8.11.2/solr-8.11.2.tgz
 validate: false
 instance_dir: tmp/solr
 download_dir: tmp/solr

data/app/controllers/wms_controller.rb

@@ -11,6 +11,6 @@ class WmsController < ApplicationController
   private
 
   def wms_params
-    params.permit('URL', 'LAYERS', 'BBOX', 'WIDTH', 'HEIGHT', 'QUERY_LAYERS', 'X', 'Y')
+    params.permit(Settings.GBL_PARAMS)
   end
 end

data/config/locales/geoblacklight.en.yml

@@ -20,6 +20,7 @@ en:
       export_shapefile_link: 'Shapefile'
       export_kmz_link: 'KMZ'
       export_geojson_link: 'GeoJSON'
+      export_geotiff_link: 'GeoTIFF'
     home:
       headline: 'Explore and discover...'
       search_heading: 'Find the maps and data you need'

data/geoblacklight.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_rubygems_version = '>= 2.5.2'
 
-  spec.add_dependency 'rails', '>= 6.1', '< 7'
+  spec.add_dependency 'rails', '>= 6.1', '< 7.1'
   spec.add_dependency 'blacklight', '~> 7.12'
   spec.add_dependency 'config'
   spec.add_dependency 'faraday', '>= 1.0'

data/lib/generators/geoblacklight/assets_generator.rb

@@ -17,7 +17,7 @@ module Geoblacklight
     def add_javascript
       copy_file 'assets/geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
 
-      if Rails.version.to_i == 6
+      if Rails.version.to_i >= 6
         append_to_file 'app/assets/javascripts/application.js',
                        "\n// Required by GeoBlacklight\n//= require geoblacklight"
       end

data/lib/generators/geoblacklight/install_generator.rb

@@ -7,6 +7,23 @@ module Geoblacklight
 
     desc 'Install Geoblacklight'
 
+    def allow_geoblacklight_params
+      gbl_params = <<-"PARAMS"
+        before_action :allow_geoblacklight_params
+
+        def allow_geoblacklight_params
+          # Blacklight::Parameters will pass these to params.permit
+          blacklight_config.search_state_fields.append(Settings.GBL_PARAMS)
+        end
+      PARAMS
+
+      inject_into_file 'app/controllers/application_controller.rb', gbl_params, before: /^end/
+    end
+
+    def raise_unpermitted_params
+      inject_into_file 'config/environments/test.rb', "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
+    end
+
     def mount_geoblacklight_engine
       inject_into_file 'config/routes.rb', "mount Geoblacklight::Engine => 'geoblacklight'\n", before: /^end/
     end

data/lib/generators/geoblacklight/templates/settings.yml

@@ -22,6 +22,25 @@ OVERLAP_RATIO_BOOST: '2'
 HOMEPAGE_MAP_GEOM: null
 # HOMEPAGE_MAP_GEOM: '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
 
+# Non-search-field GeoBlacklight application permitted params
+GBL_PARAMS:
+  - :bbox
+  - :email
+  - :file
+  - :format
+  - :id
+  - :logo
+  - :provider
+  - :type
+  - :BBOX
+  - :HEIGHT
+  - :LAYERS
+  - :QUERY_LAYERS
+  - :URL
+  - :WIDTH
+  - :X
+  - :Y
+
 # Solr field mappings
 FIELDS:
   :ACCESS_RIGHTS: 'dct_accessRights_s'

data/lib/geoblacklight/download.rb

@@ -48,7 +48,7 @@ module Geoblacklight
       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]} "\
+      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'

data/lib/geoblacklight/engine.rb

@@ -13,8 +13,10 @@ module Geoblacklight
     # GeoblacklightHelper is needed by all helpers, so we inject it
     # into action view base here.
     initializer 'geoblacklight.helpers' do
-      ActionView::Base.send :include, GeoblacklightHelper
-      ActionView::Base.send :include, CartoHelper
+      config.after_initialize do
+        ActionView::Base.send :include, GeoblacklightHelper
+        ActionView::Base.send :include, CartoHelper
+      end
     end
 
     config.to_prepare do

data/lib/geoblacklight/metadata_transformer/base.rb

@@ -31,7 +31,7 @@ module Geoblacklight
       def cleaned_metadata
         transformed_doc = Nokogiri::XML(@metadata.to_html)
         if transformed_doc.xpath('//body').children.empty?
-          fail TransformError,\
+          fail TransformError, \
                'Failed to extract the <body> child elements from the transformed metadata'
         end
         transformed_doc.xpath('//body').children

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '4.0.0-rc2'
+  VERSION = '4.0.0-rc3'
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -5,7 +5,7 @@ describe CatalogController, type: :controller do
   describe '#web_services' do
     it 'returns a document based off an id' do
       get :web_services, params: { id: 'mit-f6rqs4ucovjk2' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:documents)).not_to be_nil
     end
   end
@@ -13,14 +13,14 @@ describe CatalogController, type: :controller do
   describe '.default_solr_params' do
     it 'sets the number of rows returned by Solr to 10 and does not filter the results' do
       get :index
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
       expect(assigns(:response).docs.length).to eq 10
     end
 
     it 'sets the starting document index to 0' do
       get :index
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:response).docs).not_to be_empty
       expect(assigns(:response).docs.first.id).to eq 'stanford-cg357zz0321'
     end
@@ -35,7 +35,7 @@ describe CatalogController, type: :controller do
       it 'sets the starting document index' do
         blacklight_config.default_solr_params = { start: 2, 'q.alt' => '*:*' }
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).not_to be_empty
         expect(assigns(:response).docs.first.id).to eq 'mit-001145244'
       end
@@ -43,7 +43,7 @@ describe CatalogController, type: :controller do
       it 'filters using a default DisMax query when no query is provided by the client' do
         blacklight_config.default_solr_params = { start: 10, 'q.alt' => '{!dismax}id:nyu' }
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).to be_empty
       end
     end
@@ -58,7 +58,7 @@ describe CatalogController, type: :controller do
       it 'alters the number of documents returned from Solr' do
         blacklight_config.default_per_page = 20
         get :index
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
         expect(assigns(:response).docs).not_to be_empty
         expect(assigns(:response).docs.length).to eq 20
       end
@@ -68,7 +68,7 @@ describe CatalogController, type: :controller do
   describe '#raw' do
     it 'returns a JSON representation of a Solr Document' do
       get :raw, params: { id: 'tufts-cambridgegrid100-04' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(response.body).not_to be_empty
       response_values = JSON.parse(response.body)
       expect(response_values).to include 'gbl_mdVersion_s' => 'Aardvark'

data/spec/controllers/download_controller_spec.rb

@@ -6,7 +6,7 @@ describe DownloadController, type: :controller do
     describe 'restricted file' do
       it 'redirects to login for authentication' do
         get :file, params: { id: 'stanford-cg357zz0321-shapefile', format: 'zip' }
-        expect(response.status).to eq 401
+        expect(response).to have_http_status :unauthorized
       end
     end
     describe 'public file' do
@@ -21,7 +21,7 @@ describe DownloadController, type: :controller do
     describe 'restricted file' do
       it 'redirects to login for authentication' do
         get :show, params: { id: 'stanford-cg357zz0321', format: 'json' }
-        expect(response.status).to eq 401
+        expect(response).to have_http_status :unauthorized
       end
     end
     describe 'public file' do
@@ -34,7 +34,7 @@ describe DownloadController, type: :controller do
       it 'initiates download creation' do
         allow(shapefile_download).to receive(:get).and_return('success')
         get :show, params: { id: 'mit-f6rqs4ucovjk2', type: 'shapefile' }
-        expect(response.status).to eq 200
+        expect(response).to have_http_status :ok
       end
     end
 
@@ -85,7 +85,7 @@ describe DownloadController, type: :controller do
       allow(Geoblacklight::HglDownload).to receive(:new).and_return(hgl_download)
 
       get :hgl, params: { id: 'harvard-g7064-s2-1834-k3', email: 'foo@example.com' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
     end
 
     it 'renders form' do

data/spec/controllers/relation_controller_spec.rb

@@ -5,7 +5,7 @@ describe RelationController, type: :controller do
   describe '#index' do
     it 'returns a listing of related documents for a record' do
       get :index, params: { id: 'nyu_2451_34502' }
-      expect(response.status).to eq 200
+      expect(response).to have_http_status :ok
       expect(assigns(:relations)).not_to be_nil
     end
   end

data/spec/controllers/wms_controller_spec.rb

@@ -5,7 +5,7 @@ describe WmsController, type: :controller do
   let(:wms_layer) { instance_double(Geoblacklight::WmsLayer) }
   let(:feature_info) { { values: ['fid', 'layer:example'] } }
   let(:params) do
-    { format: 'json', 'URL' => 'http://www.example.com/', 'LAYERS' => 'layer:example',
+    { 'format' => 'json', 'URL' => 'http://www.example.com/', 'LAYERS' => 'layer:example',
       'BBOX' => '-74, 40, -68, 43', 'WIDTH' => '500', 'HEIGHT' => '400',
       'QUERY_LAYERS' => 'layer:example', 'X' => '277', 'Y' => '195' }
   end
@@ -27,8 +27,6 @@ describe WmsController, type: :controller do
 
     it 'returns only permitted params' do
       get :handle, params: params
-      expect(wms_params.to_h).not_to eq(params)
-      params.delete(:format)
       expect(wms_params.to_h).to eq(params)
     end
   end

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -139,8 +139,8 @@ describe GeoblacklightHelper, type: :helper do
     context 'as a String' do
       let(:document_attributes) do
         {
-          value: 'This is a really long string that should get truncated when it gets rendered'\
-                 'in the index view to give a brief description of the contents of a particular document'\
+          value: 'This is a really long string that should get truncated when it gets rendered' \
+                 'in the index view to give a brief description of the contents of a particular document' \
                  'indexed into Solr'
         }
       end
@@ -154,8 +154,8 @@ describe GeoblacklightHelper, type: :helper do
     context 'as an Array' do
       let(:document_attributes) do
         {
-          value: ['This is a really long string that should get truncated when it gets rendered'\
-                  'in the index view to give a brief description of the contents of a particular document'\
+          value: ['This is a really long string that should get truncated when it gets rendered' \
+                  'in the index view to give a brief description of the contents of a particular document' \
                   'indexed into Solr']
         }
       end

data/spec/views/catalog/_results_pagination.html.erb_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_results_pagination.html.erb', type: :view do
+describe 'catalog/_results_pagination', type: :view do
   it 'will have a #pagination wrapping div' do
     allow(view).to receive_messages(show_pagination?: false)
     render

data/spec/views/catalog/_show_downloads.html.erb_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_show_downloads.html.erb', type: :view do
+describe 'catalog/_show_downloads', type: :view do
   context 'document is downloadable' do
     let(:document) { instance_double(SolrDocument) }
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.rc2
+  version: 4.0.0.pre.rc3
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement