sevencan 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606360b04132f4de7de36627b65179277b25f4ab
-  data.tar.gz: 08ba8054f132143faec82f2b4cabb5a0bb88e562
+  metadata.gz: 4de7ff55cfab6b3d85dbfd0709662ba247aed6f4
+  data.tar.gz: e284beb2abed20a28ad40b07552d388c68a51039
 SHA512:
-  metadata.gz: e3249251be80676b09a6f47bcdc9da176b0f8537fb7374306221b831cabb1b0d3cf554a6ad73e448d2f9e9109268d89a7da8fadb499ad4be914408b9c309e4eb
-  data.tar.gz: 79f8a63eed2372dc95e5c82366e611b1533af8b26f458eee5716461009d0b37701f3363da388a28e9d5f888e3fa373f294a56329273c1f2f15382c881a61c131
+  metadata.gz: 47da39039c9052d7eca7ff6fa8b7bb4fbb7f8d53f3a30abc4c58bb074bc28761cbe8ae278529ac17e86ac00021f18f6c1e2cfa802ac34d76dd7cf22a072b3ec2
+  data.tar.gz: 23234e5476b2d13877d4cf8b1da1922b276e4897e6947ea1934abbd3f10ade1c09411428cb9de0d305d1ecc1ebd572e374eff970659fa14f2b94cea6dd176ecd

data/README.md

@@ -51,18 +51,22 @@ class MyTopicAbilities
   end
 
   # if [:admin, :editor].include?(current_user.role)
-  abilities :role, [:admin, :editor] do
+  abilities check: :role, in: [:admin, :editor] do
     can_manager_topic
   end
 
-  abilities :role, [:reviewer] do
+  # current_user.role eqlual :reviewer
+  abilities check: :role, equal: :reviewer do
     can :review_topic
   end
 
-  abilities Proc.new { current_user.permissions.include?(:topic_manager) } do
+  abilities pass: Proc.new { current_user.permissions.include?(:topic_manager) } do
     can_manager_topic
   end
 
+  abilities pass: :editor_filter do
+  end
+
 
   def can_manager_topic
     can :edit_topic, :destroy_topic
@@ -71,6 +75,10 @@ class MyTopicAbilities
   def cannot_manager_topic
     cannot :edit_topic, :destroy_topic
   end
+
+  def editor_filter
+    current_user.permissions.include?(:topic_editor)
+  end
 end
 
 manager.define_rules(Topic, MyTopicAbilities)
@@ -300,7 +308,7 @@ end
 ```
 
 
-Manual check, cannot call `ability_check_callback`
+Manual check, not call `ability_check_callback`
 
 ```
 class TopicController < ApplicationController

data/lib/seven/abilities.rb

@@ -50,29 +50,38 @@ module Seven
       attr_reader :rule_procs
 
       # Params:
-      #   field: current_user method
-      #   scope: run rule proc if Array(scope).include?(current_user#{field})
-      #
-      #   or
-      #
-      #   proc
-      def abilities(field = nil, scope = nil, &rule_proc)
-        checker = case field
-        when Proc
-          field
-        when Symbol, String
-          raise Seven::ArgsError, 'Scope cannot be nil' if scope.nil?
-          tmp_scope = scope.is_a?(Array) ? scope : [scope]
-          Proc.new { tmp_scope.include?(current_user.public_send(field)) }
-        when nil
-          nil
+      #   options:
+      #     {check: :role, equal: 'admin'}  current_user.role == 'admin'
+      #     {check: :role, in: %w{admin editor}}  %w{admin editor}.include?(current_user.role)
+      #     {pass: :my_filter} call my_filter method
+      #     {pass: Proc.new { ... }} proc.call
+      def abilities(options = nil, &rule_proc)
+        filter = build_seven_abilities_filter(options)
+        @rule_procs ||= []
+        @rule_procs << [filter, rule_proc]
+      end
+
+      def build_seven_abilities_filter(options)
+        return if options.nil?
+        opts = options.symbolize_keys
+
+        if val = opts[:pass]
+          if val.is_a?(Proc)
+            val
+          else
+            Proc.new { send val }
+          end
+        elsif attr = opts[:check]
+          if list = opts[:in]
+            Proc.new { list.include?(current_user.public_send(attr)) }
+          elsif val = opts[:equal]
+            Proc.new { current_user.public_send(attr) == val }
+          else
+            raise Seven::ArgsError, 'Invalid check definition'
+          end
         else
-          raise Seven::ArgsError, "Invalid field '#{field}'" if scope.nil?
+          raise Seven::ArgsError, 'Invalid check definition'
         end
-
-
-        @rule_procs ||= []
-        @rule_procs << [checker, rule_proc]
       end
     end
   end

data/lib/seven/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencan
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - jiangzhi.xie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler