effective_roles 2.6.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ff04eb475329ae2001305352cb8131942fd2f598a5273868720aeede0ca553
-  data.tar.gz: 100d76c0b230bd759fbc222714de32f443e42e5ef21dc00495bd7e4c1a4ad684
+  metadata.gz: 8c1f1f6b5dd1700dcaa93ac9b8f57ffbdd20a131be00bded8702b5f07fa65f30
+  data.tar.gz: c1e9fca0b2f63631519bd7a2f3cae7c5ff8ca3bb51e867a163f4f8830f511190
 SHA512:
-  metadata.gz: 54b6b93166130c94368c9d39505d24181d66ec7b8c63dd5c0a2488672ef9fbab7e00658558c45e99d49d58cfdef6bc4c7f5918129af4a90cd5ce7666348025fd
-  data.tar.gz: 90bb9ab5d3b7d86efbfafdeef445d8a94bae9352ad199173b6e3a96d551a4d77a3fffb13a7e858aa35c836583ea0d0852b462af226cc31e66af252137a8f1ee3
+  metadata.gz: f00b6ad97bef4ec78ebc2b14b80e2ac0c3433e7bbda3cc40904339e0029af67e2bd90fd17f66e2ee71a2dc74f04432a9fddbad48074cd854affcd7b5e3d6db68
+  data.tar.gz: f3113726bb54b14fcf9c4a0224e82c504fb9854a138d79f3b5fd664aa0e4e2c7ec8e92e1483f3ac9834307f5e7d0a7cf87fc68bbdd9aea1dad052354ca4af069

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
 
@@ -73,7 +75,11 @@ module ActsAsRoleRestricted
     def with_role_sql(*roles)
       roles = roles.flatten.compact
       roles = roles.first.roles if roles.length == 1 && roles.first.respond_to?(:roles)
-      roles = (roles.map { |role| role.to_sym } & EffectiveRoles.roles)
+      roles = roles.map { |role| role.to_sym }
+
+      if(invalid = (roles - EffectiveRoles.roles)).present?
+        raise("unknown role :#{invalid.to_sentence}")
+      end
 
       roles.map { |role| "(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' OR ')
     end
@@ -81,7 +87,11 @@ module ActsAsRoleRestricted
     def without_role(*roles)
       roles = roles.flatten.compact
       roles = roles.first.roles if roles.length == 1 && roles.first.respond_to?(:roles)
-      roles = (roles.map { |role| role.to_sym } & EffectiveRoles.roles)
+      roles = roles.map { |role| role.to_sym }
+
+      if(invalid = (roles - EffectiveRoles.roles)).present?
+        raise("unknown role :#{invalid.to_sentence}")
+      end
 
       where(
         roles.map { |role| "NOT(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' AND ')

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.7.1'.freeze
 end

metadata

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