i_am_i_can 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab915220af5d95373eaa8b8a57563d311a7f2903
-  data.tar.gz: ea007c8d5b61f511dcbfd799432d5221dd666804
+  metadata.gz: 61ae8325860ffdbf44f5b3b5a90e8b3e3647ff7d
+  data.tar.gz: ae22ead6bad6f7d046261431634cf6a7208ab9c0
 SHA512:
-  metadata.gz: dd645226ade084917ddc64405009d1c7c6f2b8ead5c69544be10e296264a963ab38ab2f851ac46633cbb36c45d052330a1899e3381b1517bc1804c83fb7dbf26
-  data.tar.gz: 0e7ecdb8a56621234a9f52dc9c3f8a6131b55ea0674fe7c78a5c1f84c66305f0ce80a7137d2d3e0a109cae2260cd9cf4f23e8de257906be08aa9f9f843180462
+  metadata.gz: ed6cfd6f6bd032d67ca894c1e0b5337cd98e35ea43c76554953593a4202af33afe760cd6f93e192a75b6481f5302c1a49ebaad9edf8a9b2e8da900329b13317f
+  data.tar.gz: a8f16329d8abc596f58777ff27cd2d702e91ebba382c842675a559584777a6775d8c197a8cb3b95a7a1c73385664972e1fe98e17e8c487211dd7d5b7384f8410

data/lib/i_am_i_can/role/assignment.rb

@@ -7,7 +7,7 @@ module IAmICan
                     _d: i_am_i_can.auto_definition, auto_definition: _d || which_can.present?,
                     expires_in: nil, expires_at: (expires_in.after if expires_in), save: true
         self.class.have_roles *roles, which_can: which_can, obj: obj if auto_definition
-        run_callbacks(:role_assign) do
+        run_callbacks(save ? :role_assign : :role_none) do
           _roles_assignment(roles, save, exp: expires_at)
         end
       end
@@ -17,7 +17,7 @@ module IAmICan
       end
 
       def falls_from *roles, saved: true
-        run_callbacks(:cancel_role_assign) do
+        run_callbacks(saved ? :cancel_role_assign : :role_none) do
           _roles_assignment(:cancel, roles, saved)
         end
       end

data/lib/i_am_i_can/subject.rb

@@ -11,7 +11,7 @@ module IAmICan
     end
 
     included do
-      define_model_callbacks :role_assign, :cancel_role_assign, :role_update
+      define_model_callbacks :role_assign, :cancel_role_assign, :role_update, :role_none
 
       Object.const_set (role_assoc_class = reflections[__roles].options[:join_table].camelize),
                        Class.new(ActiveRecord::Base)

data/lib/i_am_i_can/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IAmICan
-  VERSION = '4.4.0'
+  VERSION = '4.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler