devise_invitable 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49059f27df2618f9c0491fd1b7578b33619f2ef5
-  data.tar.gz: da0b1ff3962cba2784b8c082c013fb483ee0517e
+  metadata.gz: 3baf83979bda300001727d86af188f93a91bf95c
+  data.tar.gz: 74d6ac1f55c041e7075e4c1e8ec026e470fdfe12
 SHA512:
-  metadata.gz: 56e5cc31bd011a67887ea3338ee66682dc398008f4a18f094fec9084b0635efc8684d5251aca72a9d7daecf228ea06aeec84bca49a8dd24bd3750c063f7b2e56
-  data.tar.gz: 162bc6c70f81f0b65ca73233a5ebb5ac53895b5e6c57f4085d522807592feccb29ce93c113e1d67d974fa95ebf026054d137a6a5c01c1af3913bf84df14d2f7a
+  metadata.gz: 0b08b0b990d88fd99aed53e4d3082db8354bda2e5046fad13901debde5ecb614ba5cdcea7e11709798ea16d4dc99dac27dbd622534179cf1d9a3cbaaaba38bda
+  data.tar.gz: 3ca119718132addd0b7b331ac4fe81c4e21852b6480ef10c3ed742492b82e86e6fbd01f84957e5a7b6426aba2bbd5eaeb8f65460730399f3e286e125355ca77f

data/app/controllers/devise/invitations_controller.rb

@@ -15,13 +15,15 @@ class Devise::InvitationsController < DeviseController
   # POST /resource/invitation
   def create
     self.resource = invite_resource
+    resource_invited = resource.errors.empty?
 
-    if resource.errors.empty?
-      yield resource if block_given?
+    yield resource if block_given?
+
+    if resource_invited
       if is_flashing_format? && self.resource.invitation_sent_at
         set_flash_message :notice, :send_instructions, :email => self.resource.email
       end
-      respond_with resource, :location => after_invite_path_for(resource)
+      respond_with resource, :location => after_invite_path_for(current_inviter)
     else
       respond_with_navigational(resource) { render :new }
     end
@@ -36,9 +38,11 @@ class Devise::InvitationsController < DeviseController
   # PUT /resource/invitation
   def update
     self.resource = accept_resource
+    invitation_accepted = resource.errors.empty?
+
+    yield resource if block_given?
 
-    if resource.errors.empty?
-      yield resource if block_given?
+    if invitation_accepted
       flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
       set_flash_message :notice, flash_message if is_flashing_format?
       sign_in(resource_name, resource)

data/config/locales/en.yml

@@ -1,13 +1,13 @@
 en:
   devise:
     failure:
-      invited: 'You have a pending invitation, accept it to finish creating your account.'
+      invited: "You have a pending invitation, accept it to finish creating your account."
     invitations:
-      send_instructions: 'An invitation email has been sent to %{email}.'
-      invitation_token_invalid: 'The invitation token provided is not valid!'
-      updated: 'Your password was set successfully. You are now signed in.'
+      send_instructions: "An invitation email has been sent to %{email}."
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      updated: "Your password was set successfully. You are now signed in."
       no_invitations_remaining: "No invitations remaining"
-      invitation_removed: 'Your invitation was removed.'
+      invitation_removed: "Your invitation was removed."
       new:
         header: "Send invitation"
         submit_button: "Send an invitation"
@@ -16,8 +16,8 @@ en:
         submit_button: "Set my password"
     mailer:
       invitation_instructions:
-        subject: 'Invitation instructions'
-        hello: 'Hello %{email}'
-        someone_invited_you: 'Someone has invited you to %{url}, you can accept it through the link below.'
-        accept: 'Accept invitation'
+        subject: "Invitation instructions"
+        hello: "Hello %{email}"
+        someone_invited_you: "Someone has invited you to %{url}, you can accept it through the link below."
+        accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email.<br />Your account won't be created until you access the link above and set your password."

data/lib/devise_invitable/model.rb

@@ -111,9 +111,9 @@ module Devise
         end
 
         yield self if block_given?
-        generate_invitation_token if self.invitation_token.nil? || (!@skip_invitation || @raw_invitation_token.nil?)
+        generate_invitation_token if self.invitation_token.nil? || (!skip_invitation || @raw_invitation_token.nil?)
         self.invitation_created_at = Time.now.utc
-        self.invitation_sent_at = self.invitation_created_at unless @skip_invitation
+        self.invitation_sent_at = self.invitation_created_at unless skip_invitation
         self.invited_by = invited_by if invited_by
 
         # Call these before_validate methods since we aren't validating on save
@@ -122,7 +122,7 @@ module Devise
 
         if save(:validate => false)
           self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
-          deliver_invitation unless @skip_invitation
+          deliver_invitation unless skip_invitation
         end
       end
 
@@ -172,9 +172,12 @@ module Devise
       protected
         # Overriding the method in Devise's :validatable module so password is not required on inviting
         def password_required?
-          !@skip_password && super
+          !skip_password && super
         end
 
+        def skip_password
+          @skip_password ||= false
+        end
 
         # Checks if the invitation for the user is within the limit time.
         # We do this by calculating if the difference between today and the
@@ -254,13 +257,11 @@ module Devise
         end
 
         def invite!(attributes={}, invited_by=nil, &block)
-          invitable, mail = _invite(attributes.with_indifferent_access, invited_by, &block)
-          invitable
+          _invite(attributes.with_indifferent_access, invited_by, &block).first
         end
 
         def invite_mail!(attributes={}, invited_by=nil, &block)
-          invitable, mail = _invite(attributes, invited_by, &block)
-          mail
+          _invite(attributes, invited_by, &block).last
         end
 
         # Attempt to find a user by it's invitation_token to set it's password.

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/test/functional/controller_helpers_test.rb

@@ -4,11 +4,11 @@ class ControllerHelpersTest < ActionController::TestCase
   tests ApplicationController
 
   test "after invite path defaults to after sign in path" do
-    assert_equal @controller.after_sign_in_path_for(:user), @controller.after_invite_path_for(:user)
+    assert_equal @controller.send(:after_sign_in_path_for, :user), @controller.after_invite_path_for(:user)
   end
   
   test "after accept path defaults to after sign in path" do
-    assert_equal @controller.after_sign_in_path_for(:user), @controller.after_accept_path_for(:user)
+    assert_equal @controller.send(:after_sign_in_path_for, :user), @controller.after_accept_path_for(:user)
   end
   
   test 'after invite path is customizable from application controller' do
@@ -36,4 +36,4 @@ class ControllerHelpersTest < ActionController::TestCase
     assert Devise::InvitationsController.method_defined? :after_accept_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_accept_path_for)
   end
-end
+end

data/test/integration/invitation_remove_test.rb

@@ -4,7 +4,7 @@ require 'integration_tests_helper'
 class InvitationRemoveTest < ActionDispatch::IntegrationTest
 
   test 'invited user can choose to remove his account/invite' do
-    user = User.invite!(:email => "valid@email.com")
+    User.invite!(:email => "valid@email.com")
 
     # remove!
     visit remove_user_invitation_path(:invitation_token => Thread.current[:token])

data/test/integration/invitation_test.rb

@@ -107,7 +107,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in user automatically after setting it\'s password' do
-    user = User.invite!(:email => "valid@email.com")
+    User.invite!(:email => "valid@email.com")
     set_password :invitation_token => Thread.current[:token]
     assert_equal root_path, current_path
   end
@@ -213,10 +213,20 @@ class InvitationTest < ActionDispatch::IntegrationTest
   end
 
   test 'authenticated admin should be able to send an admin invitation' do
-    sign_in_as_user Admin.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    admin = Admin.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    sign_in_as_user admin
 
     send_invitation new_admin_path
-    assert_equal root_path, current_path
+    assert_equal edit_admin_registration_path(admin), current_path
+    assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
+  end
+
+  test 'authenticated admin should be redirected to own page after send a free invitation' do
+    admin = Admin.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    sign_in_as_user admin
+
+    send_invitation new_free_invitation_path
+    assert_equal edit_admin_registration_path(admin), current_path
     assert page.has_css?('p#notice', :text => 'An invitation email has been sent to user@test.com.')
   end
 end

data/test/models/invitable_test.rb

@@ -169,7 +169,7 @@ class InvitableTest < ActiveSupport::TestCase
   end
 
   test 'should set password and password confirmation from params' do
-    invited_user = User.invite!(:email => "valid@email.com")
+    User.invite!(:email => "valid@email.com")
     user = User.accept_invitation!(:invitation_token => Thread.current[:token], :password => '123456789', :password_confirmation => '123456789')
     assert user.valid_password?('123456789')
   end
@@ -406,7 +406,7 @@ class InvitableTest < ActiveSupport::TestCase
     user = new_user(:password => nil, :password_confirmation => nil)
     user.invite!
 
-    invited_user = User.accept_invitation!(
+    User.accept_invitation!(
       :invitation_token => Thread.current[:token],
       :password => 'new_password',
       :password_confirmation => 'new_password'
@@ -480,13 +480,13 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should not send an invitation if we want to skip the invitation' do
     assert_no_difference('ActionMailer::Base.deliveries.size') do
-      invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50, :skip_invitation => true)
+      User.invite!(:email => "valid@email.com", :username => "a"*50, :skip_invitation => true)
     end
   end
 
   test 'should not send an invitation if we want to skip the invitation with block' do
     assert_no_difference('ActionMailer::Base.deliveries.size') do
-      invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50) do |u|
+      User.invite!(:email => "valid@email.com", :username => "a"*50) do |u|
         u.skip_invitation = true
       end
     end
@@ -606,7 +606,7 @@ class InvitableTest < ActiveSupport::TestCase
   end
 
   test 'should return instance with errors if invitation_token is nil' do
-    registered_user = User.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
+    User.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
     user = User.accept_invitation!
     assert !user.errors.empty?
   end

data/test/rails_app/app/controllers/application_controller.rb

@@ -3,6 +3,13 @@ class ApplicationController < ActionController::Base
   before_filter :configure_permitted_parameters, :if => :devise_controller?
 
   protected
+  def after_sign_in_path_for(resource)
+    if resource.is_a? Admin
+      edit_admin_registration_path(resource)
+    else
+      super
+    end
+  end
 
   def configure_permitted_parameters
     devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:email, :password, :bio) } if defined?(ActionController::StrongParameters)

data/test/rails_app/app/controllers/free_invitations_controller.rb

@@ -3,4 +3,10 @@ class FreeInvitationsController < Devise::InvitationsController
   def authenticate_inviter!
   # everyone can invite
   end
+  def current_inviter
+    current_admin || current_user
+  end
+  def after_invite_path_for(resource)
+    resource ? super : root_path
+  end
 end

data/test/rails_app/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,17 @@
+<h2>Log in</h2>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, autofocus: true %></div>
+
+  <div><%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "off" %></div>
+
+  <% if devise_mapping.rememberable? -%>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+  <% end -%>
+
+  <div><%= f.submit "Log in" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
+- LICENSE
+- README.rdoc
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
 - app/views/devise/invitations/edit.html.erb
@@ -90,9 +93,6 @@ files:
 - lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb
 - lib/generators/devise_invitable/views_generator.rb
 - lib/generators/mongoid/devise_invitable_generator.rb
-- LICENSE
-- README.rdoc
-- CHANGELOG
 - test/functional/controller_helpers_test.rb
 - test/functional/registrations_controller_test.rb
 - test/generators/views_generator_test.rb
@@ -117,6 +117,7 @@ files:
 - test/rails_app/app/models/octopussy.rb
 - test/rails_app/app/models/user.rb
 - test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/devise/sessions/new.html.erb
 - test/rails_app/app/views/free_invitations/new.html.erb
 - test/rails_app/app/views/home/index.html.erb
 - test/rails_app/app/views/layouts/application.html.erb
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise
@@ -196,6 +197,7 @@ test_files:
 - test/rails_app/app/models/octopussy.rb
 - test/rails_app/app/models/user.rb
 - test/rails_app/app/views/admins/new.html.erb
+- test/rails_app/app/views/devise/sessions/new.html.erb
 - test/rails_app/app/views/free_invitations/new.html.erb
 - test/rails_app/app/views/home/index.html.erb
 - test/rails_app/app/views/layouts/application.html.erb