rolify 3.5.0 → 3.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +5 -0
- data/circle.yml +3 -1
- data/lib/rolify/role.rb +6 -3
- data/lib/rolify/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 471b087194de0b75fe7d666e1c60719121906402
|
4
|
+
data.tar.gz: e469f36315049f5407fe7a708af99831f721ebe2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 68c51c49f97c2b5f80ac4d0388cb3de18604d7a6f9ccc3ae6bf5b8fc568268416760d83eb9e438bba3f49e6547e158eb175fcaa76bb35ef2fc25b069cb45a0ba
|
7
|
+
data.tar.gz: e4a03eadae6ad21ecb3ec891436773d63db5492c21a52da3673c9da2f6ddc46338f1ac89e57796eb372e073c78feeb37fddd52fae2355c7a3c3a2abd609b2927
|
data/.travis.yml
CHANGED
data/circle.yml
CHANGED
data/lib/rolify/role.rb
CHANGED
@@ -23,10 +23,13 @@ module Rolify
|
|
23
23
|
|
24
24
|
def has_role?(role_name, resource = nil)
|
25
25
|
if new_record?
|
26
|
-
self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
|
26
|
+
role_array = self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
|
27
27
|
else
|
28
|
-
self.class.adapter.where(self.roles, name: role_name, resource: resource)
|
29
|
-
end
|
28
|
+
role_array = self.class.adapter.where(self.roles, name: role_name, resource: resource)
|
29
|
+
end
|
30
|
+
|
31
|
+
return false if role_array.nil?
|
32
|
+
role_array != []
|
30
33
|
end
|
31
34
|
|
32
35
|
def has_all_roles?(*args)
|
data/lib/rolify/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rolify
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.5.
|
4
|
+
version: 3.5.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Florent Monbillard
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-01-
|
11
|
+
date: 2015-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: ammeter
|