effective_roles 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff6ad1f95215dd736ce5bd90f0754ea6504a1227acaec9941fd18a7734cedd29
-  data.tar.gz: 21ae8733e66d032ad5079bbf61877f968f2f6b036d1c69be1114500750a15cea
+  metadata.gz: 592048e729650a2988a1b4cd6a88982f74798715385cac9d17f80fd5c975b197
+  data.tar.gz: f0dbc94accae4749fa9fea221cf7f0ffc7013463ddd3571e68c64789bed554b5
 SHA512:
-  metadata.gz: ab959b54a62a9d139532fba9051e49dcbc0b614dcb6421ca856377544c2a36bf085438f8df56d1179a3b2b948d90cfdbb73fea29f806e341df474792178e1565
-  data.tar.gz: 675002338facfd196544a287588d2693ff617afddd506ea9b04122128edc34f2af3f087331d2fcff689f41a762c0522f1ce859bcb7915c053dad4b48c638faa6
+  metadata.gz: 38b3e7b0aa680d4e47ea1d2411bb3a7c77a5c5155e6f6702b5ee14b14cc48b51bd0497e26c780a5f9fa4aec88cc0cab12da8bc5936cc5def8d44bde29a8f7693
+  data.tar.gz: 608cd0e64ecc94c77daba4c559f4b22fa6eb18b8515a33695f87da051dadd72f16b91c1bf6b76a05b457fe2cfb1c1e6e965e1f2d0c76077fc70f7297b75742b4

data/app/models/concerns/acts_as_role_restricted.rb

@@ -24,12 +24,14 @@ module ActsAsRoleRestricted
   included do
     attr_accessor(:current_user) unless respond_to?(:current_user)
 
+    attr_accessor :skip_effective_roles_validation
+
     acts_as_role_restricted_options = @acts_as_role_restricted_opts.dup
     self.send(:define_method, :acts_as_role_restricted_options) { acts_as_role_restricted_options }
 
     validates :roles_mask, numericality: true, allow_nil: true
 
-    validate(if: -> { changes.include?(:roles_mask) && EffectiveRoles.assignable_roles_present?(self) && current_user.present? }) do
+    validate(if: -> { changes.include?(:roles_mask) && EffectiveRoles.assignable_roles_present?(self) && current_user.present? }, unless: -> { skip_effective_roles_validation }) do
       roles_was = EffectiveRoles.roles_for(changes[:roles_mask].first)
       changed = (roles + roles_was) - (roles & roles_was)  # XOR
 

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.0'.freeze
 end

data/lib/effective_roles.rb

@@ -44,7 +44,7 @@ module EffectiveRoles
     (role_colors || {})[role]
   end
 
-  def self.roles_collection(resource, current_user = nil, only: nil, except: nil, multiple: nil, skip_disabled: nil)
+  def self.roles_collection(resource, current_user = nil, only: nil, except: nil, skip_disabled: nil)
     if assignable_roles.present?
       raise('expected object to respond to is_role_restricted?') unless resource.respond_to?(:is_role_restricted?)
       raise('expected current_user to respond to is_role_restricted?') if current_user && !current_user.respond_to?(:is_role_restricted?)
@@ -52,11 +52,12 @@ module EffectiveRoles
 
     only = Array(only).compact
     except = Array(except).compact
-    multiple = resource.acts_as_role_restricted_options[:multiple] if multiple.nil?
-    assignable = assignable_roles_collection(resource, current_user, multiple: multiple)
     skip_disabled = assignable_roles.kind_of?(Hash) if skip_disabled.nil?
 
-    roles.map do |role|
+    all_roles = assignable_roles_collection(resource)
+    assignable = assignable_roles_collection(resource, current_user)
+
+    all_roles.map do |role|
       next if only.present? && !only.include?(role)
       next if except.present? && except.include?(role)
 
@@ -71,7 +72,7 @@ module EffectiveRoles
     end.compact
   end
 
-  def self.assignable_roles_collection(resource, current_user = nil, multiple: nil)
+  def self.assignable_roles_collection(resource, current_user = nil)
     return roles unless assignable_roles_present?(resource)
 
     if current_user && !current_user.respond_to?(:is_role_restricted?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails