can_play 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fbbcdcfbceff8da3ea0f8d1a8484d73bc814894
-  data.tar.gz: 04b2983c9fc11afab1c095f471999c42bf2b07df
+  metadata.gz: 8db571961dec8a0961cbf0dd67df32594d359bea
+  data.tar.gz: ac36569098a265b085976a90ba0cc6e94bd87807
 SHA512:
-  metadata.gz: d1b74feb74f1f6241033a43b4389b3cfcf77dcb83b25b2b4a68677ecc684a7be4de3d9ad7a5ed27c2857e7e85f753f54f977e8ca92386e81ca171fc50a7ff19e
-  data.tar.gz: 3d84f0d8b560f66e7272017bed18157dfba01d8d212d1f14c54f6ac4a3f927c84a882b2657f1c93055c2f65b307dc6ff054bcf236e78e57304447054fdbb72bf
+  metadata.gz: 0b16d85c6c569228fe69503ee4136b9ccc4b3cb16825080465290289086a2ce8b21e5079b2fa5a21652dc5f3b93737e219e0d27af9da698e5d52e6545ec92984
+  data.tar.gz: e0ffd71bda7a7caa0644ce655cd079692af1f5d2b6325359e7bb945123d0e3c50ab4a17e1d212e7e4b3db5a8e2be926a2331daecd3cec495428908785d94a3a1

data/lib/can_play/ability.rb

@@ -7,7 +7,7 @@ class Ability
     CanPlay::Config.role_class_name.constantize.all.each do |role|
       next unless user.role?(role.name)
       role.send(CanPlay::Config.role_resources_middle_class_name.underscore.pluralize).each do |role_resource|
-        resource = CanPlay::Config.resource_class_name.constantize.find_by_name(role_resource.resource_name)
+        resource = CanPlay.find_by_name(role_resource.resource_name)
         next unless resource
         if resource[:type] == 'collection'
           if resource[:behavior]

data/lib/can_play/version.rb

@@ -1,3 +1,3 @@
 module CanPlay
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/can_play.rb

@@ -7,27 +7,60 @@ require "can_play/ability"
 require "can_play/controller"
 
 module CanPlay
+  mattr_accessor :resources
+  @@resources = []
+
+  class << self
+    def included(base)
+      base.class_eval do
+        @groups        = []
+        @current_group = nil
+      end
+      base.extend ClassMethods
+    end
 
-  extend ActiveSupport::Concern
+    def find_by_name(name)
+      CanPlay.resources.find { |r| r[:name] == name }
+    end
+
+    def grouped_resources
+      @grouped_resources ||= CanPlay.resources.group_by { |i| i[:group] }
+    end
 
-  included do
-    @groups        = []
-    @current_group = nil
-    @resources     = []
+    def my_resources
+      CanPlay.resources
+    end
+
+    def grouped_resources_with_chinese_desc
+      grouped_resources.tap do |i|
+        i.each do |group, resources|
+          group[:chinese_desc] = begin
+            name = I18n.t("can_play.class_name.#{group[:name].singularize}", default: '')
+            name = group[:klass].model_name.human if name.blank?
+            name
+          end
+          resources.each do |resource|
+            resource[:chinese_desc] = I18n.t("can_play.authority_name.#{group[:name].singularize}.#{resource[:verb]}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource[:verb]}")
+          end
+        end
+        i.rehash
+      end
+    end
   end
 
   module Config
-    mattr_accessor :user_class_name, :role_class_name, :role_resources_middle_class_name, :resource_class_name
+    mattr_accessor :user_class_name, :role_class_name, :role_resources_middle_class_name
     @@user_class_name = 'User'
     @@role_class_name = 'Role'
     @@role_resources_middle_class_name = 'RoleResource'
-    @@resource_class_name = 'Resource'
 
     def self.setup
       yield self
     end
   end
 
+
+
   module ClassMethods
 
     # 为每个 resource 添加一个 group, 方便管理
@@ -110,36 +143,8 @@ module CanPlay
         type:     type,
         behavior: behavior
       }.with_indifferent_access
-      @resources.keep_if { |i| i[:name] != name }
-      @resources << resource
-    end
-
-    def find_by_name(name)
-      @resources.find { |r| r[:name] == name }
-    end
-
-    def grouped_resources
-      @grouped_resources ||= @resources.group_by { |i| i[:group] }
-    end
-
-    def my_resources
-      @resources
-    end
-
-    def grouped_resources_with_chinese_desc
-      grouped_resources.tap do |i|
-        i.each do |group, resources|
-          group[:chinese_desc] = begin
-            name = I18n.t("can_play.class_name.#{group[:name].singularize}", default: '')
-            name = group[:klass].model_name.human if name.blank?
-            name
-          end
-          resources.each do |resource|
-            resource[:chinese_desc] = I18n.t("can_play.authority_name.#{group[:name].singularize}.#{resource[:verb]}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource[:verb]}")
-          end
-        end
-        i.rehash
-      end
+      CanPlay.resources.keep_if { |i| i[:name] != name }
+      CanPlay.resources << resource
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_play
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - happyming9527
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: a permission system.