devise_invitable 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ebdddd2e1426fdde9ad700f7f60e4cedf3e48ab
-  data.tar.gz: 3a783c0d76c73a4a6af2c07cda15b80904fecdcf
+  metadata.gz: 09f7285fbf0dcc7da0b16e9a26bbc9c385e19720
+  data.tar.gz: 0b862b791cd58df3fc8ad6eba813c76534e89cba
 SHA512:
-  metadata.gz: b85b1eabee1011a5175f98ca92f05f39a1f49e3da2666f17bafa8a87d22115700d6f7beee89261a5096d70dcfeec473834dc43bfcaa5a967b63fc78b7789bb7f
-  data.tar.gz: 483b574690f8a3064b7d4f941a7fad4e321fe89d677192b82e68d0d0f3feba49d92125054f17e89521c2810e9feb80de12ee135895728d7d1f633bdd845845ea
+  metadata.gz: 8bf23dd018217299609a033f0ea3666a4f0358580a6b2a14bff4405666ae82217de809b1fdac77a12269349337d8756a601c635e427962fa343c81d4bdf0c765
+  data.tar.gz: 560b395e0616d53b6b2d3164cd9ccd34a017517256f627a098c4971b4b85a55f41f61810f735dc2c51d9afcfb1acf848574bf1b32e2185b8ec47b9afe47d946c

data/README.rdoc

@@ -28,7 +28,7 @@ When you are done, you are ready to add DeviseInvitable to any of your Devise mo
 
   rails generate devise_invitable MODEL
 
-Replace MODEL by the class name you want to add DeviseInvitable, like User, Admin, etc. This will add the :invitable flag to your model's Devise modules. The generator will also create a migration file (if your ORM support them). Continue reading this file to understand exactly what the generator produces and how to use it.
+Replace MODEL by the class name you want to add DeviseInvitable, like User, Admin, etc. This will add the :invitable flag to your model's Devise modules. The generator will also create a migration file (if your ORM supports them). Continue reading this file to understand exactly what the generator produces and how to use it.
 
 === Manual installation
 

data/app/controllers/devise/invitations_controller.rb

@@ -37,6 +37,7 @@ class Devise::InvitationsController < DeviseController
 
   # PUT /resource/invitation
   def update
+    raw_invitation_token = update_resource_params[:invitation_token]
     self.resource = accept_resource
     invitation_accepted = resource.errors.empty?
 
@@ -53,6 +54,7 @@ class Devise::InvitationsController < DeviseController
         respond_with resource, :location => new_session_path(resource_name)
       end
     else
+      resource.invitation_token = raw_invitation_token
       respond_with_navigational(resource){ render :edit }
     end
   end

data/lib/devise_invitable/model.rb

@@ -150,8 +150,8 @@ module Devise
         block_from_invitation? ? :invited : super
       end
 
-      def after_password_reset
-        super if defined?(super)
+      def clear_reset_password_token
+        super
         accept_invitation! if invited_to_sign_up?
       end
 
@@ -304,7 +304,6 @@ module Devise
 
           invitable = find_or_initialize_with_error_by(:invitation_token, invitation_token)
           invitable.errors.add(:invitation_token, :invalid) if invitable.invitation_token && invitable.persisted? && !invitable.valid_invitation?
-          invitable.invitation_token = original_token
           invitable unless only_valid && invitable.errors.present?
         end
 

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/test/functional/registrations_controller_test.rb

@@ -26,6 +26,9 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
 
     @invitee = User.where(:email => invitee_email).first
     assert @invitee.encrypted_password.blank?, "the password should be unset"
+    assert_nil @invitee.invitation_accepted_at
+    assert_not_nil @invitee.invitation_token
+    assert !@invitee.confirmed?
 
     # sign_up the invitee
     assert_difference('ActionMailer::Base.deliveries.size') do
@@ -47,8 +50,8 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     assert_nil @invitee.invitation_token
     assert @invitee.invited_by_id.present?
     assert @invitee.invited_by_type.present?
-    assert !@invitee.confirmed?
     assert @invitee.confirmation_token.present?
+    assert !@invitee.confirmed?
   end
 
   test "not invitable resources can register" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler