rabarber 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73050af26c88e78f295c489ee5fc49c782b3950157db2ecd1dd48cdda5b10045
-  data.tar.gz: '08f7da98672774c2198c155be4fb6f795c23e7da72e565631ef0f08207cd2cb9'
+  metadata.gz: ed0e1d5cc00bc6f410b2a677afb591fa4bb1acd21a7674729edc91e7c5b72cc1
+  data.tar.gz: 7dd9ded3179f7aef89f36a0983f28fe6f4695cd7e535cdeeba4d208053f8d53f
 SHA512:
-  metadata.gz: d1482714aa484c800970ea77a081388a0df4b8945e8fc0931b76e8d6415ed9f88c01ad8834e873d9161a20c7a5f2208b10782fe95857024b1a6069919f83dd47
-  data.tar.gz: '06383d81e91f872419fb567b2ef18991abf6a32263297645725e52b70a9c383a769c72d3657fb9f61a6cc11fb30b2129d813ca63e1a352761f99795f287c86b7'
+  metadata.gz: 99920a8e65cd953f2ddac63083628680b92f89195a65759b64e25d5619099517ad332b8821d2c681a2c0503286617aff0a26f41d5f5f99623fc678a33a028c93
+  data.tar.gz: ce9ddfa4d718ac7d2b2533c3c87ad9cc5d3658cb1b23aa4ae1f0e75fe544186a37fb30bbea97b14c0fc9623cdb94ef9bb41c75ae0ea6b27d5a6a72dd62250d17

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v4.1.3
+
+### Bugs:
+
+- Fixed an issue where role presence checking did not work correctly if `must_have_roles` configuration option was enabled
+
+### Misc:
+
+- Added caching for `Rabarber::HasRoles#all_roles` method to improve performance
+
 ## v4.1.2
 
 ### Misc:

data/lib/rabarber/core/cache.rb

@@ -5,22 +5,18 @@ require "digest/sha2"
 module Rabarber
   module Core
     module Cache
-      CACHE_PREFIX = "rabarber"
-      private_constant :CACHE_PREFIX
-
       module_function
 
-      def fetch(roleable_id, context:, &block)
+      def fetch(key, &)
         return yield unless enabled?
 
-        Rails.cache.fetch(key_for(roleable_id, context), expires_in: 1.hour, race_condition_ttl: 5.seconds, &block)
+        Rails.cache.fetch(prepare_key(key), expires_in: 1.hour, race_condition_ttl: 5.seconds, &)
       end
 
-      def delete(*roleable_ids, context:)
+      def delete(*keys)
         return unless enabled?
 
-        keys = roleable_ids.map { |roleable_id| key_for(roleable_id, context) }
-        Rails.cache.delete_multi(keys) if keys.any?
+        Rails.cache.delete_multi(keys.map { prepare_key(_1) }) if keys.any?
       end
 
       def enabled?
@@ -31,9 +27,12 @@ module Rabarber
         Rails.cache.delete_matched(/^#{CACHE_PREFIX}/o)
       end
 
-      def key_for(id, context)
-        "#{CACHE_PREFIX}:#{Digest::SHA2.hexdigest("#{id}#{context.fetch(:context_type)}#{context.fetch(:context_id)}")}"
+      def prepare_key(key)
+        "#{CACHE_PREFIX}:#{Digest::SHA2.hexdigest(Marshal.dump(key))}"
       end
+
+      CACHE_PREFIX = "rabarber"
+      private_constant :CACHE_PREFIX
     end
   end
 

data/lib/rabarber/core/null_roleable.rb

@@ -7,6 +7,10 @@ module Rabarber
         []
       end
 
+      def all_roles
+        {}
+      end
+
       def has_role?(*role_names, context: nil) # rubocop:disable Lint/UnusedMethodArgument
         false
       end

data/lib/rabarber/core/rule.rb

@@ -17,10 +17,9 @@ module Rabarber
       end
 
       def roles_permitted?(roleable, controller_instance)
-        resolved_context = resolve_context(controller_instance)
-        return false if Rabarber::Configuration.instance.must_have_roles && roleable.roles(context: resolved_context).empty?
+        return false if Rabarber::Configuration.instance.must_have_roles && roleable.all_roles.empty?
 
-        roles.empty? || roleable.has_role?(*roles, context: resolved_context)
+        roles.empty? || roleable.has_role?(*roles, context: resolve_context(controller_instance))
       end
 
       def dynamic_rules_followed?(controller_instance)

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

@@ -16,11 +16,11 @@ module Rabarber
 
     def roles(context: nil)
       processed_context = process_context(context)
-      Rabarber::Core::Cache.fetch(roleable_id, context: processed_context) { rabarber_roles.names(context: processed_context) }
+      Rabarber::Core::Cache.fetch([roleable_id, processed_context]) { rabarber_roles.names(context: processed_context) }
     end
 
     def all_roles
-      rabarber_roles.all_names
+      Rabarber::Core::Cache.fetch([roleable_id, :all]) { rabarber_roles.all_names }
     end
 
     def has_role?(*role_names, context: nil)
@@ -102,7 +102,7 @@ module Rabarber
     end
 
     def delete_roleable_cache(context:)
-      Rabarber::Core::Cache.delete(roleable_id, context:)
+      Rabarber::Core::Cache.delete([roleable_id, context], [roleable_id, :all])
     end
 
     def roleable_id

data/lib/rabarber/models/role.rb

@@ -67,7 +67,7 @@ module Rabarber
       private
 
       def delete_roleables_cache(role, context:)
-        Rabarber::Core::Cache.delete(*assigned_to_roleables(role), context:)
+        Rabarber::Core::Cache.delete(*assigned_to_roleables(role).flat_map { [[_1, context], [_1, :all]] })
       end
 
       def assigned_to_roleables(role)

data/lib/rabarber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabarber
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - enjaku4
 - trafium
 bindir: bin
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails