Merge pull request #216 from samvera/ruby3

Test with newer ruby and rails versions

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.3.10
+        default: 2.4.5
       rails_version:
         type: string
       solr_config_path:
@@ -54,18 +54,54 @@ workflows:
   version: 2
   ci:
     jobs:
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails7-0
+          ruby_version: 3.2.0
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails6-1
+          ruby_version: 3.2.0
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails6-0
+          ruby_version: 3.2.0
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails7-0
+          ruby_version: 3.1.3
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails6-1
+          ruby_version: 3.1.3
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails6-0
+          ruby_version: 3.1.3
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails7-0
+          ruby_version: 3.0.5
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails6-1
+          ruby_version: 3.0.5
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails6-0
+          ruby_version: 3.0.5
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails6-1
           ruby_version: 2.7.7
-          rails_version: 6.1.6.1
+          rails_version: 6.1.7.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails6-0
           ruby_version: 2.7.7
-          rails_version: 6.0.3.4
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails5-2
           ruby_version: 2.7.7
-          rails_version: 5.2.3
+          rails_version: 5.2.8.1
 
   nightly:
     triggers:
@@ -76,16 +112,52 @@ workflows:
               only:
                 - main
     jobs:
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails7-0
+          ruby_version: 3.2.0
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails6-1
+          ruby_version: 3.2.0
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-2_rails6-0
+          ruby_version: 3.2.0
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails7-0
+          ruby_version: 3.1.3
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails6-1
+          ruby_version: 3.1.3
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-1_rails6-0
+          ruby_version: 3.1.3
+          rails_version: 6.0.6.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails7-0
+          ruby_version: 3.0.5
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails6-1
+          ruby_version: 3.0.5
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: bundle_ruby3-0_rails6-0
+          ruby_version: 3.0.5
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails6-1
           ruby_version: 2.7.7
-          rails_version: 6.1.6.1
+          rails_version: 6.1.7.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails6-0
           ruby_version: 2.7.7
-          rails_version: 6.0.3.4
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: bundle_ruby2-7_rails5-2
           ruby_version: 2.7.7
-          rails_version: 5.2.3
+          rails_version: 5.2.8.1
 

app/controllers/concerns/records_controller_behavior.rb

@@ -123,7 +123,7 @@ def resource
 
   # Get resource ivar based on the current resource controller.
   #
-  def get_resource_ivar #:nodoc:
+  def get_resource_ivar # :nodoc:
     instance_variable_get("@#{resource_instance_name}")
   end
 

hydra-editor.gemspec

@@ -15,29 +15,29 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md", "History.md"]
 
-  s.add_dependency "activerecord", ">= 5.2", "< 6.2"
+  s.add_dependency "activerecord", ">= 5.2", "< 7.1"
   s.add_dependency "active-fedora", ">= 9.0.0"
   s.add_dependency "almond-rails", '~> 0.1'
-  s.add_dependency "cancancan", "~> 1.8"
+  s.add_dependency "cancancan"
   s.add_dependency "psych", "~> 3.3", "< 4"
-  s.add_dependency "rails", ">= 5.2", "< 6.2"
+  s.add_dependency "rails", ">= 5.2", "< 7.1"
   s.add_dependency "simple_form", '>= 4.1.0', '< 6.0'
   s.add_dependency 'sprockets', '>= 3.7'
   s.add_dependency 'sprockets-es6'
 
-  s.add_development_dependency "bixby", '~> 3.0'
+  s.add_development_dependency "bixby"
   s.add_development_dependency "capybara", '~> 2.4'
   s.add_development_dependency "devise", '~> 4.0'
   s.add_development_dependency "engine_cart", '~> 2.2'
   s.add_development_dependency 'factory_bot_rails', '~> 4.8'
-  s.add_development_dependency 'fcrepo_wrapper', '~> 0.5'
+  s.add_development_dependency 'fcrepo_wrapper'
   s.add_development_dependency "hydra-head", '>= 10.5'
   s.add_development_dependency "pry-byebug"
   s.add_development_dependency 'rails-controller-testing'
   s.add_development_dependency 'rspec_junit_formatter'
   s.add_development_dependency 'rspec-rails', '>= 4'
   s.add_development_dependency 'sdoc', '~> 1.0'
   s.add_development_dependency 'simplecov', '~> 0.16'
-  s.add_development_dependency 'solr_wrapper', '~> 0.15'
+  s.add_development_dependency 'solr_wrapper'
   s.add_development_dependency 'sqlite3', '~> 1.3'
 end

spec/helpers/records_helper_spec.rb

@@ -33,6 +33,7 @@ def required?(_key)
           false
         end
       end
+
       class Serpent
         extend ActiveModel::Naming