i_am_i_can 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c54e75b43df8cbfb0e8acd30cb0fc40e0aeda0
-  data.tar.gz: 5a0a6c5198cdb76ca0a251b99d7320cc2a081854
+  metadata.gz: edde7fa4072a2d78c7b5017f9d42e0aab9925f1f
+  data.tar.gz: 99d658e9ce576ed82207f577cfcba96202a6cdfc
 SHA512:
-  metadata.gz: 00ed26e8fe4e750241e92eda7d5acb084bc3a733f654af380e61f052c8723c62e5f8b82ef9e1907466caf02a8f7a2cc6c2d30fd44a20848b60965e53333e65f1
-  data.tar.gz: f6d4a8bbab40bfe9017f38a0f7acc63aa5784743e279a15c4b26611bab9ee8f39d1c58e572de1f48b9acfc36d464454869be057354329dad5119bc14d5bde1a3
+  metadata.gz: 195ed325b75c8b7a7b7e94cb6cd601214451044f438f25c26c357187d9cd229ca5c37000cf5ca28b03f95b22964be0f3e7131f4c4cc36926036ccc75d9871d2b
+  data.tar.gz: 96a3122e55433bfb0115051c4da61fd465d9909e4d977fb7a84819d8dd88c310aa87e58ea30397c9bdb2fb71bb27362f4fc5ddfa136f3f8ef5d8dc551a2c37dd

data/lib/i_am_i_can/permission/assignment.rb

@@ -25,11 +25,18 @@ module IAmICan
         end
       end
 
-      def _permissions_assignment(action = :assign, actions, obj)
-        permissions = actions.product(Array[obj]).map { |(p, o)| { action: p, **deconstruct_obj(o) } }
-        assignment = _stored_permissions_exec(action,
-                                              permissions.reduce({ }) { |a, b| a.merge(b) { |_, x, y| [x, y] } })
-        ResultOf.permission assignment, i_am_i_can, given: [[], permissions.map { |pms| pms.values.compact.join('_').to_sym }]
+      def _permissions_assignment(exec = :assign, actions, obj)
+        if actions.first.is_a?(i_am_i_can.permission_model)
+          exec_arg, names = actions, actions.map(&:name)
+        else
+          objs = obj ? Array(obj) : [nil]
+          permissions = actions.product(objs).map { |(p, o)| { action: p, **deconstruct_obj(o) } }
+          exec_arg = permissions.reduce({ }) { |a, b| a.merge(b) { |_, x, y| [x, y] } }
+          names = permissions.map { |pms| pms.values.compact.join('_').to_sym }
+        end
+
+        assignment = _stored_permissions_exec(exec, exec_arg)
+        ResultOf.permission assignment, i_am_i_can, given: [[], names]
       end
     end
   end

data/lib/i_am_i_can/version.rb

@@ -1,3 +1,3 @@
 module IAmICan
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-08 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler