g5_authenticatable 1.1.2.rc.3 → 1.1.2.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f4066dfca50737fffb9834fffeee4dd9a87d830b5be7045ed1f3206b1c7c9f'
-  data.tar.gz: e7ef11855457d8a41bd78c5d21d87f10c4e7b6ee30f52ff05f9c43a1f6911dcc
+  metadata.gz: d5325487f08e32770f5497a9f4da647a8e647705deaf5fe1198ee6b3a7ad5c41
+  data.tar.gz: fba91fae9ef553b86b88b47dbc88b44c855f01af6d9c300a9ed0e06c4f98a489
 SHA512:
-  metadata.gz: 2a908e7e9ad13b38645f6acca90331a9b99d6f191c13cce01b34abd47650ec779107ec7bb9d80a770360c6e1a8486eaf074f5a6f60de8203cef2fb44c3d59975
-  data.tar.gz: ae50c95974c7cd7d186da96ea749168098efeb7d41877c1553c437e11c184846b91af07b63c55b802e0f45875c781870b5016d880ab5e3f11dedf901f0366a1a
+  metadata.gz: cc7f72bbf54984b3b29679caede77244f3881a680a12eb9eedebe5175f82a199802c3da4085b33093740f97f06b01dd674a8218fbfd4ac0844ca32c19f408efa
+  data.tar.gz: ab97898359cc1c93f809722d221ac7b716069fb4c58173c2f1cea3fe08ff823e9783b5754326b7b5264aa54fe8f32f592b90aa932e276543e854a5fdd7fbe6d9

data/app/policies/g5_authenticatable/base_policy.rb

@@ -71,26 +71,16 @@ module G5Authenticatable
       user.present? && user.has_role?(:super_admin)
     end
 
-    def check_for_role(role_name,global_scope=false)
-      if user.present?
-        query = user.roles.where(name: role_name)
-        query = query.where(resource_type: nil) if global_scope
-        return query.exists?
-      else
-        return false
-      end
-    end
-
-    def admin?(global_scope=false)
-      check_for_role(:admin,global_scope)
+    def admin?
+      user.present? && user.has_role?(:admin)
     end
 
-    def editor?(global_scope=false)
-      check_for_role(:editor,global_scope)
+    def editor?
+      user.present? && user.has_role?(:editor)
     end
 
-    def viewer?(global_scope=false)
-      check_for_role(:viewer,global_scope)
+    def viewer?
+      user.present? && user.has_role?(:viewer)
     end
 
     def has_global_role?
@@ -102,7 +92,7 @@ module G5Authenticatable
     end
 
     def global_role?
-      super_admin? || admin?(true) || editor?(true) || viewer?(true)
+      user.roles.global.exists?
     end
   end
 end

data/lib/g5_authenticatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module G5Authenticatable
-  VERSION = '1.1.2.rc.3'
+  VERSION = '1.1.2.rc.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.1.2.rc.3
+  version: 1.1.2.rc.4
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable