devise_invitable 0.5.2 → 0.5.3

data/README.rdoc

@@ -61,7 +61,7 @@ or for a model that already exists, define a migration to add DeviseInvitable to
 
 == Model configuration
 
-DeviseInvitable adds four new configuration options:
+DeviseInvitable adds some new configuration options:
 
 * invite_for: The period the generated invitation token is valid, after this period, the invited resource won't be able to accept the invitation. When invite_for is 0 (the default), the invitation won't expire.
 
@@ -83,6 +83,8 @@ or directly as parameters to the <tt>devise</tt> method:
 
 * validate_on_invite: force a record to be valid before being actually invited.
 
+* resend_invitation: resend invitation if user with invited status is invited again. Enabled by default.
+
 For more details, see <tt>config/initializers/devise.rb</tt> (after you invoked the "devise_invitable:install" generator described above).
 
 == Configuring views
@@ -170,7 +172,7 @@ You would have a User model which is configured as invitable and an Admin model
   class ApplicationController < ActionController::Base
   protected
     def authenticate_inviter!
-      authenticate_admin!
+      authenticate_admin!(true)
     end
   end
 

data/lib/devise_invitable.rb

@@ -44,6 +44,15 @@ module Devise
   #   config.invite_key = :email
   mattr_accessor :invite_key
   @@invite_key = :email
+
+  # Public: Resend invitation if user with invited status is invited again
+  # (default: true)
+  #
+  # Example (in config/initializers/devise.rb)
+  #
+  #   config.resend_invitation = false
+  mattr_accessor :resend_invitation
+  @@resend_invitation = true
 end
 
 Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation

data/lib/devise_invitable/model.rb

@@ -118,6 +118,8 @@ module Devise
         # Attempt to find a user by it's email. If a record is not found, create a new
         # user and send invitation to it. If user is found, returns the user with an
         # email already exists error.
+        # If user is found and still have pending invitation, email is resend unless
+        # resend_invitation is set to false
         # Attributes must contain the user email, other attributes will be set in the record
         def invite!(attributes={}, invited_by=nil, &block)
           invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
@@ -127,7 +129,7 @@ module Devise
           if invitable.new_record?
             invitable.errors.clear if invitable.email.try(:match, Devise.email_regexp)
           else
-            invitable.errors.add(invite_key, :taken) unless invitable.invited?
+            invitable.errors.add(invite_key, :taken) unless invitable.invited? && self.resend_invitation
           end
 
           if invitable.errors.empty?
@@ -161,6 +163,7 @@ module Devise
         Devise::Models.config(self, :validate_on_invite)
         Devise::Models.config(self, :invitation_limit)
         Devise::Models.config(self, :invite_key)
+        Devise::Models.config(self, :resend_invitation)
       end
     end
   end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +02:00
+date: 2011-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency