rabarber 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b63470cbdf375117e5c901ae46992d0fb85868acedacde3ab17472437d8f4a10
-  data.tar.gz: bba19d48ebad8a6440c70e7555d5befcc9c64f67c0a43f0408cd966f9d24aa15
+  metadata.gz: 6cb92ea0f4a25ee7dd730aae35b07d16230434393882cd0833d853117e7887e9
+  data.tar.gz: 3056af62a93df97b88f708dc725e0b54c92cfc198aad225ba80262fcfd36a31a
 SHA512:
-  metadata.gz: 5b43430eb2fc105add42baa08aa12349137f1aab6021d371400cc48c48c134db4c20bd81e3cbff043e63bf6f22161d6645ab57619090bf1c08b905f6be60fbe1
-  data.tar.gz: cb648ea4388e067d1f06d57f2ba9b45fb7139df3a5a1cbb102ae42441730a2a83749b116d468fb0c6d3b9b0be419c010a62c73c3c0be2d90752086aa5f4e8837
+  metadata.gz: 1e599ea0709127eeed62dd0aae019f9dee5a73843e08671089e1a84b16e13a2db4ad8f908080b51f3a5a8d2fa82d9a7f21efed638dd6e1054f5c80fdb8b5f423
+  data.tar.gz: 0b2548c277de1beb990d9ce0321b0989d7358c521e3cb0d20994cf389ea931feb288dc670d7e886c6a1ccff29dc4d7bdd7c1a07885f0ad327f7b94e3cf8d6f82

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v6.0.1
+
+### Bugs:
+
+- Fixed role management methods raising `NameError` when the configured user model is not named `User`
+- Fixed a race condition where outdated roles could remain cached after being changed
+- Fixed role creation and renaming raising `ActiveRecord::RecordNotUnique` instead of returning `false` when called concurrently
+- Fixed uniqueness of global and class context roles not being enforced at the database level
+
+This release is fully backward compatible: existing applications continue to work as before without any changes. The new indexes only apply to new applications installing Rabarber. To get the same database-level protection in an existing application, run the following optional migration if your database supports partial indexes:
+
+```rb
+add_index :rabarber_roles, :name, unique: true, where: "context_type IS NULL AND context_id IS NULL"
+add_index :rabarber_roles, [:name, :context_type], unique: true, where: "context_type IS NOT NULL AND context_id IS NULL"
+```
+
+On databases without partial index support, such as MySQL, uniqueness of global and class context roles remains, for now, enforced at the application level only.
+
+### Misc:
+
+- `Rabarber.prune` now clears the role cache
+
 ## v6.0.0
 
 ### Breaking:

data/README.md

@@ -218,7 +218,7 @@ class TicketsController < ApplicationController
 end
 ```
 
-Authorization rules are additive - they combine across inheritance chains and when defined multiple times for the same action or controller:
+Authorization rules are additive - rules defined multiple times combine, and controller-wide rules are inherited by subclasses:
 
 ```rb
 class BaseController < ApplicationController
@@ -459,27 +459,31 @@ Use conditional rendering based on roles:
 <% end %>
 ```
 
+Like authorization, these helpers require an authenticated user. In views that can be rendered for both authenticated and unauthenticated visitors, wrap them in your authentication check.
+
 ## Getting Help and Contributing
 
 ### Getting Help
+
 Have a question or need assistance? Open a discussion in the [discussions section](https://github.com/enjaku4/rabarber/discussions) for:
+
 - Usage questions
 - Implementation guidance
-- Feature suggestions
+- Open-ended ideas or suggestions
+
+### Issues
+
+[Issues](https://github.com/enjaku4/rabarber/issues) track bugs, planned features, and other work. When reporting a bug, please include:
 
-### Reporting Issues
-Found a bug? Please [create an issue](https://github.com/enjaku4/rabarber/issues) with:
 - A clear description of the problem
 - Steps to reproduce the issue
-- Your environment details (Rails version, Ruby version, etc.)
+- Your environment details (Rails and Ruby versions, OS, etc.)
 
 ### Contributing Code
-Ready to contribute? You can:
-- Fix bugs by submitting pull requests
-- Improve documentation
-- Add new features (please discuss first in the [discussions section](https://github.com/enjaku4/rabarber/discussions))
 
-Before contributing, please read the [contributing guidelines](https://github.com/enjaku4/rabarber/blob/main/CONTRIBUTING.md)
+Any open issue is free to pick up or discuss. Check the [project board](https://github.com/users/enjaku4/projects/10) or [issues tab](https://github.com/enjaku4/rabarber/issues).
+
+Before contributing, please read the [contributing guidelines](https://github.com/enjaku4/rabarber/blob/main/CONTRIBUTING.md).
 
 ## License
 
@@ -491,7 +495,7 @@ Everyone interacting in the Rabarber project is expected to follow the [code of
 
 ## Old Versions
 
-Only the latest major version is supported. Older versions are obsolete and not maintained, but their READMEs are available here for reference:
+Only the latest major version is actively maintained. READMEs for older versions are available here for reference:
 
 [v5.x.x](https://github.com/enjaku4/rabarber/blob/12a23858e974f5cc0a4ebddfc18bdf84171dd554/README.md) | [v4.x.x](https://github.com/enjaku4/rabarber/blob/9353e70281971154d5acd70693620197a132c543/README.md) | [v3.x.x](https://github.com/enjaku4/rabarber/blob/3bb273de7e342004abc7ef07fa4d0a9a3ce3e249/README.md)
  | [v2.x.x](https://github.com/enjaku4/rabarber/blob/875b357ea949404ddc3645ad66eddea7ed4e2ee4/README.md) | [v1.x.x](https://github.com/enjaku4/rabarber/blob/b81428429404e197d70317b763e7b2a21e02c296/README.md)

data/lib/generators/rabarber/templates/create_rabarber_roles.rb.erb

@@ -10,6 +10,11 @@ class CreateRabarberRoles < ActiveRecord::Migration[<%= ActiveRecord::Migration.
 
     add_index :rabarber_roles, [:name, :context_type, :context_id], unique: true
 
+    if connection.supports_partial_index?
+      add_index :rabarber_roles, :name, unique: true, where: "context_type IS NULL AND context_id IS NULL"
+      add_index :rabarber_roles, [:name, :context_type], unique: true, where: "context_type IS NOT NULL AND context_id IS NULL"
+    end
+
     create_table :rabarber_roles_roleables, id: false do |t|
       t.belongs_to :role, null: false, index: true, foreign_key: { to_table: :rabarber_roles }<%= ", type: :uuid" if options[:uuid] %>
       t.belongs_to :roleable, null: false, index: true, foreign_key: { to_table: <%= table_name.to_sym.inspect %> }<%= ", type: :uuid" if options[:uuid] %>

data/lib/rabarber/core/cache.rb

@@ -15,9 +15,12 @@ module Rabarber
       end
 
       def delete(*pairs)
-        return unless enabled?
+        return unless enabled? && pairs.any?
 
-        Rails.cache.delete_multi(pairs.map { |roleable_id, scope| prepare_key(roleable_id, scope) }) if pairs.any?
+        keys = pairs.map { |roleable_id, scope| prepare_key(roleable_id, scope) }
+
+        Rails.cache.delete_multi(keys)
+        ActiveRecord.after_all_transactions_commit { Rails.cache.delete_multi(keys) } if ActiveRecord::Base.connection.transaction_open?
       end
 
       def clear

data/lib/rabarber/models/concerns/roleable.rb

@@ -50,7 +50,7 @@ module Rabarber
     def has_role?(*role_names, context: nil)
       processed_context = process_context(context)
       processed_roles = process_role_names(role_names)
-      roles(context: processed_context).any? { |role_name| processed_roles.include?(role_name) }
+      roles(context: processed_context).intersect?(processed_roles)
     end
 
     def assign_roles(*role_names, context: nil, create_new: true)
@@ -64,8 +64,12 @@ module Rabarber
       )
 
       if roles_to_assign.any?
+        begin
+          rabarber_roles << roles_to_assign
+        rescue ActiveRecord::RecordNotUnique
+          rabarber_roles.reset
+        end
         delete_roleable_cache(contexts: [processed_context])
-        rabarber_roles << roles_to_assign
       end
 
       roles(context: processed_context)
@@ -80,8 +84,8 @@ module Rabarber
       )
 
       if roles_to_revoke.any?
-        delete_roleable_cache(contexts: [processed_context])
         self.rabarber_roles -= roles_to_revoke
+        delete_roleable_cache(contexts: [processed_context])
       end
 
       roles(context: processed_context)
@@ -103,7 +107,7 @@ module Rabarber
 
     def create_new_roles(role_names, context:)
       new_roles = role_names - Rabarber.roles(context:)
-      new_roles.each { |role_name| Rabarber::Role.create!(name: role_name, **context) }
+      new_roles.each { |role_name| Rabarber::Role.register(role_name, context:) }
     end
 
     def delete_roleable_cache(contexts:)

data/lib/rabarber/models/role.rb

@@ -6,10 +6,6 @@ module Rabarber
 
     belongs_to :context, polymorphic: true, optional: true
 
-    has_and_belongs_to_many :roleables, class_name: Rabarber::Configuration.user_model_name,
-                                        association_foreign_key: "roleable_id",
-                                        join_table: "rabarber_roles_roleables"
-
     class << self
       def list(context: nil)
         where(process_context(context)).pluck(:name).map(&:to_sym)
@@ -32,6 +28,8 @@ module Rabarber
         return false if exists?(name:, **processed_context)
 
         !!create!(name:, **processed_context)
+      rescue ActiveRecord::RecordNotUnique
+        false
       end
 
       def amend(old_name, new_name, context: nil, force: false)
@@ -44,9 +42,13 @@ module Rabarber
 
         return false if exists?(name:, **processed_context) || role.roleables.exists? && !force
 
-        delete_roleables_cache(role, context: processed_context)
-
         role.update!(name:)
+
+        delete_roleables_cache(role.roleables.pluck(:id), context: processed_context)
+
+        true
+      rescue ActiveRecord::RecordNotUnique
+        false
       end
 
       def drop(name, context: nil, force: false)
@@ -57,9 +59,13 @@ module Rabarber
 
         return false if role.roleables.exists? && !force
 
-        delete_roleables_cache(role, context: processed_context)
+        roleable_ids = role.roleables.pluck(:id)
 
-        !!role.destroy!
+        role.destroy!
+
+        delete_roleables_cache(roleable_ids, context: processed_context)
+
+        true
       end
 
       def prune
@@ -79,12 +85,14 @@ module Rabarber
           )
           where(id: orphaned_roles).delete_all
         end
+
+        Rabarber::Core::Cache.clear
       end
 
       private
 
-      def delete_roleables_cache(role, context:)
-        Rabarber::Core::Cache.delete(*role.roleables.pluck(:id).flat_map { [[_1, context], [_1, :all]] })
+      def delete_roleables_cache(roleable_ids, context:)
+        Rabarber::Core::Cache.delete(*roleable_ids.flat_map { [[_1, context], [_1, :all]] })
       end
 
       def process_role_name(name)

data/lib/rabarber/railtie.rb

@@ -28,6 +28,11 @@ module Rabarber
 
         user_model = Rabarber::Configuration.user_model
         user_model.include Rabarber::Roleable unless user_model < Rabarber::Roleable
+
+        Rabarber::Role.send(:remove_const, :HABTM_Roleables) if Rabarber::Role.const_defined?(:HABTM_Roleables, false)
+        Rabarber::Role.has_and_belongs_to_many :roleables, class_name: Rabarber::Configuration.user_model_name,
+                                                           association_foreign_key: "roleable_id",
+                                                           join_table: "rabarber_roles_roleables"
       end
     end
 

data/lib/rabarber/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabarber
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - enjaku4
 - trafium
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.15
 specification_version: 4
 summary: Simple role-based authorization library for Ruby on Rails
 test_files: []