devise_deactivatable 0.2.5 → 0.2.7

data/lib/devise_deactivatable/model.rb

@@ -1,9 +1,14 @@
 module Devise
   module Models
     module Deactivatable
+      extend ActiveSupport::Concern
+      
+      included do
+        scope :deactivated, -> { where("'deactivated_at' is not NULL") }
+      end
+      
       def self.required_fields(klass)
-        attributes = [:deactivated_at]
-        attributes
+        [:deactivated_at]
       end
       
       # Overwrites active_for_authentication? from Devise::Models::Activatable for deactivate purposes
@@ -14,7 +19,10 @@ module Devise
 
       def deactivate!
         self.deactivated_at = Time.now
-        save!(:validate => false)
+        save(validate: false) or raise "Devise deactivatable could not save #{inspect}." \
+          "Please make sure a model using deactivatable can be saved when deactivating."
+
+        after_deactivate
       end      
 
       def deactivated?
@@ -26,6 +34,25 @@ module Devise
       def inactive_message
         deactivated? ? :deactivated : super
       end
+      
+      protected
+      
+      # A callback initiated after successfully deactivating. This can be
+      # used to insert your own logic that is only run after the user successfully
+      # deactivated.
+      #
+      # Example:
+      #
+      #   def after_deactivated
+      #     # remove oauth tokens
+      #   end
+      #      
+      def after_deactivate
+      end
+      
+      module ClassMethods
+        
+      end
     end
   end
 end

data/lib/devise_deactivatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseDeactivatable
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.7".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_deactivatable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Elan Meng
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-04 00:00:00 +08:00
+date: 2014-06-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency