devise_invitable 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b83b5f1ceec909cc73063d89575fce5bcf50c473
-  data.tar.gz: f495b7eeebe7e5c70d3181747b25ea802a8f656f
+  metadata.gz: 24a36c592f8c636eb4cf7e704165f41abc0c14c5
+  data.tar.gz: 9a999cc7bc9523e1b100ce415aee6270d8a9fc66
 SHA512:
-  metadata.gz: d27498b5bf7c89b29d8cb15b34df681a3aa3fdbb639ee6b73cbb93eaf61eccc5ff255b6016447d57b8b1ee54bd2fa6bd54d23c79f107d4dff21fe70b3489bcb8
-  data.tar.gz: cc70998322befe8502e6787d863e9ce0569d3c718eac7c6f7c31dcf17a0f1ad665eaf83f46ffb64719c961b20e8cfe968624d953387b04a0ed062bea42dc602d
+  metadata.gz: ca000182ea194f46655066899e531094801c347461926d8185fa8a039208af55d108c6a35cad22bfa31e60d7cad63b62203cf18b9e39a43702dcedd815cb9c33
+  data.tar.gz: 66e68e6a7facedfdb0752f4d4b1310e255cdcd33892f816158149154e94a2104d71b88a80af3672fd9a325984666770c66cf115a85758e7b57273d9ef3bee00a

data/CHANGELOG

@@ -1,3 +1,6 @@
+= 1.7.2
+- Sign out before accepting the invitation if the user logged in
+
 = 1.7.1
 - Allow to set invited_by_* options on model
 - created_by_invite scope and test method checks invitation_created_at, because invitation_sent_at can be nil if skip_invitation is used

data/README.rdoc

@@ -70,7 +70,7 @@ or for a model that already exists, define a migration to add DeviseInvitable to
       add_column :users, :invited_by_id, :integer
       add_column :users, :invited_by_type, :string
       add_index :users, :invitation_token, :unique => true
-      
+
       # Allow null encrypted_password
       change_column_null :users, :encrypted_password, :string, true
       # Allow null password_salt (add it if you are using Devise's encryptable module)
@@ -229,7 +229,7 @@ Here is an example of what your application controller might need to include in
 
 === Send an invitation
 
-To send an invitation to a user, use the <tt>invite!</tt> class method. <tt>:email</tt> must be present in the parameters hash. You can also include other attributes in the hash. The record will not be validated.
+To send an invitation to a user, use the <tt>invite!</tt> class method. <b>Note: This will create a user, and send an email for the invite.</b> <tt>:email</tt> must be present in the parameters hash. You can also include other attributes in the hash. The record will not be validated.
 
   User.invite!(:email => "new_user@example.com", :name => "John Doe")
   # => an invitation email will be sent to new_user@example.com
@@ -267,15 +267,17 @@ To check if a particular user is created by invitation, irrespective to state of
 When using skip_invitation you must send the email with the user object instance that generated the tokens, as
 user.raw_invitation_token is available only to the instance and is not persisted in the database.
 
+You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class method:
+
+  User.invite!({:email => "new_user@example.com"}, current_user) # current_user will be set as invited_by
+
+=== Sending an invitation after user creation
+
 You can send an invitation to an existing user if your workflow creates them separately:
 
   user = User.find(42)
   user.invite!(current_user)  # current user is optional to set the invited_by attribute
 
-You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class method:
-
-  User.invite!({:email => "new_user@example.com"}, current_user) # current_user will be set as invited_by
-
 === Find by invitation token
 
 To find by invitation token use the <tt>find_by_invitation_token</tt> class method.

data/app/controllers/devise/invitations_controller.rb

@@ -44,6 +44,7 @@ class Devise::InvitationsController < DeviseController
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
+    sign_out send("current_#{resource_name}") if send("#{resource_name}_signed_in?")
     set_minimum_password_length
     resource.invitation_token = params[:invitation_token]
     render :edit

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise