effective_roles 2.6.0 → 2.7.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 43ff04eb475329ae2001305352cb8131942fd2f598a5273868720aeede0ca553
4
- data.tar.gz: 100d76c0b230bd759fbc222714de32f443e42e5ef21dc00495bd7e4c1a4ad684
3
+ metadata.gz: ff6ad1f95215dd736ce5bd90f0754ea6504a1227acaec9941fd18a7734cedd29
4
+ data.tar.gz: 21ae8733e66d032ad5079bbf61877f968f2f6b036d1c69be1114500750a15cea
5
5
  SHA512:
6
- metadata.gz: 54b6b93166130c94368c9d39505d24181d66ec7b8c63dd5c0a2488672ef9fbab7e00658558c45e99d49d58cfdef6bc4c7f5918129af4a90cd5ce7666348025fd
7
- data.tar.gz: 90bb9ab5d3b7d86efbfafdeef445d8a94bae9352ad199173b6e3a96d551a4d77a3fffb13a7e858aa35c836583ea0d0852b462af226cc31e66af252137a8f1ee3
6
+ metadata.gz: ab959b54a62a9d139532fba9051e49dcbc0b614dcb6421ca856377544c2a36bf085438f8df56d1179a3b2b948d90cfdbb73fea29f806e341df474792178e1565
7
+ data.tar.gz: 675002338facfd196544a287588d2693ff617afddd506ea9b04122128edc34f2af3f087331d2fcff689f41a762c0522f1ce859bcb7915c053dad4b48c638faa6
@@ -73,7 +73,11 @@ module ActsAsRoleRestricted
73
73
  def with_role_sql(*roles)
74
74
  roles = roles.flatten.compact
75
75
  roles = roles.first.roles if roles.length == 1 && roles.first.respond_to?(:roles)
76
- roles = (roles.map { |role| role.to_sym } & EffectiveRoles.roles)
76
+ roles = roles.map { |role| role.to_sym }
77
+
78
+ if(invalid = (roles - EffectiveRoles.roles)).present?
79
+ raise("unknown role :#{invalid.to_sentence}")
80
+ end
77
81
 
78
82
  roles.map { |role| "(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' OR ')
79
83
  end
@@ -81,7 +85,11 @@ module ActsAsRoleRestricted
81
85
  def without_role(*roles)
82
86
  roles = roles.flatten.compact
83
87
  roles = roles.first.roles if roles.length == 1 && roles.first.respond_to?(:roles)
84
- roles = (roles.map { |role| role.to_sym } & EffectiveRoles.roles)
88
+ roles = roles.map { |role| role.to_sym }
89
+
90
+ if(invalid = (roles - EffectiveRoles.roles)).present?
91
+ raise("unknown role :#{invalid.to_sentence}")
92
+ end
85
93
 
86
94
  where(
87
95
  roles.map { |role| "NOT(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' AND ')
@@ -1,3 +1,3 @@
1
1
  module EffectiveRoles
2
- VERSION = '2.6.0'.freeze
2
+ VERSION = '2.7.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_roles
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.0
4
+ version: 2.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-04-12 00:00:00.000000000 Z
11
+ date: 2024-04-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails