Merge pull request #122 from samvera/rails_ruby_bump

Test on latest ruby and rails versions

.circleci/config.yml

@@ -54,39 +54,64 @@ jobs:
 workflows:
   ci:
     jobs:
+      - bundle_and_test:
+          name: ruby3-3_rails7-1
+          ruby_version: 3.3.0
+          rails_version: 7.1.3
+      - bundle_and_test:
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.3
+          rails_version: 7.1.3
+
+      - bundle_and_test:
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.3
+          rails_version: 7.1.3
+      - bundle_and_test:
+          name: ruby3-3_rails7-0
+          ruby_version: 3.3.0
+          rails_version: 7.0.8
       - bundle_and_test:
           name: ruby3-2_rails7-0
-          ruby_version: 3.2.0
-          rails_version: 7.0.4
+          ruby_version: 3.2.3
+          rails_version: 7.0.8
 
+      - bundle_and_test:
+          name: ruby3-1_rails7-1
+          ruby_version: 3.1.4
+          rails_version: 7.1.3
       - bundle_and_test:
           name: ruby3-1_rails7-0
-          ruby_version: 3.1.3
-          rails_version: 7.0.4
+          ruby_version: 3.1.4
+          rails_version: 7.0.8
 
+      - bundle_and_test:
+          name: ruby3-0_rails7-1
+          ruby_version: 3.0.6
+          rails_version: 7.1.3
       - bundle_and_test:
           name: ruby3-0_rails7-0
-          ruby_version: 3.0.5
-          rails_version: 7.0.4
+          ruby_version: 3.0.6
+          rails_version: 7.0.8
       - bundle_and_test:
           name: ruby3-0_rails6-1
-          ruby_version: 3.0.5
-          rails_version: 6.1.7
+          ruby_version: 3.0.6
+          rails_version: 6.1.7.6
       - bundle_and_test:
           name: ruby3-0_rails6-0
-          ruby_version: 3.0.5
-          rails_version: 6.0.6
+          ruby_version: 3.0.6
+          rails_version: 6.0.6.1
 
       - bundle_and_test:
           name: ruby2-7_rails6-1
-          ruby_version: 2.7.7
-          rails_version: 6.1.7
+          ruby_version: 2.7.8
+          rails_version: 6.1.7.6
       - bundle_and_test:
           name: ruby2-7_rails6-0
-          ruby_version: 2.7.7
-          rails_version: 6.0.6
+          ruby_version: 2.7.8
+          rails_version: 6.0.6.1
       - bundle_and_test:
           name: ruby2-7_rails5-2
-          ruby_version: 2.7.7
+          ruby_version: 2.7.8
           rails_version: 5.2.8.1
 

lib/noid/rails/engine.rb

@@ -5,6 +5,18 @@
 module Noid
   module Rails
     class Engine < ::Rails::Engine
+      config.before_configuration do
+        # rubocop:disable Style/IfUnlessModifier
+
+        # see https://github.com/fxn/zeitwerk#for_gem
+        # Blacklight puts a generator into LOCAL APP lib/generators, so tell
+        # zeitwerk to ignore the whole directory? If we're using zeitwerk
+        #
+        # See: https://github.com/cbeer/engine_cart/issues/117
+        if ::Rails.try(:autoloaders).try(:main).respond_to?(:ignore)
+          ::Rails.autoloaders.main.ignore(::Rails.root.join('lib', 'generators'))
+        end
+      end
     end
   end
 end

noid-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.metadata      = { "rubygems_mfa_required" => "true" }
 
-  spec.add_dependency 'actionpack', '>= 5.0.0', '< 7.1'
+  spec.add_dependency 'actionpack', '>= 5.0.0', '< 7.2'
   spec.add_dependency 'noid', '~> 0.9'
 
   spec.add_development_dependency 'bixby', '~> 5.0.0'