Merge pull request #34 from cbeer/newer-rails

Test on newer versions of rails

Author: cbeer

.github/workflows/ruby.yml

@@ -2,26 +2,33 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [6.1.7.8]
-        ruby: [3.1, 3.2, 3.3]
+        rails_version: [7.2.0]
+        ruby: [3.2, 3.3]
+        include:
+          - ruby: 3.3
+            rails_version: 7.1.3.4
+          - ruby: 3.2
+            rails_version: 7.0.8.4
+          - ruby: 3.1
+            rails_version: 6.1.7.8
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies with Rails ${{ matrix.rails_version }}
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies with Rails ${{ matrix.rails_version }}
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

lib/openseadragon/engine.rb

@@ -2,6 +2,18 @@ module Openseadragon
   class Engine < ::Rails::Engine
     isolate_namespace Openseadragon
 
+    config.before_configuration do
+      # see https://github.com/fxn/zeitwerk#for_gem
+      # openseadragon_rails puts a generator into LOCAL APP lib/generators, so tell
+      # zeitwerk to ignore the whole directory? If we're using a recent
+      # enough version of Rails to have zeitwerk config
+      #
+      # 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
+
     initializer 'openseadragon.assets.precompile' do |app|
       app.config.assets.precompile += %w[openseadragon/*.png]
     end