devise_invitable 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c29d1de12fe88af51d1a7e23efd9829db040271
-  data.tar.gz: e4ea042b56eac21a082f284d66b2f0d129555a83
+  metadata.gz: babfb02e4177cd88fe44772401f61014f8b462ea
+  data.tar.gz: 1302cfd7ca394b79ed9f250fe49e9753c4ea0ac8
 SHA512:
-  metadata.gz: d11eadb4b2f24ca4500a85fbb7c0636c7cca291f2b43dd9af7321bce5a88942e286fe2412ad4a51ae1556cf4441f7244e8910ccac189751a8b073a54510a1335
-  data.tar.gz: a1e51d0f15d30630bbf44f04d1ef7fcabc279ea405f931a0ef390939bfd5ce71d3dc117a178f927d081634344aba03eb96904f04199bbf53558b05d3f6d18351
+  metadata.gz: ec68260bfce3d59a7365e60e14d756815b85f8c65260cc5df7f74cdd5cc0cf443176a4ec8468e91c667150d88e7676bf5acbea6a5c7b30211e2dc76d5d6d9d56
+  data.tar.gz: d4213cdfc200c4ba8fd5fee2eb0251cf2b892b6663caa0a9a7e307d62f2819307fcb00f43193d92815e8196277208994471f2a329c95931766cb13e5ef6f2cdb

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 1.6.1
+
+- Support 2 arguments on after_invite_path_for, inviter and invitee
+- Support mongoid 6.0 (use :optional on invited_by relation)
+- Support devise 4.1
+
 = 1.6.0
 
 - Support devise 4.0 and rails 5.0

data/README.rdoc

@@ -1,5 +1,5 @@
 = DeviseInvitable
-{<img src="https://badge.fury.io/rb/devise_invitable.svg"/>}[http://badge.fury.io/rb/devise_invitable] {<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable]
+{<img src="https://badge.fury.io/rb/devise_invitable.svg"/>}[http://badge.fury.io/rb/devise_invitable] {<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable] 
 
 It adds support to devise[https://github.com/plataformatec/devise] for sending invitations by email (it requires to be authenticated) and accept the invitation setting the password.
 
@@ -18,7 +18,7 @@ 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',           '~> 3.5.2'
-  gem 'devise_invitable', '~> 1.5.2'
+  gem 'devise_invitable', '~> 1.6.0'
 
 === Automatic installation
 
@@ -283,6 +283,11 @@ You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class metho
 
   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. 
+
+  user = User.find_by_invitation_token(params[:invitation_token], true)
 
 
 === Accept an invitation
@@ -321,7 +326,7 @@ A pair of scopes to find those users that have accepted, and those that have not
 Since the invitations controller take care of all the creation/acceptation of an invitation, in most cases you wouldn't call the <tt>invite!</tt> and <tt>accept_invitation!</tt> methods directly.
 Instead, in your views, put a link to <tt>new_user_invitation_path</tt> or <tt>new_invitation_path(:user)</tt> or even <tt>/users/invitation/new</tt> to prepare and send an invitation (to a user in this example).
 
-After an invitation is created and sent, the inviter will be redirected to after_invite_path_for(resource_name), which is stored path or the same path as after_sign_in_path_for by default.
+After an invitation is created and sent, the inviter will be redirected to after_invite_path_for(inviter, invitee), which is stored path or the same path as after_sign_in_path_for by default.
 
 After an invitation is accepted, the invitee will be redirected to after_accept_path_for(resource), which is the same path as after_sign_in_path_for by default. If you want to override the path, override invitations controller and define after_accept_path_for method. This is useful in the common case that a user is invited to a specific location in your application. More on {Devise's README}[https://github.com/plataformatec/devise], "Controller filters and helpers" section.
 
@@ -397,6 +402,8 @@ The DeviseInvitable mailer uses the same pattern as Devise to create mail subjec
 
 Take a look at the generated locale file (in <tt>config/locales/devise_invitable.en.yml</tt>) to check all available messages.
 
+Translations are not included in gem (and they won't), they are available at wiki[https://github.com/scambra/devise_invitable/wiki/I18n].
+
 == Other ORMs
 
 DeviseInvitable supports ActiveRecord and Mongoid, like Devise.

data/app/controllers/devise/invitations_controller.rb

@@ -32,7 +32,11 @@ class Devise::InvitationsController < DeviseController
       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(current_inviter)
+      if self.method(:after_invite_path_for).arity == 1
+        respond_with resource, :location => after_invite_path_for(current_inviter)
+      else
+        respond_with resource, :location => after_invite_path_for(current_inviter, resource)
+      end
     else
       respond_with_navigational(resource) { render :new }
     end
@@ -117,4 +121,3 @@ class Devise::InvitationsController < DeviseController
     'devise.invitations'
   end
 end
-

data/lib/devise_invitable/controllers/helpers.rb

@@ -4,8 +4,8 @@ module DeviseInvitable::Controllers::Helpers
   included do
   end
   
-  def after_invite_path_for(resource)
-    after_sign_in_path_for(resource)
+  def after_invite_path_for(inviter, invitee = nil)
+    after_sign_in_path_for(inviter)
   end
   
   def after_accept_path_for(resource)

data/lib/devise_invitable/model.rb

@@ -41,12 +41,14 @@ module Devise
           counter_cache = Devise.invited_by_counter_cache
           belongs_to_options.merge! :counter_cache => counter_cache if counter_cache
           belongs_to_options.merge! :optional => true if ActiveRecord::VERSION::MAJOR >= 5
+        elsif defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document && Mongoid::VERSION >= '6.0.0'
+          belongs_to_options.merge! :optional => true
         end
         belongs_to :invited_by, belongs_to_options
 
-        include ActiveSupport::Callbacks
-        define_callbacks :invitation_created
-        define_callbacks :invitation_accepted
+        extend ActiveModel::Callbacks
+        define_model_callbacks :invitation_created
+        define_model_callbacks :invitation_accepted
 
         scope :no_active_invitation, lambda { where(:invitation_token => nil) }
         if defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document
@@ -88,12 +90,12 @@ module Devise
       # Accept an invitation by clearing invitation token and and setting invitation_accepted_at
       # Saves the model and confirms it if model is confirmable, running invitation_accepted callbacks
       def accept_invitation!
-        @accepting_invitation = true
-        if self.invited_to_sign_up? && self.valid?
+        if self.invited_to_sign_up?
+          @accepting_invitation = true
           run_callbacks :invitation_accepted do
             self.accept_invitation
             self.confirmed_at = self.invitation_accepted_at if self.respond_to?(:confirmed_at)
-            self.save(:validate => false)
+            self.save
           end
         end
       end
@@ -105,7 +107,7 @@ module Devise
 
       # Verifies whether a user has been invited or not
       def invited_to_sign_up?
-        persisted? && invitation_token.present?
+        accepting_invitation? || (persisted? && invitation_token.present?)
       end
 
       # Returns true if accept_invitation! was called
@@ -113,12 +115,12 @@ module Devise
         @accepting_invitation
       end
 
-      # Verifies whether a user accepted an invitation (or is accepting it)
+      # Verifies whether a user accepted an invitation (false when user is accepting it)
       def invitation_accepted?
-        invitation_accepted_at.present?
+        !accepting_invitation? && invitation_accepted_at.present?
       end
 
-      # Verifies whether a user has accepted an invitation (or is accepting it), or was never invited
+      # Verifies whether a user has accepted an invitation (false when user is accepting it), or was never invited
       def accepted_or_not_invited?
         invitation_accepted? || !invited_to_sign_up?
       end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

data/test/functional/controller_helpers_test.rb

@@ -6,32 +6,37 @@ class ControllerHelpersTest < ActionController::TestCase
   test "after invite path defaults to after sign in path" do
     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.send(:after_sign_in_path_for, :user), @controller.after_accept_path_for(:user)
   end
-  
+
   test 'after invite path is customizable from application controller' do
     custom_path = 'customized/after/invite/path'
     @controller.instance_eval "def after_invite_path_for(resource) '#{custom_path}' end"
     assert_equal @controller.after_invite_path_for(:user), custom_path
   end
-  
+
+  test 'after invite path is customizable from application controller with invited' do
+    custom_path = 'customized/after/invite/path'
+    @controller.instance_eval "def after_invite_path_for(resource, invited) '#{custom_path}' end"
+    assert_equal @controller.after_invite_path_for(:user, :invited), custom_path
+  end
   test 'after accept path is customizable from application controller' do
     custom_path = 'customized/after/accept/path'
     @controller.instance_eval "def after_accept_path_for(resource) '#{custom_path}' end"
     assert_equal @controller.after_accept_path_for(:user), custom_path
   end
-  
+
   test 'is not a devise controller' do
     assert !@controller.devise_controller?
   end
-  
+
   test 'invitations controller respects definition for after invite path in application controller' do
     assert Devise::InvitationsController.method_defined? :after_invite_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_invite_path_for)
   end
-  
+
   test 'invitations controller respects definition for after accept path in application controller' do
     assert Devise::InvitationsController.method_defined? :after_accept_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_accept_path_for)

data/test/models/invitable_test.rb

@@ -193,16 +193,16 @@ class InvitableTest < ActiveSupport::TestCase
   end
 
   test 'should not accept invite without password' do
-    user = User.invite!(:email => "valid@email.com")
-    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
-    refute_predicate user, :invitation_accepted?
+    User.invite!(:email => "valid@email.com")
+    User.accept_invitation!(:invitation_token => Thread.current[:token])
+    refute_predicate User.where(:email => 'valid@email.com').first, :invitation_accepted?
   end
 
   test 'should accept invite without password if enforce is disabled' do
     Devise.stubs(:require_password_on_accepting => false)
-    user = User.invite!(:email => "valid@email.com")
-    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
-    assert_predicate user, :invitation_accepted?
+    User.invite!(:email => "valid@email.com")
+    User.accept_invitation!(:invitation_token => Thread.current[:token])
+    assert_predicate User.where(:email => 'valid@email.com').first, :invitation_accepted?
   end
 
   test 'should set password and password confirmation from params' do
@@ -607,12 +607,14 @@ class InvitableTest < ActiveSupport::TestCase
     user.accept_invitation!
 
     assert user.confirmed?
+    refute user.changed?
   end
 
   test 'user.accept_invitation! should not confirm user if validation fails' do
     user = User.invite!(:email => "valid@email.com")
     user.username='a'*50
     user.accept_invitation!
+    user.reload
 
     refute_predicate user, :confirmed?
   end
@@ -652,23 +654,28 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should pass validation before accept if field is required in post-invited instance' do
     user = User.invite!(:email => "valid@email.com")
     user.testing_accepted_or_not_invited = true
-    assert_equal true, user.valid?
+    user.valid?
+    assert_empty user.errors
   end
 
   test 'should fail validation after accept if field is required in post-invited instance' do
     user = User.invite!(:email => "valid@email.com")
     user.testing_accepted_or_not_invited = true
-    user.accept_invitation!
-    assert_equal false, user.valid?
+    assert_predicate user, :accept_invitation!
+    user = User.where(:email => "valid@email.com").first
+    user.valid?
+    refute_empty user.errors
   end
 
   test 'should pass validation after accept if field is required in post-invited instance' do
     user = User.invite!(:email => "valid@email.com")
     user.username = 'test'
     user.testing_accepted_or_not_invited = true
+    assert_predicate user, :accept_invitation!
+    user = User.where(:email => "valid@email.com").first
     user.bio = "Test"
-    user.accept_invitation!
-    assert_equal true, user.valid?
+    user.valid?
+    assert_empty user.errors
   end
 
   test 'should return instance with errors if invitation_token is nil' do

data/test/rails_app/config/environments/test.rb

@@ -28,6 +28,10 @@ RailsApp::Application.configure do
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
+  if Rails.version >= '4.2' && config.respond_to?(:active_record)
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 

data/test/rails_app/config/initializers/devise.rb

@@ -172,7 +172,7 @@ Devise.setup do |config|
   # Email regex used to validate email formats. It simply asserts that
   # an one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this

data/test/test_helper.rb

@@ -20,5 +20,15 @@ class ActionDispatch::IntegrationTest
   include Capybara::DSL
 end
 class ActionController::TestCase
-  include Devise::TestHelpers
+  if defined? Devise::Test
+    include Devise::Test::ControllerHelpers
+  else
+    include Devise::TestHelpers
+  end
+  if Rails.version >= '5.0.0'
+    self.use_transactional_tests = true
+  else
+    require 'test_after_commit' rescue nil
+    self.use_transactional_fixtures = true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-08-04 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.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise