can_play 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16441a20427ca9e3570f0e3a3cda976916eea535
-  data.tar.gz: 23b9fd796b805e68ab8022ba381920e6b76d1f02
+  metadata.gz: 8d07491ab6a42d581eb9e9b3d809b4c2b31f5a4b
+  data.tar.gz: ce076576115c4fc9166e06a88145643fce7dc304
 SHA512:
-  metadata.gz: 1275d49864ffd120b58b98a39035f8573defc82ea5b0579e7e01e158c9260f5ba9bce86037838cc881356c75f7d49b2d2566e9a160242cb509dbb6cdd7ad3fec
-  data.tar.gz: 59e3db805478f280d33fd85606dd1cc3e3fe2de01094a3c4157ae5ea0bbdd4200e162235ac08672b9694821dd2e5c6187fae40541252c0b031a55448883ad78d
+  metadata.gz: e88dcc97bdd34c34bc2d81bb562ca376b191ebbfcbca4a9e1aa1ba6ca40472687c64162f5963ca6ee44655df28b22847def6982cb644d425be72f23036bcb459
+  data.tar.gz: 379a49b8d9f22be107c4b84eeaf0451061c34d9b1a9cfcdb5df306f0659e2fb53582a071dbbed1b016682a5647427a519a953962603222464fddb4959943f5bc

data/Gemfile

@@ -1,6 +1,2 @@
-source 'https://rubygems.org'
-  gem "cancancan"
-  gem "consul"
-  gem "rolify"
 # Specify your gem's dependencies in can_play.gemspec
 gemspec

data/lib/can_play.rb

@@ -2,231 +2,82 @@ require 'ror_hack'
 require 'consul'
 require 'cancancan'
 require 'modularity'
+require 'can_play/config'
+require 'can_play/class_method'
+
 
 module CanPlay
-  mattr_accessor :resources, :override_resources, :override_code
-  self.override_code      = nil
+
+  singleton_attr_accessor :resources, :override_resources,
+                          :override_code, :groups
+
   self.resources          = []
   self.override_resources = {}.with_indifferent_access
+  self.override_code      = nil
+  self.groups        = []
 
-  class << self
-    def included(base)
-      base.class_eval <<-RUBY
-        singleton_attr_accessor(:groups, :current_group, :module_name)
-        self.groups        = []
-        self.current_group = nil
-        self.module_name = ''
-      RUBY
-      base.extend ClassMethods
-    end
+  module_function
 
-    def find_by_name_and_code(name, code)
-      resource = CanPlay.override_resources[code].p2a.find { |r| r.name.to_s == name.to_s }
-      resource || CanPlay.resources.find { |r| r.name.to_s == name.to_s }
-    end
+  def included(base)
+    base.extend ClassMethods
+  end
 
-    def conjunct_resources(&block)
-      resources = CanPlay.override_resources[CanPlay.override_code].p2a + CanPlay.resources
-      resources = resources.uniq { |i| i.name }
-      resources = resources.select(&block) if block
-      resources
-    end
+  def find_by_name_and_code(name, code)
+    resource = CanPlay.override_resources[code].p2a.find { |r| r.name.to_s == name.to_s }
+    resource || CanPlay.resources.find { |r| r.name.to_s == name.to_s }
+  end
 
-    def grouped_resources(&block)
-      conjunct_resources(&block).multi_group_by(:module_name, :group)
-    end
+  def conjunct_resources(&block)
+    resources = CanPlay.override_resources[CanPlay.override_code].p2a + CanPlay.resources
+    resources = resources.uniq { |i| i.name }
+    resources = resources.select(&block) if block
+    resources
+  end
 
-    def splat_grouped_resources(&block)
-      conjunct_resources(&block).multi_group_by(:group)
-    end
+  def grouped_resources(&block)
+    conjunct_resources(&block).multi_group_by(:my_module_name, :group)
+  end
 
-    def grouped_resources_with_chinese_desc(&block)
-      grouped_resources(&block).tap do |e|
-        e.each do |i, v|
-          v.each do |group, resources|
-            group.chinese_desc = begin
-              name = I18n.t("can_play.class_name.#{group.name.to_s.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.to_s.singularize}.#{resource.verb}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource.verb}")
-            end
-          end
-          v.rehash
-        end
-      end
-    end
+  def splat_grouped_resources(&block)
+    conjunct_resources(&block).group_by(:group)
+  end
 
-    def splat_grouped_resources_with_chinese_desc(&block)
-      splat_grouped_resources(&block).tap do |i|
-        i.each do |group, resources|
-          group[:chinese_desc] = begin
-            name = I18n.t("can_play.class_name.#{group.name.singularize}", default: '')
+  def grouped_resources_with_chinese_desc(&block)
+    grouped_resources(&block).tap do |e|
+      e.each do |i, v|
+        v.each do |group, resources|
+          group.chinese_desc = begin
+            name = I18n.t("can_play.class_name.#{group.name.to_s.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]}")
+            resource.chinese_desc = I18n.t("can_play.authority_name.#{group.name.to_s.singularize}.#{resource.verb}", default: '').presence || I18n.t("can_play.authority_name.common.#{resource.verb}")
           end
         end
-        i.rehash
+        v.rehash
       end
     end
   end
 
-  module Config
-    mattr_accessor :user_class_name, :role_class_name, :role_resources_relation_name, :super_roles, :role_judge_method
-    self.user_class_name              = 'User'
-    self.role_class_name              = 'Role'
-    self.role_resources_relation_name = 'role_resources'
-    self.super_roles                  = []
-    self.role_judge_method            = 'role_is?'
-
-    def self.setup
-      yield self
-    end
-  end
-
-  module ClassMethods
-
-    class NameImportantOpenStruct < OpenStruct
-      def eql?(another)
-        self.name == another.name
-      end
-    end
-
-    # 为每个 resource 添加一个 group, 方便管理
-    def group(*args, &block)
-      opts = args.extract_options!.with_indifferent_access
-      clazz = args.first
-      if clazz.is_a?(Module)
-        name  = clazz.try(:table_name).presence || clazz.to_s.underscore.gsub('/', '_').pluralize
-        group = NameImportantOpenStruct.new(name: name, klass: clazz)
-      elsif clazz.blank? &&  opts.key?(:name) &&  opts.key?(:klass)
-        opts  = opts.with_indifferent_access
-        group = NameImportantOpenStruct.new(name: opts.delete(:name).to_s, klass: opts.delete(:klass))
-      else
-        raise "group klass need set"
-      end
-      group.opts = OpenStruct.new opts
-      self.groups << group
-      self.groups        = groups.uniq(&:name)
-      self.current_group = group
-      block.call(group.klass)
-      self.current_group = nil
-    end
-
-    def limit(name=nil, &block)
-      if current_group.present?
-        CanPlay::Power.power(name||current_group.name, &block)
-      else
-        if name.present?
-          CanPlay::Power.power(name, &block)
-        else
-          raise 'limit name need set'
-        end
-      end
-    end
-
-    def collection(verb_or_verbs, opts={}, &block)
-      raise "Need define group first" if current_group.nil?
-      opts = OpenStruct.new opts
-      group    = current_group
-      behavior = nil
-      if block
-        behavior = lambda do |user|
-          # 在block定义的binding里，注入user这个变量。
-          old_binding = block.binding
-          old_binding.eval("user=nil;lambda {|v| user = v}").call(user)
-          block.call_with_binding(old_binding)
-        end
-      end
-
-      if verb_or_verbs.kind_of?(Array)
-        verb_or_verbs.each do |verb|
-          add_resource(group, verb, group.klass, 'collection', behavior, opts)
-        end
-      else
-        add_resource(group, verb_or_verbs, group.klass, 'collection', behavior, opts)
-      end
-    end
-
-    def member(verb_or_verbs, opts={}, &block)
-      raise "Need define group first" if current_group.nil?
-      opts = OpenStruct.new opts
-      group    = current_group
-      behavior = nil
-      if block
-        behavior = lambda do |user, obj|
-          # 在block定义的binding里，注入user这个变量。
-          old_binding = block.binding
-          old_binding.eval("user=nil;lambda {|v| user = v}").call(user)
-          block.call_with_binding(old_binding, obj)
+  def splat_grouped_resources_with_chinese_desc(&block)
+    splat_grouped_resources(&block).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
-      end
-
-      if verb_or_verbs.kind_of?(Array)
-        verb_or_verbs.each do |verb|
-          add_resource(group, verb, group.klass, 'member', behavior, opts)
+        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
-      else
-        add_resource(group, verb_or_verbs, group.klass, 'member', behavior, opts)
-      end
-    end
-
-    def add_resource(group, verb, object, type, behavior, opts)
-      name     = "#{verb}_#{group.name}"
-      resource = OpenStruct.new(
-        module_name: module_name,
-        name:        name,
-        group:       group,
-        verb:        verb,
-        object:      object,
-        type:        type,
-        behavior:    behavior,
-        opts:        opts
-      )
-      CanPlay.resources.keep_if { |i| i.name != name }
-      CanPlay.resources << resource
-    end
-  end
-
-  module Override
-    as_trait do |code|
-      extend ClassMethods
-      singleton_attr_accessor(:groups, :current_group, :module_name)
-      self.groups        = []
-      self.current_group = nil
-      self.module_name   = ''
-
-      define_singleton_method(:limit) do |name=nil, &block|
-        raise "Need define group first" if current_group.nil?
-        method_name = name ? "#{name}_evaluate_in_#{code}_scope" : "#{current_group.name}_evaluate_in_#{code}_scope"
-        Power.power(method_name, &block)
-      end
-
-      define_singleton_method(:add_resource) do |group, verb, object, type, behavior, opts|
-        super(group, verb, object, type, behavior, opts) and return if code.blank?
-        CanPlay.override_resources[code] ||= []
-        name                             = "#{verb}_#{group.name}"
-        resource                         = OpenStruct.new(
-          module_name: module_name,
-          name:        name,
-          group:       group,
-          verb:        verb,
-          object:      object,
-          type:        type,
-          behavior:    behavior,
-          opts:        opts
-        )
-        CanPlay.override_resources[code].keep_if { |i| i.name != name }
-        CanPlay.override_resources[code] << resource
       end
+      i.rehash
     end
   end
 end
 
-require "can_play/power"
-require "can_play/controller"
-require "can_play/ability"
+require 'can_play/resource'
+require 'can_play/power'
+require 'can_play/controller'
+require 'can_play/ability'

data/lib/can_play/ability.rb

@@ -1,10 +1,10 @@
 class Ability
   include CanCan::Ability
-  attr_accessor :user
 
   def initialize(user)
+    clear_aliased_actions
     CanPlay::Config.tap do |i|
-      self.user = user||i.user_class_name.constantize.new
+      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)
@@ -20,7 +20,7 @@ class Ability
           if resource[:type] == 'collection'
             if resource[:behavior]
               block = resource[:behavior]
-              can(resource[:verb], resource[:object]) if block.call(user)
+              can(resource[:verb], resource[:object]) if block.call
             else
               can resource[:verb], resource[:object]
             end
@@ -28,7 +28,7 @@ class Ability
             if resource[:behavior]
               block = resource[:behavior]
               can resource[:verb], resource[:object] do |object|
-                block.call(user, object)
+                block.call(object)
               end
             else
               can resource[:verb], resource[:object]

data/lib/can_play/class_method.rb

@@ -0,0 +1,107 @@
+module CanPlay
+
+  class ResourcePermission < OpenStruct
+  end
+
+  class NameImportantGroup < OpenStruct
+    def eql?(another)
+      self.name == another.name
+    end
+  end
+
+  module ClassMethods
+
+    def group(*args, &block)
+      opts = args.extract_options!.with_indifferent_access
+      clazz = args.first
+      if clazz.is_a?(Module)
+        name  = clazz.try(:table_name).presence || clazz.to_s.underscore.gsub('/', '_').pluralize
+        group = NameImportantGroup.new(name: name, klass: clazz, defined_class_wrapper: self)
+      elsif clazz.blank? &&  opts.key?(:name) &&  opts.key?(:klass)
+        opts  = opts.with_indifferent_access
+        group = NameImportantGroup.new(name: opts.delete(:name).to_s, klass: opts.delete(:klass), defined_class_wrapper: self)
+      else
+        raise "group klass need set"
+      end
+      group.opts = OpenStruct.new opts
+      CanPlay.groups << group
+      CanPlay.groups = CanPlay.groups.uniq(&:name)
+      self.temp_current_group = self.current_group
+      self.current_group = group
+      if block
+        block.call(group.klass)
+        self.current_group = self.temp_current_group
+        self.temp_current_group = nil
+      end
+    end
+
+    def limit(name=nil, &block)
+      clazz = self
+      wrap_block = Proc.new do |*args|
+        clazz::OnlyInstance.only.instance_exec(*args, &block)
+      end
+
+      CanPlay::Power.power(name||current_group.name, &wrap_block)
+    end
+
+    def collection(verb_or_verbs, opts={}, &block)
+
+      raise "Need define group first" if current_group.nil?
+      opts = OpenStruct.new opts
+      group    = current_group
+      behavior = nil
+      clazz = self
+      if block
+        behavior = Proc.new do
+          result = clazz::OnlyInstance.only.instance_eval(&block)
+          result
+        end
+      end
+
+      if verb_or_verbs.kind_of?(Array)
+        verb_or_verbs.each do |verb|
+          add_resource(group, verb, group.klass, 'collection', behavior, opts)
+        end
+      else
+        add_resource(group, verb_or_verbs, group.klass, 'collection', behavior, opts)
+      end
+    end
+
+    def member(verb_or_verbs, opts={}, &block)
+      raise "Need define group first" if current_group.nil?
+      opts = OpenStruct.new opts
+      group    = current_group
+      behavior = nil
+      clazz = self
+      if block
+        behavior = Proc.new do |obj|
+          clazz::OnlyInstance.only.instance_exec(obj, &block)
+        end
+      end
+
+      if verb_or_verbs.kind_of?(Array)
+        verb_or_verbs.each do |verb|
+          add_resource(group, verb, group.klass, 'member', behavior, opts)
+        end
+      else
+        add_resource(group, verb_or_verbs, group.klass, 'member', behavior, opts)
+      end
+    end
+
+    def add_resource(group, verb, object, type, behavior, opts)
+      name     = "#{verb}_#{group.name}"
+      resource = ResourcePermission.new(
+        my_module_name: my_module_name,
+        name:        name,
+        group:       group,
+        verb:        verb,
+        object:      object,
+        type:        type,
+        behavior:    behavior,
+        opts:        opts
+      )
+      CanPlay.resources.keep_if { |i| i.name != name }
+      CanPlay.resources << resource
+    end
+  end
+end

data/lib/can_play/config.rb

@@ -0,0 +1,14 @@
+module CanPlay
+  module Config
+    mattr_accessor :user_class_name, :role_class_name, :role_resources_relation_name, :super_roles, :role_judge_method
+    self.user_class_name              = 'User'
+    self.role_class_name              = 'Role'
+    self.role_resources_relation_name = 'role_resources'
+    self.super_roles                  = []
+    self.role_judge_method            = 'role_is?'
+
+    def self.setup
+      yield self
+    end
+  end
+end

data/lib/can_play/controller.rb

@@ -1,9 +1,21 @@
 class ActionController::Base
   include Consul::Controller
   current_power do
-    CanPlay::Power.new(current_user)
+    CanPlay::Power.new
   end
   helper_method :play_resources
+
+  after_action do
+    CanPlay::Resource::OnlyInstance.only = nil
+  end
+
+  def set_can_play(user, override_code = nil)
+    CanPlay.override_code = override_code
+    can_play_instance = CanPlay::AbstractResource::OnlyInstance.new(user: user)
+    current_ability.instance_variable_set(:@can_play_instance, can_play_instance)
+    current_power.instance_variable_set(:@can_play_instance, can_play_instance)
+  end
+
   # 对current_power采用动态方法调用的装饰者。
   class PlayResourceObject < BasicObject
     def initialize(obj, klass)

data/lib/can_play/power.rb

@@ -1,11 +1,5 @@
 module CanPlay
   class Power
     include Consul::Power
-    attr_accessor :user
-
-    def initialize(user)
-      self.user = user
-    end
-
   end
 end

data/lib/can_play/resource.rb

@@ -0,0 +1,164 @@
+module CanPlay
+  class AbstractResource
+
+    include RorHack::ClassLevelInheritableAttributes
+    extend CanPlay::ClassMethods
+    inheritable_attributes :my_module_name
+    self.my_module_name = 'other'
+
+    def self.set_module_name(str)
+      self.my_module_name = str
+    end
+
+    def self.set_method(name, &block)
+      self::OnlyInstance.after_initialize_block_array << Proc.new do
+        define_singleton_method name, &block
+      end
+    end
+
+    def self.inherited(base)
+      super
+      base.class_eval do
+        # 定义动态类。
+        base.const_set "OnlyInstance", Class.new(self::OnlyInstance)
+      end
+    end
+
+    class OnlyInstance
+
+      singleton_attr_accessor :after_initialize_block_array, :only_you, :instance
+
+      def initialize(opts)
+        @user               = opts[:user] if opts[:user]
+        @instance           = opts[:instance] if opts[:instance]
+        self.class.only_you = self
+      end
+
+      def self.new(opts = {}.with_indifferent_access)
+        o = allocate
+        o.instance_eval { initialize(opts) }
+        after_initialize_block_array.each do |block|
+          o.instance_exec(opts[:user], &block)
+        end
+        o
+      end
+
+      def self.only
+        if only_you.blank?
+          if self == CanPlay::AbstractResource::OnlyInstance
+            raise 'CanPlay::Resource::OnlyInstance not set first instance'
+          else
+            self.only_you = new(instance: superclass.only)
+          end
+        else
+          only_you
+        end
+      end
+
+      def self.only=(obj)
+        self.only_you = obj
+      end
+
+      def self.after_initialize_block_array
+        @after_initialize_block_array ||= []
+      end
+
+      def klass
+        @klass ||= begin
+          clazz_string = self.class.parent.name
+          raise 'class name error' unless clazz_string.end_with?('Resource') || clazz_string.end_with?('ResourceOverride')
+          clazz_name = self.class.parent.name.gsub(/Resource$/, '').gsub(/ResourceOverride$/, '')
+          klass = clazz_name.constantize rescue nil
+          klass
+        end
+      end
+
+      def method_missing(method, *args, &block)
+        if @instance
+          return @instance.send(method, *args, &block)
+        end
+        super(method, *args, &block)
+      end
+
+      self.after_initialize_block_array << Proc.new do |user|
+
+        define_singleton_method :user do
+          user
+        end
+
+      end
+
+      alias_method :set_method, :define_singleton_method
+    end
+
+  end
+
+  class Resource < AbstractResource
+
+    def self.inherited(base)
+      super
+      base.class_eval do
+        raise 'class name set error' unless base.name.end_with?('Resource')
+        clazz_name = base.name.gsub(/Resource$/, '')
+        clazz = clazz_name.constantize rescue nil
+        singleton_attr_accessor :current_group, :temp_current_group
+        if clazz && clazz.is_a?(Module)
+          base.group clazz
+        end
+      end
+    end
+  end
+
+  class ResourceOverride < AbstractResource
+    inheritable_attributes :uniq_override_code
+
+    def self.set_override_code(str)
+      self.uniq_override_code = str
+    end
+
+    set_override_code('')
+
+    def self.inherited(base)
+      super
+      base.class_eval do
+        raise 'class name set error' unless base.name.end_with?('ResourceOverride')
+        clazz_name = base.name.gsub(/ResourceOverride$/, '')
+        clazz = clazz_name.constantize rescue nil
+        singleton_attr_accessor :current_group, :temp_current_group
+        if clazz && clazz.is_a?(Module)
+          base.group clazz
+        end
+      end
+    end
+
+    def self.add_resource(group, verb, object, type, behavior, opts)
+      code = self.uniq_override_code
+      super(group, verb, object, type, behavior, opts) and return if code.blank?
+      name     = "#{verb}_#{group.name}"
+      resource = ResourcePermission.new(
+        my_module_name: my_module_name,
+        name:        name,
+        group:       group,
+        verb:        verb,
+        object:      object,
+        type:        type,
+        behavior:    behavior,
+        opts:        opts
+      )
+      CanPlay.override_resources[code] ||= []
+      CanPlay.override_resources[code].keep_if { |i| i.name != name }
+      CanPlay.override_resources[code] << resource
+    end
+
+    def self.limit(name=nil, &block)
+      clazz = self
+      wrap_block = Proc.new do |*args|
+        clazz::OnlyInstance.only.instance_exec(*args, &block)
+      end
+      method_name = name ? "#{name}_evaluate_in_#{code}_scope" : "#{current_group.name}_evaluate_in_#{self.uniq_override_code}_scope"
+
+      CanPlay::Power.power(method_name, &wrap_block)
+    end
+
+  end
+end

data/lib/can_play/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_play
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - happyming9527
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,8 +112,11 @@ files:
 - config/locales/zh-CN.yml
 - lib/can_play.rb
 - lib/can_play/ability.rb
+- lib/can_play/class_method.rb
+- lib/can_play/config.rb
 - lib/can_play/controller.rb
 - lib/can_play/power.rb
+- lib/can_play/resource.rb
 - lib/can_play/version.rb
 - lib/generators/can_play/install_generator.rb
 - lib/generators/templates/can_play.rb