Merge pull request #164 from projectblacklight/new-rails

Test on Rails 8
projectblacklight · Dec 10, 2024 · baabb09 · baabb09
2 parents 1c4b633 + 89a538d
commit baabb09
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         ruby: ["3.2", "3.3"]
-        rails_version: ["7.0.4"]
+        rails_version: ["7.2.2"]
         blacklight_version: ["~> 7.0"]
         experimental: [false]
         additional_engine_cart_rails_options: [""]
@@ -42,12 +42,18 @@ jobs:
             experimental: false
             view_component_version: "~> 2.83"
             additional_name: "/ ViewComponent 2"
-          - ruby: "3.2"
-            rails_version: "7.0.4"
+          - ruby: "3.3"
+            rails_version: "8.0.0"
+            blacklight_version: "~> 8.0"
+            experimental: false
+            additional_engine_cart_rails_options: --css bootstrap
+            additional_name: "/ Blackight 8 / Rails 8"
+          - ruby: "3.3"
+            rails_version: "7.2.2"
             blacklight_version: "github"
             experimental: true
-            additional_engine_cart_rails_options: -a propshaft
-            additional_name: "/ Propshaft"
+            additional_engine_cart_rails_options: -a propshaft --css bootstrap
+            additional_name: "/ Blacklight main branch with Propshaft"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}

diff --git a/blacklight-gallery.gemspec b/blacklight-gallery.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", '>= 6.1', '< 8'
+  spec.add_dependency "rails", '>= 6.1', '< 9'
   spec.add_dependency 'blacklight', '>= 7.17', '< 9'
 
   spec.add_development_dependency "rake"

diff --git a/lib/generators/blacklight_gallery/install_generator.rb b/lib/generators/blacklight_gallery/install_generator.rb
@@ -30,6 +30,9 @@ def add_openseadragon
 
     def assets
       copy_file "blacklight_gallery.css.scss", "app/assets/stylesheets/blacklight_gallery.css.scss"
+
+      return unless defined?(Sprockets)
+
       append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight_gallery/manifest.js\n"
       copy_file "blacklight_gallery.js", "app/assets/javascripts/blacklight_gallery.js"