geoblacklight 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4223d35e4ed4cde2941078241c7a5296a5ba8c9b5d6e48c5978f4ada0f126ec
-  data.tar.gz: '08995f020707fd8ed178c7b3b9ac61058d8d7714d365fe8a0081961421da529d'
+  metadata.gz: 669f1317b4e0b7a8d207830fea82860c2cfad0fe63598889bb62e9f082428fb0
+  data.tar.gz: 7f56526d08dccd86e1acb275f6ab64f69d3e9294eec494d3527c83d76e5e49ca
 SHA512:
-  metadata.gz: fd89fa9f16c805f05f8b5e6814ca68e2fcbe581a1bfeb500712f9dd37dc94e6875e528b3cab1a90516846adc9fc3f9bd00ba42702c45956eb04b408fc941a4c5
-  data.tar.gz: f16a5f2646b4d5a0daadba9b43a05949c06c84a03fda1e0564f25a768486ce877fcf6afa0f612c6e45d8945723f129da7f3435331a6f1d5256bb177bcc866343
+  metadata.gz: 1d886872bb892dd3431252cebc62ddd64fc920a6a1a1ed0c718dd53c4a59e2400b1c61c345676bded065523aef0743d1a23b862ca6d0c863054d664c1881586c
+  data.tar.gz: 437dcc35b775cb2387717c5177fa5e6380023b0bfb76bfff87d3f0ff151ef2756359fbeefd9ce352eec7a8e29e6a4809a9cfba87bab6320e5898b7430d4c62ee

data/.github/workflows/ruby.yml

@@ -46,14 +46,28 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, '3.0']
+        ruby_version: ['3.0', 2.7]
+        rails_version: [6.1]
+        bundler_version: [2.1.1]
+        faraday_version: ['>= 2', '~> 1.0']
+        include:
+          - ruby_version: 2.6
+            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
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby }}
+        ruby-version: ${{ matrix.ruby_version }}
 
     - name: Create Solr container
       run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
@@ -64,7 +78,7 @@ jobs:
     - name: Install dependencies
       run: bundle _2.1.1_ install
       env:
-        rails_version: 7.0.1
+        rails_version: ${{ matrix.rails_version }}
 
     - name: Load config into solr
       run: |
@@ -76,7 +90,7 @@ jobs:
     - name: Run tests
       run: bundle exec rake ci
       env:
-        rails_version: 7.0.1
+        rails_version: ${{ matrix.rails_version }}
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
         SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
 
@@ -85,41 +99,3 @@ jobs:
       with:
         name: coverage
         path: coverage/
-
-  test_rails6_1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.6]
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-
-    - name: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-
-    - name: Install bundler
-      run: gem install bundler -v 2.1.1
-
-    - name: Install dependencies
-      run: bundle _2.1.1_ install
-      env:
-        RAILS_VERSION: 6.1.4.4
-
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.1.4.4
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core

data/.rubocop.yml

@@ -84,6 +84,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'
 
 Style/SignalException:
   EnforcedStyle: semantic

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', '>= 5.2.4', '< 6.2'
+  spec.add_dependency 'rails', '>= 5.2.4', '< 7.1'
   spec.add_dependency 'blacklight', '~> 7.8'
   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/geoblacklight/engine.rb

@@ -16,8 +16,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/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '3.6.0'
+  VERSION = '3.7.0'
 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: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 5.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -865,7 +865,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings