Add test coverage for Ruby 3.0.x and drop 2.5.x (#221)

* Update targeted version to 2.6
* Set Bundler version to < 2.2
* Formatting updates for Rubocop

Author: ruebot

.github/workflows/warclight-build.yml

@@ -11,15 +11,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 2.6, 2.5]
+        ruby: [2.6, 2.7, 3.0]
     steps:
       - uses: actions/checkout@v2
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+      - name: Setup Bundler (< 2.2)
+        run: gem uninstall bundler; gem install bundler -v '< 2.2'
       - name: Setup Node
         run: npm install
+      - name: Bundler version
+        run: which bundle; bundle --version
       - name: Setup Warclight
         run: bundle install
       - name: Run tests

.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
     - 'db/**/*'
     - 'lib/generators/warclight/templates/**/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
 
 Rails:

README.md

@@ -13,8 +13,8 @@ Ruest, Nick, Milligan, Ian, and Lin, Jimmy. [Warclight: A Rails Engine for Web A
 
 ## Requirements
 
-* [Ruby](https://www.ruby-lang.org/en/) 2.4+ or later
-* [Bundler](https://bundler.io/)
+* [Ruby](https://www.ruby-lang.org/en/) 2.6+ or later
+* [Bundler](https://bundler.io/) < 2.2
 * [Rails](http://rubyonrails.org) 5.1+ or later
 
 ## Installation

app/helpers/warclight_helper.rb

@@ -5,16 +5,14 @@
 module WarclightHelper
   def url_to_link(options = {})
     safe_join(options[:value].map do |url|
-      begin
-        res = Net::HTTP.get_response(URI(url))
-        if res.code.start_with?('1', '2', '3')
-          link_to(url, url, target: '_blank', rel: 'noopener') << ' 🔗'
-        else
-          url + ' (Not available)'
-        end
-      rescue
+      res = Net::HTTP.get_response(URI(url))
+      if res.code.start_with?('1', '2', '3')
+        link_to(url, url, target: '_blank', rel: 'noopener') << ' 🔗'
+      else
         url + ' (Not available)'
       end
+    rescue
+      url + ' (Not available)'
     end, '')
   end
 

warclight.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage              = 'https://github.com/archivesunleashed/warclight'
   s.summary               = 'A Rails engine supporting discovery of web archives.'
   s.license               = 'Apache-2.0'
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.6'
 
   s.files                 = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.executables     = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths   = ['lib']
 
-  s.add_dependency 'blacklight', '7.19.2'
+  s.add_dependency 'blacklight', '~> 7.2'
   s.add_dependency 'blacklight_range_limit', '8.0.0'
-  s.add_dependency 'rails', '~> 5.0'
+  s.add_dependency 'rails', '>= 5.1', '< 6.2'
   s.add_dependency 'sprockets', '< 4.0'
 
   s.add_development_dependency 'bundler', '> 1.14'