devise_invitable 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21840c71f560017345f75d9152e44b295ccb8043
-  data.tar.gz: 8470539a88ef73abb3ef396a4c043e9405eecd57
+  metadata.gz: 34b7a909db3f99e89240bf2b81107b5981e656cb
+  data.tar.gz: 47f3c423acd3c430232c028e130174c23720081e
 SHA512:
-  metadata.gz: 451e491d4a3a8135bc4d1447d1b9035624f2be5757f03544fe1bf8925e0b08df1317a57ec93cb20f293e5dc77397e3c1ba6a6e854f1b8a7646804ce6b43258fc
-  data.tar.gz: ee5f07eb0c08aca5310d36b42eb7fa20fee2bbc657a101a79981c5072e6da3593a813ca79bb08ef05d3494db65e228017f692dc96645c1e62b9ff3c4f189e4f8
+  metadata.gz: fb028f99d4fc760cdecc7f747b3070fa7c2373d3e5655cdb51c2526245a546f1c8b4b84175810b9b8c1df33f054a0b5b1c4190f2280eda5d31f6f7377e7cffbf
+  data.tar.gz: e04a795483022a82a601790ad24d682934322e45348026bd6a3b387b8284b41ca8403e55afddaf57b51d630961cb2650e8fbcea15d9144c07d3e1fde8f23976f

data/README.rdoc

@@ -15,8 +15,8 @@ Install DeviseInvitable gem, it will also install dependencies (such as devise a
 
 Add DeviseInvitable to your Gemfile (and Devise if you weren't using them):
 
-  gem 'devise',           '>= 2.0.0'
-  gem 'devise_invitable', '~> 1.3.4'
+  gem 'devise',           '~> 3.5.2'
+  gem 'devise_invitable', '~> 1.5.2'
 
 === Automatic installation
 

data/app/controllers/devise_invitable/registrations_controller.rb

@@ -5,10 +5,12 @@ class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
     hash ||= resource_params || {}
     if hash[:email]
       self.resource = resource_class.where(:email => hash[:email]).first
-      if self.resource and self.resource.invited_to_sign_up?
+      if self.resource && self.resource.respond_to?(:invited_to_sign_up?) && self.resource.invited_to_sign_up?
         self.resource.attributes = hash
         self.resource.send_confirmation_instructions if self.resource.confirmation_required_for_invited?
         self.resource.accept_invitation
+      else
+        self.resource = nil
       end
     end
     self.resource ||= super

data/lib/devise_invitable.rb

@@ -73,7 +73,7 @@ module Devise
   @@invited_by_counter_cache = nil
 
   # Public: Auto-login after the user accepts the invite. If this is false,
-  # the user will need to manually log in after accepting the invite (default: false).
+  # the user will need to manually log in after accepting the invite (default: true).
   mattr_accessor :allow_insecure_sign_in_after_accept
   @@allow_insecure_sign_in_after_accept = true
 end

data/lib/devise_invitable/model.rb

@@ -254,7 +254,7 @@ module Devise
           invitable = find_or_initialize_with_errors(invite_key_array, attributes_hash)
           invitable.assign_attributes(attributes)
           invitable.invited_by = invited_by
-          unless invitable.password
+          unless invitable.password || invitable.encrypted_password.present?
             invitable.password = Devise.friendly_token[0, 20]
           end
 

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/test/functional/registrations_controller_test.rb

@@ -53,16 +53,61 @@ class DeviseInvitable::RegistrationsControllerTest < ActionController::TestCase
     assert !@invitee.confirmed?
   end
 
+  test "non-invited users may still sign up directly by themselves" do
+    register_email = "invitee@example.org"
+    # sign_up the invitee
+    assert_difference('ActionMailer::Base.deliveries.size') do
+      post :create, :user => {:email => register_email, :password => "1password", :bio => '.'}
+    end
+    assert_nil @controller.current_user
+
+    @user = User.where(:email => register_email).first
+
+    # do not send emails on model changes
+    assert_no_difference('ActionMailer::Base.deliveries.size') do
+      @user.bio = "I am a robot"
+      @user.save!
+      @user.bio = "I am a human"
+      @user.save!
+    end
+
+    assert @user.encrypted_password.present?
+    assert_nil @user.invitation_accepted_at
+    assert_nil @user.invitation_token
+    assert_nil @user.invited_by
+    assert @user.confirmation_token.present?
+    assert !@user.confirmed?
+  end
+
   test "not invitable resources can register" do
     @request.env["devise.mapping"] = Devise.mappings[:admin]
     invitee_email = "invitee@example.org"
 
+    assert_nil Admin.where(:email => invitee_email).first
+
     post :create, :admin => {:email => invitee_email, :password => "1password"}
 
     @invitee = Admin.where(:email => invitee_email).first
     assert @invitee.encrypted_password.present?
   end
 
+  test "not invitable resources are not logged in after sign up again" do
+    @request.env["devise.mapping"] = Devise.mappings[:admin]
+    invitee_email = "invitee@example.org"
+
+    post :create, :admin => {:email => invitee_email, :password => "1password"}
+    assert_response 302
+
+    @invitee = Admin.where(:email => invitee_email).first
+    assert @invitee.encrypted_password.present?
+
+    sign_out @invitee
+    post :create, :admin => {:email => invitee_email, :password => "2password"}
+    assert_response 200
+    assert_equal @invitee.encrypted_password, Admin.where(:email => invitee_email).first.encrypted_password
+    assert @controller.send(:resource).errors.present?
+  end
+
   test "missing params on a create should not cause an error" do
 
     assert_nothing_raised { post :create }

data/test/models/invitable_test.rb

@@ -200,8 +200,10 @@ class InvitableTest < ActiveSupport::TestCase
     user = User.invite!(:email => "valid@email.com")
     assert user.invitation_token.present?
     assert_nil user.invitation_accepted_at
+    old_encrypted_password = user.encrypted_password
     User.accept_invitation!(:invitation_token => user.invitation_token, :password => '123456789', :password_confirmation => '987654321')
     user.reload
+    assert_equal old_encrypted_password, user.encrypted_password
     assert user.invitation_token.present?
     assert_nil user.invitation_accepted_at
   end
@@ -436,11 +438,11 @@ class InvitableTest < ActiveSupport::TestCase
     user.reload
     assert !user.valid_password?('new_password')
   end
-  
+
   test 'should check if created by invitation' do
     user = User.invite!(:email => "valid@email.com")
     assert user.created_by_invite?
-    
+
     invited_user = User.accept_invitation!(
       :invitation_token => Thread.current[:token],
       :password => 'new_password',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler