devise_revokable 0.0.2 → 0.0.3

data/README.rdoc

@@ -21,8 +21,11 @@ It works like normal Devise modules.  Add the <tt>:revokable</tt> module to the
   # in user.rb
   devise :revokable # plus other devise modules
 
-Additionally, you will need to override <tt>#revoke!</tt> to actually perfom the revocation on your account, which
-is yielded to from the module's method.
+If the user who received the revocation email follows the provided link and confirms revocation, the account will
+effectively be "revoked" and inactive, unable to log in.
+
+Additionally, you may want to override <tt>#revoke!</tt> to perfom additional revocation on the account, e.g. deleting
+posts made, resetting personal information, etc.  The super method yields to a block for this purpose.
 
   # in user.rb
   def revoke!
@@ -36,8 +39,8 @@ Additionally you can define the module accessor <tt>@@mailer</tt> on the module
 This proc is yielded two arguments, the method name (e.g. :revocation_instructions), and the affected resource.
 
 
-  # in config/initializers/devise_revocation.rb
-  require 'devise_revocation'
+  # in config/initializers/devise_revokable.rb
+  require 'devise_revokable'
   require 'my_mailer'
 
-  DeviseRevocation.mailer = proc {|method_name, resource| MyMailer.send(:method_name, resource) }
+  DeviseRevokable.mailer = proc {|method_name, resource| MyMailer.send(:method_name, resource) }

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   devise:
+    failure:
+      revoked: 'Your account has been revoked, please contact the administrator if you feel this is in error.'
     revocations:
       updated: 'Your account was reset successfully.'
       revocation_token_invalid: 'The token provided is not valid, or this account has already been revoked!'

data/lib/devise_revokable/model.rb

@@ -27,11 +27,11 @@ module Devise
       end
 
       def active?
-        not revoked?
+        super && !revoked?
       end
 
       def inactive_message
-        super
+        revoked? ? :revoked : super
       end
 
       protected
@@ -66,7 +66,6 @@ module Devise
 
       module ClassMethods
         def send_revocation_instructions(attributes = {})
-          return unless active?
           revokable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
           revokable.send(:send_revocation_instructions) if revokable.persisted?
           revokable

data/lib/devise_revokable/version.rb

@@ -1,3 +1,3 @@
 module DeviseRevokable
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Travis Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -04:00
+date: 2011-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,8 +71,11 @@ description: |
     # in user.rb
     devise :revokable # plus other devise modules
   
-  Additionally, you will need to override <tt>#revoke!</tt> to actually perfom the revocation on your account, which
-  is yielded to from the module's method.
+  If the user who received the revocation email follows the provided link and confirms revocation, the account will
+  effectively be "revoked" and inactive, unable to log in.
+  
+  Additionally, you may want to override <tt>#revoke!</tt> to perfom additional revocation on the account, e.g. deleting
+  posts made, resetting personal information, etc.  The super method yields to a block for this purpose.
   
     # in user.rb
     def revoke!
@@ -86,11 +89,11 @@ description: |
   This proc is yielded two arguments, the method name (e.g. :revocation_instructions), and the affected resource.
   
   
-    # in config/initializers/devise_revocation.rb
-    require 'devise_revocation'
+    # in config/initializers/devise_revokable.rb
+    require 'devise_revokable'
     require 'my_mailer'
   
-    DeviseRevocation.mailer = proc {|method_name, resource| MyMailer.send(:method_name, resource) }
+    DeviseRevokable.mailer = proc {|method_name, resource| MyMailer.send(:method_name, resource) }
 
 email: travis@e9digital.com
 executables: []