sevencan 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab00c00fec7af86d2509a2b230efaa721bd7692
-  data.tar.gz: 3f7dd30e8767d0e07507faf4da416e027a3a9b7a
+  metadata.gz: 606360b04132f4de7de36627b65179277b25f4ab
+  data.tar.gz: 08ba8054f132143faec82f2b4cabb5a0bb88e562
 SHA512:
-  metadata.gz: 5f76d9618fc8520c5e1e434e305e5688c434a473111275ae7d88c1cc595c1d19659f6198446bf6e01ee33b9a346ea03b13895485ef8e84f5e0d90440912e3d90
-  data.tar.gz: 56fa080533c6d972e6f0a08eb13e3b62d97c71acfd3fac1e64863d737634b85316021175e134bc2f9208fd7e26284532d86352504c5188fd8f4add43bdc2209d
+  metadata.gz: e3249251be80676b09a6f47bcdc9da176b0f8537fb7374306221b831cabb1b0d3cf554a6ad73e448d2f9e9109268d89a7da8fadb499ad4be914408b9c309e4eb
+  data.tar.gz: 79f8a63eed2372dc95e5c82366e611b1533af8b26f458eee5716461009d0b37701f3363da388a28e9d5f888e3fa373f294a56329273c1f2f15382c881a61c131

data/README.md

@@ -59,6 +59,10 @@ class MyTopicAbilities
     can :review_topic
   end
 
+  abilities Proc.new { current_user.permissions.include?(:topic_manager) } do
+    can_manager_topic
+  end
+
 
   def can_manager_topic
     can :edit_topic, :destroy_topic

data/lib/seven/abilities.rb

@@ -28,10 +28,8 @@ module Seven
       return @abilities if @abilities
       @abilities = []
 
-      self.class.rule_procs.each do |field, scope, rule_proc|
-        if field
-          next if current_user.nil? || !scope.include?(current_user.public_send(field))
-        end
+      self.class.rule_procs.each do |checker, rule_proc|
+        next if checker && (current_user.nil? || !instance_eval(&checker))
         instance_eval(&rule_proc)
       end
 
@@ -54,14 +52,27 @@ module Seven
       # 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)
-        if field
-          raise Seven::ArgsError, 'Scope cannot be nil' unless scope
-          formatted_scope = scope.is_a?(Array) ? scope : [scope]
+        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
+        else
+          raise Seven::ArgsError, "Invalid field '#{field}'" if scope.nil?
         end
 
+
         @rule_procs ||= []
-        @rule_procs << [field ? field.to_sym : nil, formatted_scope, rule_proc]
+        @rule_procs << [checker, rule_proc]
       end
     end
   end

data/lib/seven/version.rb

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

metadata

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