hydra-role-management 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61cbc32dc3e32c66c6d8e68507337815184f76ee15ed4a6f47b003525d66c672
-  data.tar.gz: f67e29bc421c18f92e22b471134cd1fe741d6defcef2c3b61ff8cd163f57e2f1
+  metadata.gz: 0abc02b3f0cc25b9a09809f8360a301c518ab5f21d0bdb6301e21841a19edc06
+  data.tar.gz: 15c6403571be850bb380b8c263223f5fff8d09574910cebcb9b92f1d93d7d1ce
 SHA512:
-  metadata.gz: f608323776d336776049d75ac017b0e9069e278a2791efdd38335d77348c638732ea9e1fccdea59ac519be8d8add265bf4e5e0616d05c296195b8c76bdc82936
-  data.tar.gz: 168efd3ca4c09ef0e06f175526ad24674c7ac0d10866024595a437a6e37a8555c6ae284223627e4ac4ae28a4d9ad858bb99fe6d987036538c7ed555d095a3687
+  metadata.gz: 62bf62a8b148091907b8d6514d18b3adf720bab1a4e38806534c1cb362e0c33ddddb75aa17b1c9f219c31a67a370824d16ff2fa3c3f15a5e095311d201416e5c
+  data.tar.gz: 59cc621704a81315dbfa137ddbfc6a54cb3dfe6607713b0e2d10dec6d058cf1f00889093d5af917c71e25357de3285814e9427c8969a1dfb97b1431943d15aa8

data/.circleci/config.yml

@@ -44,6 +44,9 @@ jobs:
       - samvera/rubocop
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hydra-role-management.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/roles/roles_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+      - run:
+          name: Fix test app's Gemfile
+          command: sed -i 's/\(^.*error_highlight.*$\)/# \1/' .internal_test_app/Gemfile
       - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
@@ -57,75 +60,45 @@ jobs:
 workflows:
   ci:
     jobs:
+      # Rails 7.2
+      - test:
+          name: "ruby3-3_rails7-2"
+          ruby_version: 3.3.5
+          rails_version: 7.2.1
+      - test:
+          name: "ruby3-2_rails7-2"
+          ruby_version: 3.2.5
+          rails_version: 7.2.1
+      - test:
+          name: "ruby3-1_rails7-2"
+          ruby_version: 3.1.6
+          rails_version: 7.2.1
+      # Rails 7.1
+      - test:
+          name: "ruby3-3_rails7-1"
+          ruby_version: 3.3.5
+          rails_version: 7.1.4
+      - test:
+          name: "ruby3-2_rails7-1"
+          ruby_version: 3.2.5
+          rails_version: 7.1.4
+      - test:
+          name: "ruby3-1_rails7-1"
+          ruby_version: 3.1.6
+          rails_version: 7.1.4
       # Rails 7.0
+      - test:
+          name: "ruby3-3_rails7-0"
+          ruby_version: 3.3.5
+          rails_version: 7.0.8.4
       - test:
           name: "ruby3-2_rails7-0"
-          ruby_version: 3.2.0
-          rails_version: 7.0.4.1
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
       - test:
           name: "ruby3-1_rails7-0"
-          ruby_version: 3.1.3
-          rails_version: 7.0.4.1
-      - test:
-          name: "ruby3-0_rails7-0"
-          ruby_version: 3.0.5
-          rails_version: 7.0.4.1
-      # Rails 6.1
-      - test:
-          name: "ruby3-2_rails6-1"
-          ruby_version: 3.2.0
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby3-1_rails6-1"
-          ruby_version: 3.1.3
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby3-0_rails6-1"
-          ruby_version: 3.0.5
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby2-7_rails6-1"
-          ruby_version: 2.7.7
-          rails_version: 6.1.7.1
-      # Rails 6.0
-      - test:
-          name: "ruby3-2_rails6-0"
-          ruby_version: 3.2.0
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby3-1_rails6-0"
-          ruby_version: 3.1.3
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby3-0_rails6-0"
-          ruby_version: 3.0.5
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby2-7_rails6-0"
-          ruby_version: 2.7.7
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby2-6_rails6-0"
-          ruby_version: 2.6.10
-          rails_version: 6.0.6.1
-      # Rails 5.2
-      - test:
-          name: "ruby2-7_rails5-2"
-          ruby_version: 2.7.7
-          rails_version: 5.2.8.1
-      - test:
-          name: "ruby2-6_rails5-2"
-          ruby_version: 2.6.10
-          rails_version: 5.2.8.1
-      # Rails 5.1
-      - test:
-          name: "ruby2-7_rails5-1"
-          ruby_version: 2.7.7
-          rails_version: 5.1.7
-      - test:
-          name: "ruby2-6_rails5-1"
-          ruby_version: 2.6.10
-          rails_version: 5.1.7
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4
 
   nightly:
     triggers:
@@ -137,72 +110,42 @@ workflows:
                 - main
 
     jobs:
+      # Rails 7.2
+      - test:
+          name: "ruby3-3_rails7-2"
+          ruby_version: 3.3.5
+          rails_version: 7.2.1
+      - test:
+          name: "ruby3-2_rails7-2"
+          ruby_version: 3.2.5
+          rails_version: 7.2.1
+      - test:
+          name: "ruby3-1_rails7-2"
+          ruby_version: 3.1.6
+          rails_version: 7.2.1
+      # Rails 7.1
+      - test:
+          name: "ruby3-3_rails7-1"
+          ruby_version: 3.3.5
+          rails_version: 7.1.4
+      - test:
+          name: "ruby3-2_rails7-1"
+          ruby_version: 3.2.5
+          rails_version: 7.1.4
+      - test:
+          name: "ruby3-1_rails7-1"
+          ruby_version: 3.1.6
+          rails_version: 7.1.4
       # Rails 7.0
+      - test:
+          name: "ruby3-3_rails7-0"
+          ruby_version: 3.3.5
+          rails_version: 7.0.8.4
       - test:
           name: "ruby3-2_rails7-0"
-          ruby_version: 3.2.0
-          rails_version: 7.0.4.1
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
       - test:
           name: "ruby3-1_rails7-0"
-          ruby_version: 3.1.3
-          rails_version: 7.0.4.1
-      - test:
-          name: "ruby3-0_rails7-0"
-          ruby_version: 3.0.5
-          rails_version: 7.0.4.1
-      # Rails 6.1
-      - test:
-          name: "ruby3-2_rails6-1"
-          ruby_version: 3.2.0
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby3-1_rails6-1"
-          ruby_version: 3.1.3
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby3-0_rails6-1"
-          ruby_version: 3.0.5
-          rails_version: 6.1.7.1
-      - test:
-          name: "ruby2-7_rails6-1"
-          ruby_version: 2.7.7
-          rails_version: 6.1.7.1
-      # Rails 6.0
-      - test:
-          name: "ruby3-2_rails6-0"
-          ruby_version: 3.2.0
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby3-1_rails6-0"
-          ruby_version: 3.1.3
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby3-0_rails6-0"
-          ruby_version: 3.0.5
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby2-7_rails6-0"
-          ruby_version: 2.7.7
-          rails_version: 6.0.6.1
-      - test:
-          name: "ruby2-6_rails6-0"
-          ruby_version: 2.6.10
-          rails_version: 6.0.6.1
-      # Rails 5.2
-      - test:
-          name: "ruby2-7_rails5-2"
-          ruby_version: 2.7.7
-          rails_version: 5.2.8.1
-      - test:
-          name: "ruby2-6_rails5-2"
-          ruby_version: 2.6.10
-          rails_version: 5.2.8.1
-      # Rails 5.1
-      - test:
-          name: "ruby2-7_rails5-1"
-          ruby_version: 2.7.7
-          rails_version: 5.1.7
-      - test:
-          name: "ruby2-6_rails5-1"
-          ruby_version: 2.6.10
-          rails_version: 5.1.7
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4

data/hydra-role-management.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'Apache 2.0'
   gem.metadata      = { "rubygems_mfa_required" => "true" }
 
-  gem.add_dependency 'blacklight'
+  gem.add_dependency 'blacklight', '< 8'
   gem.add_dependency 'bootstrap_form'
   gem.add_dependency 'bundler', '>= 1.5'
   gem.add_dependency 'cancancan'

data/lib/hydra/role_management/version.rb

@@ -2,6 +2,6 @@
 
 module Hydra
   module RoleManagement
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/hydra/role_management.rb

@@ -10,6 +10,18 @@ module Hydra
       # Rails 4 should do this automatically:
       config.paths.add 'app/controllers/concerns', eager_load: true
       config.paths.add 'app/models/concerns', eager_load: true
+
+      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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hydra-role-management
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Rails engine to do user roles in an RDBMS for hydra-head