i_am_i_can 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52f2148f7b7693972fbf12b9f573967491caf3ee
-  data.tar.gz: d1282f21e4d23e9ab713e58fea2b91a23790074a
+  metadata.gz: 519c1026eae5c7971fab21986634e180723d35f6
+  data.tar.gz: 9cc200adfab71617107fcc41ca4d639f5447d7bb
 SHA512:
-  metadata.gz: 32175d334cfa85c56d7ef787ee2f4d5a3d8995df40e26f6311581e9995d0d1844c02cd8c54c884101647ed79f7ff3b7d03ee87763e2ed573f97c631f4f01f9e5
-  data.tar.gz: eb09a250c1bb986a5ef19034d94e9cd53773a4bb5adc216436dd46f44c975b97a74facbce1fd22c70d59fe5e48bc4d8b7e04c709ed09dd20f3dae796c211ea64
+  metadata.gz: 68319a2d89a43ce758c8fec136284560ef9720f7e7dd1c770969d8e91982bb3cc43fea7737dae965bd9fc8033ad31814fa64f30f9eaba8bc4ef460047c241569
+  data.tar.gz: ac8315de97eb469c52b0dca44230124a075733afc9c20a75bbe76578b1a3c5bc5fc0c95d2ce48e8ba25601aeb989935aef4b93ade1fe0f25185b8d02b4dd57a2

data/lib/i_am_i_can/permission/assignment.rb

@@ -26,12 +26,12 @@ module IAmICan
       end
 
       def _permissions_assignment(exec = :assign, actions, obj)
-        if actions.flatten!.first.is_a?(i_am_i_can.permission_model)
+        if actions.tap(&:flatten!).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) }.values }
-          exec_arg = { action: permissions.map(&:first), obj_type: permissions.map { |v| v[1] }, obj_id: permissions.map(&:last) }
+          exec_arg = { action: permissions.map(&:first).uniq, obj_type: permissions.map { |v| v[1] }.uniq, obj_id: permissions.map(&:last).uniq }
           names = permissions.map { |pms| pms.compact.join('_').to_sym }
         end
 

data/lib/i_am_i_can/permission/definition.rb

@@ -2,7 +2,7 @@ module IAmICan
   module Permission
     module Definition
       def have_permission *actions, obj: nil, remarks: nil
-        return unless actions.flatten!.first.class.in?([ Symbol, String ])
+        return unless actions.tap(&:flatten!).first.class.in?([ Symbol, String ])
         objs = obj ? Array(obj) : [nil]
         permissions = actions.product(objs).map { |(p, o)| { action: p, **deconstruct_obj(o), remarks: remarks } }
         definition = _create_permissions(permissions)

data/lib/i_am_i_can/role/assignment.rb

@@ -35,13 +35,13 @@ module IAmICan
       %i[ currently_is_a ].each { |aname| alias_method aname, :is_only_a }
 
       def _roles_assignment(action = :assign, roles, save, exp: nil)
-        instances, names = Role.extract(roles, i_am_i_can)
+        instances, names = Role.extract(roles.flatten, i_am_i_can)
         if save
-          assignment = _stored_roles_exec(action.flatten!, instances, name: names)
+          assignment = _stored_roles_exec(action, instances, name: names)
           _set_roles_expire(exp, assignment.map(&:id)) if exp
         else
           to_be_assigned_names = (instances.map(&:name).map(&:to_sym) + names).uniq
-          assignment = _temporary_roles_exec(action.flatten!, to_be_assigned_names)
+          assignment = _temporary_roles_exec(action, to_be_assigned_names)
         end
 
         ResultOf.role assignment, i_am_i_can, given: [instances, names]

data/lib/i_am_i_can/role/definition.rb

@@ -2,7 +2,7 @@ module IAmICan
   module Role
     module Definition
       def have_role *roles, which_can: [ ], obj: nil, remarks: nil
-        return unless roles.flatten!.first.class.in?([ Symbol, String ])
+        return unless roles.tap(&:flatten!).first.class.in?([ Symbol, String ])
         roles.map!(&:to_sym) ; i = i_am_i_can
         definition = _create_roles(roles.map { |role| { name: role, remarks: remarks } })
 

data/lib/i_am_i_can/role_group/definition.rb

@@ -3,7 +3,7 @@ module IAmICan
     module Definition
       def group_roles *members, by_name:, which_can: [ ], obj: nil
         group = (i = i_am_i_can).role_group_model.where(name: by_name).first_or_create
-        instances, names = Role.extract(members.flatten!, i)
+        instances, names = Role.extract(members.tap(&:flatten!), i)
         assignment = group._members_exec(:assign, instances, name: names)
         ResultOf.members assignment, i, given: [instances, names]
       end

data/lib/i_am_i_can/version.rb

@@ -1,3 +1,3 @@
 module IAmICan
-  VERSION = '4.3.1'
+  VERSION = '4.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - zhandao