can_play 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 118e6008d49cde4499d3473b9dff67015058ac8f
-  data.tar.gz: 63d21c9f2b80bea055281b7b7eaa2c7f13937d66
+  metadata.gz: 16441a20427ca9e3570f0e3a3cda976916eea535
+  data.tar.gz: 23b9fd796b805e68ab8022ba381920e6b76d1f02
 SHA512:
-  metadata.gz: a9a0ca283d060284017e0ef76c5b5c8eaea02e08fbc3da71595eb7768e4bd52b1d9c5261d4e5a24d60803c04f1652060f3bafe4e75bbbeb816807f605cf348a6
-  data.tar.gz: 044b3026d16fe494b15c90e0a04c1b7f005a9bbd924d45d6e5da41cd8f65049c1cb465a2532c6f50f8bb01995a8596a51661ad84a519bcb2a9dad7d6d7470f4a
+  metadata.gz: 1275d49864ffd120b58b98a39035f8573defc82ea5b0579e7e01e158c9260f5ba9bce86037838cc881356c75f7d49b2d2566e9a160242cb509dbb6cdd7ad3fec
+  data.tar.gz: 59e3db805478f280d33fd85606dd1cc3e3fe2de01094a3c4157ae5ea0bbdd4200e162235ac08672b9694821dd2e5c6187fae40541252c0b031a55448883ad78d

data/lib/can_play/ability.rb

@@ -3,30 +3,36 @@ class Ability
   attr_accessor :user
 
   def initialize(user)
-    self.user = user||CanPlay::Config.user_class_name.constantize.new
-    CanPlay::Config.super_roles.each do |role_name|
-      can(:manage, :all) if user.send(CanPlay::Config.role_judge_method, role_name)
-    end
-    CanPlay::Config.role_class_name.constantize.all.each do |role|
-      next unless user.send(CanPlay::Config.role_judge_method, role)
-      role.send(CanPlay::Config.role_resources_relation_name).each do |role_resource|
-        resource = CanPlay.find_by_name_and_code(role_resource.resource_name, CanPlay.override_code)
-        next unless resource
-        if resource[:type] == 'collection'
-          if resource[:behavior]
-            block = resource[:behavior]
-            can(resource[:verb], resource[:object]) if block.call(user)
-          else
-            can resource[:verb], resource[:object]
-          end
-        elsif resource[:type] == 'member'
-          if resource[:behavior]
-            block = resource[:behavior]
-            can resource[:verb], resource[:object] do |object|
-              block.call(user, object)
+    CanPlay::Config.tap do |i|
+      self.user = user||i.user_class_name.constantize.new
+      if i.super_roles.is_a?(Array)
+        i.super_roles.each do |role_name|
+          can(:manage, :all) if user.send(i.role_judge_method, role_name)
+        end
+      elsif i.super_roles.is_a?(Proc)
+        can(:manage, :all) if i.super_roles.call(user)
+      end
+      i.role_class_name.constantize.all.each do |role|
+        next unless user.send(i.role_judge_method, role)
+        role.send(i.role_resources_relation_name).each do |role_resource|
+          resource = CanPlay.find_by_name_and_code(role_resource.resource_name, CanPlay.override_code)
+          next unless resource
+          if resource[:type] == 'collection'
+            if resource[:behavior]
+              block = resource[:behavior]
+              can(resource[:verb], resource[:object]) if block.call(user)
+            else
+              can resource[:verb], resource[:object]
+            end
+          elsif resource[:type] == 'member'
+            if resource[:behavior]
+              block = resource[:behavior]
+              can resource[:verb], resource[:object] do |object|
+                block.call(user, object)
+              end
+            else
+              can resource[:verb], resource[:object]
             end
-          else
-            can resource[:verb], resource[:object]
           end
         end
       end

data/lib/can_play/version.rb

@@ -1,3 +1,3 @@
 module CanPlay
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/generators/templates/can_play.rb

@@ -14,6 +14,9 @@ CanPlay::Config.setup do |config|
   # super_roles表示无需分配权限既可拥有所有权限的角色。
   config.super_roles = ['超级管理员']
 
+  # 也可以传入代码块，若使代码块，则会传入形参user，指代当前用户，代码块返回的结果为true，则当前登录用户的当前角色则有无限权限。。
+  #config.super_roles = ->(role) { 1 == user.current_role.try(:id) }
+
   # 判断角色是否符合的方法。
   config.role_judge_method = 'role_is?'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_play
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - happyming9527