rabarber 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb92ea0f4a25ee7dd730aae35b07d16230434393882cd0833d853117e7887e9
-  data.tar.gz: 3056af62a93df97b88f708dc725e0b54c92cfc198aad225ba80262fcfd36a31a
+  metadata.gz: c7481864a3dc409501c34dc66d1f7bfe3399118285fb99cbc6979b17c1b75ff3
+  data.tar.gz: ea2c8e12a4a28be3166d4fb60db78e5c5857e838697a5b2308db2486e81d92ad
 SHA512:
-  metadata.gz: 1e599ea0709127eeed62dd0aae019f9dee5a73843e08671089e1a84b16e13a2db4ad8f908080b51f3a5a8d2fa82d9a7f21efed638dd6e1054f5c80fdb8b5f423
-  data.tar.gz: 0b2548c277de1beb990d9ce0321b0989d7358c521e3cb0d20994cf389ea931feb288dc670d7e886c6a1ccff29dc4d7bdd7c1a07885f0ad327f7b94e3cf8d6f82
+  metadata.gz: 239a2ba8dc2541688ab09fdbf143d9246e6a725d5ac8adebd253c2ef5d2a7935a4b51d4dffadfb6f490cb6871955b1832c6f24188bfe389abbf22287627652d8
+  data.tar.gz: bdf91f9803ec0fd770a7bdb8b0267e63566078a7496b736b0cfdc8a2b7084c73be0836148e0d89e887f8753338fc9efa3a15213f3fa839229b041497349f8908

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v6.0.3
+
+### Bugs:
+
+- Fixed `Rabarber.all_roles` raising `Rabarber::NotFoundError` when a role's context is a class that is not an ActiveRecord model
+
+## v6.0.2
+
+### Bugs:
+
+- Fixed Rails commands failing when the configured user model class does not exist yet
+
 ## v6.0.1
 
 ### Bugs:

data/README.md

@@ -1,4 +1,4 @@
-# Rabarber: Simple Role-Based Authorization for Rails
+# Rabarber: Simple Authorization for Rails
 
 [![Gem Version](https://badge.fury.io/rb/rabarber.svg)](http://badge.fury.io/rb/rabarber)
 [![Downloads](https://img.shields.io/gem/dt/rabarber.svg)](https://rubygems.org/gems/rabarber)
@@ -409,7 +409,7 @@ end
 
 When a context object is deleted from your database, its associated roles become orphaned and ignored by Rabarber.
 
-To clean up orphaned roles, use:
+Ideally, the application should be designed so that this doesn't happen: whenever a context object is deleted, its roles are revoked and deleted as part of the same operation. However, if that wasn't done, you can clean up the orphaned roles as a fallback:
 
 ```rb
 Rabarber.prune

data/lib/rabarber/core/roleable.rb

@@ -3,6 +3,8 @@
 module Rabarber
   module Core
     module Roleable
+      private
+
       def roleable
         current_roleable = send(Rabarber::Configuration.current_user_method)
 
@@ -15,10 +17,6 @@ module Rabarber
 
         current_roleable
       end
-
-      def roleable_roles(context: nil)
-        roleable.roles(context:)
-      end
     end
   end
 end

data/lib/rabarber/models/role.rb

@@ -12,7 +12,9 @@ module Rabarber
       end
 
       def list_all
-        includes(:context).each_with_object({}) do |role, hash|
+        roles = where(context_id: nil).to_a + where.not(context_id: nil).includes(:context).to_a
+
+        roles.each_with_object({}) do |role, hash|
           (hash[role.context] ||= []) << role.name.to_sym
         rescue ActiveRecord::RecordNotFound
           next

data/lib/rabarber/railtie.rb

@@ -4,31 +4,18 @@ require "rails/railtie"
 
 module Rabarber
   class Railtie < Rails::Railtie
-    def self.server_running?
-      !!defined?(Rails::Server)
-    end
-
-    def self.table_exists?
-      ActiveRecord::Base.connection.data_source_exists?("rabarber_roles")
-    rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished
-      false
+    initializer "rabarber.include_roleable" do
+      Rails.autoloaders.each do |autoloader|
+        autoloader.on_load do |cpath, klass, _abspath|
+          klass.include Rabarber::Roleable if cpath == Rabarber::Configuration.user_model_name
+        end
+      end
     end
 
     initializer "rabarber.to_prepare" do |app|
       app.config.to_prepare do
-        if Rabarber::Railtie.server_running? && Rabarber::Railtie.table_exists?
-          Rabarber::Role.where.not(context_type: nil).distinct.pluck(:context_type).each do |context_class|
-            context_class.constantize
-          rescue NameError => e
-            raise Rabarber::Error, "Context not found: class `#{e.name}` may have been renamed or deleted"
-          end
-        end
-
         Rabarber::Core::Permissions.reset! unless app.config.eager_load
 
-        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",

data/lib/rabarber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - enjaku4
 - trafium
 bindir: bin
 cert_chain: []
-date: 2026-07-19 00:00:00.000000000 Z
+date: 1980-01-02 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.15
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Simple role-based authorization library for Ruby on Rails
 test_files: []