i_am_i_can 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7afc85dd06b6aefeec8da4d575782398aca2f5c0
-  data.tar.gz: f23e1e9768cbfdac758e7df5a3be484ebbebf2e8
+  metadata.gz: 52f2148f7b7693972fbf12b9f573967491caf3ee
+  data.tar.gz: d1282f21e4d23e9ab713e58fea2b91a23790074a
 SHA512:
-  metadata.gz: 6aa217add1124db25b3f79d5a3ff40ee43b18dcb28dfaad9fc9ebbd4d7eb3997be8bdb18f0ce88492817296b0aaae31963a935a4f54ea180d4c457730b773aca
-  data.tar.gz: ef73fda2b4d9bdcbe779d5a748ddfafe09561943f4520620cf441ae852bc1fa9f2b7db7afd978d5cca845740b0271ed63bb76f27d3781feeba0dd2bd5aca14c6
+  metadata.gz: 32175d334cfa85c56d7ef787ee2f4d5a3d8995df40e26f6311581e9995d0d1844c02cd8c54c884101647ed79f7ff3b7d03ee87763e2ed573f97c631f4f01f9e5
+  data.tar.gz: eb09a250c1bb986a5ef19034d94e9cd53773a4bb5adc216436dd46f44c975b97a74facbce1fd22c70d59fe5e48bc4d8b7e04c709ed09dd20f3dae796c211ea64

data/README.md

@@ -292,7 +292,7 @@ becomes_a *roles, which_can: [ ], obj: nil,
 he.becomes_a :admin # => 'Role Assignment Done' or error message
 he.stored_roles     # => [<#UserRole id: 1>]
 # 2. example of giving role instances to `roles` params
-he.becomes_a *UserRole.all # => 'Role Assignment Done' or error message
+he.becomes_a UserRole.all # => 'Role Assignment Done' or error message
 he.stored_roles     # => [<#UserRole id: 1>, <#UserRole id: 2>]
 # 3. `expires` (subject assocates roles with a `expire_at` scope)
 he.is_a :visitor, expires_in: 1.hour # or `expires_at: 1.hour.after`
@@ -410,7 +410,7 @@ can *actions, resource: nil, obj: resource, # you can use `resource` or `obj`
 role.can :fly # => 'Permission Assignment Done' or error message
 role.permissions # => [<#UserPermission id: ..>]
 # you can also passing permission instances to `actions` params, like:
-role.can *UserPermission.all
+role.can UserPermission.all
 
 # === Cancel Assignment ===
 # method signature

data/lib/i_am_i_can/permission/assignment.rb

@@ -26,13 +26,13 @@ module IAmICan
       end
 
       def _permissions_assignment(exec = :assign, actions, obj)
-        if actions.first.is_a?(i_am_i_can.permission_model)
+        if actions.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) } }
-          exec_arg = permissions.reduce({ }) { |a, b| a.merge(b) { |_, x, y| [x, y] } }
-          names = permissions.map { |pms| pms.values.compact.join('_').to_sym }
+          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) }
+          names = permissions.map { |pms| pms.compact.join('_').to_sym }
         end
 
         assignment = _stored_permissions_exec(exec, exec_arg)

data/lib/i_am_i_can/permission/definition.rb

@@ -2,9 +2,11 @@ module IAmICan
   module Permission
     module Definition
       def have_permission *actions, obj: nil, remarks: nil
-        permissions = actions.product(Array[obj]).map { |(p, o)| { action: p, **deconstruct_obj(o), remarks: remarks } }
+        return unless actions.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)
-        ResultOf.roles definition, i_am_i_can, given: permissions.map { |pms| pms.values.compact.join('_').to_sym }
+        ResultOf.permissions definition, i_am_i_can, given: permissions.map { |pms| pms.values.compact.join('_').to_sym }
       end
 
       %i[ have_permissions has_permission has_permissions ].each { |aname| alias_method aname, :have_permission }

data/lib/i_am_i_can/role/assignment.rb

@@ -37,11 +37,11 @@ module IAmICan
       def _roles_assignment(action = :assign, roles, save, exp: nil)
         instances, names = Role.extract(roles, i_am_i_can)
         if save
-          assignment = _stored_roles_exec(action, instances, name: names)
+          assignment = _stored_roles_exec(action.flatten!, 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, to_be_assigned_names)
+          assignment = _temporary_roles_exec(action.flatten!, 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.first.class.in?([ Symbol, String ])
+        return unless roles.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, i)
+        instances, names = Role.extract(members.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.0'
+  VERSION = '4.3.1'
 end

metadata

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