i_am_i_can 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 519c1026eae5c7971fab21986634e180723d35f6
-  data.tar.gz: 9cc200adfab71617107fcc41ca4d639f5447d7bb
+  metadata.gz: bc8efa706ad5886dd1188273bfed33bf80c80fbf
+  data.tar.gz: f1449022f144128db5ed05e85c5d973b08ded6d5
 SHA512:
-  metadata.gz: 68319a2d89a43ce758c8fec136284560ef9720f7e7dd1c770969d8e91982bb3cc43fea7737dae965bd9fc8033ad31814fa64f30f9eaba8bc4ef460047c241569
-  data.tar.gz: ac8315de97eb469c52b0dca44230124a075733afc9c20a75bbe76578b1a3c5bc5fc0c95d2ce48e8ba25601aeb989935aef4b93ade1fe0f25185b8d02b4dd57a2
+  metadata.gz: 0f809fa65dc6c707f40bae254e048103dc0ad3614831447228046f79586b188e46f4257221849243f2b6bed41d997f3f0d048b3b5a52df1aa263f007fe2512ed
+  data.tar.gz: 9ff64d80f81f29e1e549bc8af7016c8ae64b43d41225aa63c39ba9fc5952678d7978f388fa1ab81173b93d97eb68826c05738483f0c121e005e64732b2976a72

data/i_am_i_can.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'railties'
+  spec.add_dependency 'colorize'
 end

data/lib/i_am_i_can/helpers/result_of.rb

@@ -61,7 +61,7 @@ module IAmICan
       if config.strict_mode && failed_items.present?
         raise Error, msg
       else
-        Rails.logger.info(msg) unless ENV['ITEST']
+        Rails.logger.info("  * #{msg}".green) unless ENV['ITEST']
         assignment
       end
     end

data/lib/i_am_i_can/resource.rb

@@ -6,29 +6,12 @@ module IAmICan
       # Book.that_allow(User.all, to: :read)
       # Book.that_allow(User.last, to: :write)
       scope :that_allow, -> (subject, to:) do
+        stored_ids = subject.try(:new_record?) ? [ ] : subject._roles.ids
         tmp_role_ids = Array(subject).flat_map(&:temporary_roles).map(&:id).uniq
-        allowed_ids = subject.i_am_i_can.role_model.where(id: (subject._roles.ids + tmp_role_ids).uniq)
+        allowed_ids = subject.i_am_i_can.role_model.where(id: (stored_ids + tmp_role_ids).uniq)
                           ._permissions.where(action: to, obj_type: self.name).pluck(:obj_id).uniq
         where(id: allowed_ids)
       end
     end
-
-    class_methods do
-      # def that_allow(subject)
-      #   ThatAllow.new(self, subject)
-      # end
-    end
   end
-
-  # class ThatAllow
-  #   attr_accessor :records, :subject
-  #
-  #   def initialize(records, subject)
-  #     self.records = records
-  #     self.subject = subject
-  #   end
-  #
-  #   def to(action)
-  #   end
-  # end
 end

data/lib/i_am_i_can/role/assignment.rb

@@ -40,8 +40,7 @@ module IAmICan
           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, to_be_assigned_names)
+          assignment = _temporary_roles_exec(action, instances, name: names)
         end
 
         ResultOf.role assignment, i_am_i_can, given: [instances, names]

data/lib/i_am_i_can/support/association_class_methods.rb

@@ -23,20 +23,23 @@ module IAmICan
       #
       alias_method "#{name.to_s.singularize}_names", :temporary_role_names if name
 
-      define_method :_temporary_roles_add do |names|
-        names -= temporary_role_names
-        temporary_roles.concat(roles = i_am_i_can.role_model.where(name: names))
-        roles.names
+      define_method :_temporary_roles_add do |instances = nil, name: nil|
+        roles = instances.present? ? instances : i_am_i_can.role_model.where(name: name - temporary_role_names)
+        temporary_roles.concat(roles)
+        roles.map(&:name).map(&:to_sym)
       end
 
-      define_method :_temporary_roles_rmv do |names|
-        (names & temporary_role_names).each do |n|
-          temporary_roles.reject! { |i| i.name.to_sym == n }
+      define_method :_temporary_roles_rmv do |instances = nil, name: nil|
+        if instances.present?
+          self.temporary_roles -= instances
+          instances.map(&:name).map(&:to_sym)
+        else
+          (name & temporary_role_names).each { |n| self.temporary_roles.reject! { |i| i.name.to_sym == n } }
         end
       end
 
-      define_method :_temporary_roles_exec do |action = :assign, names|
-        send('_temporary_roles_' + (action == :assign ? 'add' : 'rmv'), names)
+      define_method :_temporary_roles_exec do |action = :assign, instances = nil, name: nil|
+        send('_temporary_roles_' + (action == :assign ? 'add' : 'rmv'), instances, name: name)
       end
     end
   end

data/lib/i_am_i_can/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "(RBAC like) Concise and Natural DSL for `Subject - Role(Role Group)
   - Permission - Resource` Management."
 email: