devise_invitable 0.3.4 → 0.4.rc5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. data/README.rdoc +51 -42
  2. data/app/controllers/devise/invitations_controller.rb +27 -6
  3. data/app/views/devise/mailer/invitation_instructions.html.erb +8 -0
  4. data/config/locales/en.yml +5 -3
  5. data/lib/devise_invitable/controllers/helpers.rb +1 -6
  6. data/lib/devise_invitable/mailer.rb +8 -2
  7. data/lib/devise_invitable/model.rb +70 -37
  8. data/lib/devise_invitable/rails.rb +1 -1
  9. data/lib/devise_invitable/routes.rb +8 -5
  10. data/lib/devise_invitable/schema.rb +27 -2
  11. data/lib/devise_invitable/version.rb +3 -0
  12. data/lib/devise_invitable.rb +37 -8
  13. data/lib/generators/active_record/templates/migration.rb +14 -7
  14. data/lib/generators/devise_invitable/devise_invitable_generator.rb +4 -0
  15. data/lib/generators/devise_invitable/install_generator.rb +17 -2
  16. data/lib/generators/mongoid/devise_invitable_generator.rb +8 -0
  17. metadata +52 -142
  18. data/.document +0 -5
  19. data/.gitignore +0 -22
  20. data/Gemfile +0 -3
  21. data/Gemfile.lock +0 -108
  22. data/Rakefile +0 -55
  23. data/VERSION +0 -1
  24. data/devise_invitable.gemspec +0 -146
  25. data/test/generators_test.rb +0 -45
  26. data/test/integration/invitable_test.rb +0 -109
  27. data/test/integration_tests_helper.rb +0 -58
  28. data/test/mailers/invitation_test.rb +0 -62
  29. data/test/model_tests_helper.rb +0 -41
  30. data/test/models/invitable_test.rb +0 -188
  31. data/test/models_test.rb +0 -31
  32. data/test/rails_app/app/controllers/admins_controller.rb +0 -6
  33. data/test/rails_app/app/controllers/application_controller.rb +0 -3
  34. data/test/rails_app/app/controllers/home_controller.rb +0 -4
  35. data/test/rails_app/app/controllers/users_controller.rb +0 -12
  36. data/test/rails_app/app/helpers/application_helper.rb +0 -2
  37. data/test/rails_app/app/models/octopussy.rb +0 -11
  38. data/test/rails_app/app/models/user.rb +0 -4
  39. data/test/rails_app/app/views/home/index.html.erb +0 -0
  40. data/test/rails_app/app/views/layouts/application.html.erb +0 -15
  41. data/test/rails_app/app/views/users/invitations/new.html.erb +0 -15
  42. data/test/rails_app/config/application.rb +0 -46
  43. data/test/rails_app/config/boot.rb +0 -13
  44. data/test/rails_app/config/database.yml +0 -22
  45. data/test/rails_app/config/environment.rb +0 -5
  46. data/test/rails_app/config/environments/development.rb +0 -26
  47. data/test/rails_app/config/environments/production.rb +0 -49
  48. data/test/rails_app/config/environments/test.rb +0 -35
  49. data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  50. data/test/rails_app/config/initializers/devise.rb +0 -144
  51. data/test/rails_app/config/initializers/inflections.rb +0 -10
  52. data/test/rails_app/config/initializers/mime_types.rb +0 -5
  53. data/test/rails_app/config/initializers/secret_token.rb +0 -7
  54. data/test/rails_app/config/initializers/session_store.rb +0 -8
  55. data/test/rails_app/config/locales/en.yml +0 -5
  56. data/test/rails_app/config/routes.rb +0 -4
  57. data/test/rails_app/config.ru +0 -4
  58. data/test/rails_app/script/rails +0 -6
  59. data/test/routes_test.rb +0 -20
  60. data/test/test_helper.rb +0 -30
data/README.rdoc CHANGED
@@ -2,26 +2,26 @@
2
2
 
3
3
  It adds support to devise[http://github.com/plataformatec/devise] for send invitations by email (it requires to be authenticated) and accept the invitation setting the password.
4
4
 
5
- DeviseInvitable currently only support rails 3, if you want to use it with rails 2.3 you must install version 0.2.3
5
+ DeviseInvitable currently only support Rails 3, if you want to use it with Rails 2.3 you must install version {0.2.3}[http://rubygems.org/gems/devise_invitable/versions/0.2.3]
6
6
 
7
- == Installation for Rails ~> 3.0.0 and Devise ~> 1.1.2
7
+ == Installation for Rails ~> 3.0 and Devise ~> 1.1
8
8
 
9
- Install devise_invitable gem, it should install dependencies (such as devise and warden):
9
+ Install DeviseInvitable gem, it will also install dependencies (such as devise and warden):
10
10
 
11
- sudo gem install devise_invitable
11
+ gem install devise_invitable
12
12
 
13
- Configure devise_invitable in your Gemfile (and devise if you weren't using them):
13
+ Add DeviseInvitable to your Gemfile (and Devise if you weren't using them):
14
14
 
15
- gem 'devise'
16
- gem 'devise_invitable'
15
+ gem 'devise', '~> 1.1.3'
16
+ gem 'devise_invitable', '~> 0.3.4'
17
17
 
18
18
  === Automatic installation
19
19
 
20
- After you install DeviseInvitable and add it to your Gemfile, you need to run the generator:
20
+ Run the following generator to add DeviseInvitable’s configuration option in the Devise configuration file (config/initializers/devise.rb):
21
21
 
22
22
  rails generate devise_invitable:install
23
23
 
24
- The generator will inject DeviseInvitable’s configuration options and you should take a look at it. When you are done, you are ready to add DeviseInvitable to any of your Devise models using the generator:
24
+ When you are done, you are ready to add DeviseInvitable to any of your Devise models using the following generator:
25
25
 
26
26
  rails generate devise_invitable MODEL
27
27
 
@@ -31,7 +31,7 @@ Replace MODEL by the class name you want to add DeviseInvitable, like User, Admi
31
31
 
32
32
  Follow the walkthrough for Devise and after it's done, follow this walkthrough.
33
33
 
34
- Add :invitable to the Devise line in your model (we’re assuming here you already have a User model with some Devise modules):
34
+ Add :invitable to the <tt>devise</tt> call in your model (we’re assuming here you already have a User model with some Devise modules):
35
35
 
36
36
  class User < ActiveRecord::Base
37
37
  devise :database_authenticatable, :confirmable, :invitable
@@ -46,39 +46,42 @@ Add t.invitable to your Devise model migration:
46
46
  end
47
47
  add_index :users, :invitation_token
48
48
 
49
- or for a model that is already created, define a migration to add DeviseInvitable to your model:
49
+ or for a model that already exists, define a migration to add DeviseInvitable to your model:
50
50
 
51
51
  change_table :users do |t|
52
- t.string :invitation_token, :limit => 20
52
+ t.string :invitation_token, :limit => 60
53
53
  t.datetime :invitation_sent_at
54
54
  t.index :invitation_token
55
55
  end
56
56
 
57
- # Allow null encrypted_password and password_salt
58
- change_column :users, :encrypted_password, :string, :null => true
59
- change_column :users, :password_salt, :string, :null => true
60
-
61
- DeviseInvitable doesn't use _attr_accessible_ or _attr_protected_, so be sure to define attributes as accessible or protected in your model.
57
+ # Allow null encrypted_password
58
+ change_column_null :users, :encrypted_password, true
59
+ # Allow null password_salt (add it if you are using Devise's encryptable module)
60
+ change_column_null :users, :password_salt, true
62
61
 
63
62
  == Model configuration
64
63
 
65
- DeviseInvitable adds a new configuration option:
64
+ DeviseInvitable adds three new configuration options:
66
65
 
67
- * invite_for => The validity duration for an invitation. Default is 0, which means invitations doesn't expire.
66
+ * invite_for: The period the generated invitation token is valid, after this period, the invited resource won't be able to accept the invitation. When invite_for is 0 (the default), the invitation won't expire.
68
67
 
69
- You can set those configuration options in the Devise initializer as follow:
68
+ You can set this configuration option in the Devise initializer as follow:
70
69
 
71
70
  # ==> Configuration for :invitable
72
- # Time interval where the invitation token is valid.
73
- # If invite_for is 0 or nil, the invitation will never expire.
74
- # Default: 0
71
+ # The period the generated invitation token is valid, after
72
+ # this period, the invited resource won't be able to accept the invitation.
73
+ # When invite_for is 0 (the default), the invitation won't expire.
75
74
  # config.invite_for = 2.weeks
76
75
 
77
- or directly as parameters to the <tt>devise</tt> method inside your Devise models:
76
+ or directly as parameters to the <tt>devise</tt> method:
78
77
 
79
78
  devise :database_authenticatable, :confirmable, :invitable, :invite_for => 2.weeks
80
79
 
81
- For details, see <tt>config/initializer/devise.rb</tt> (after you invoked the "devise_invitable:install" generator described above).
80
+ * invitation_limit: The number of invitations users can send. The default value of nil means users can send as many invites as they want. A setting of 0 means they can't send invitations. A setting n > 0 means they can send n invitations.
81
+
82
+ * invite_key: The key to be used to check existing users when sending an invitation. The key must be an unique field. The default value is looking for users by email.
83
+
84
+ For more details, see <tt>config/initializers/devise.rb</tt> (after you invoked the "devise_invitable:install" generator described above).
82
85
 
83
86
  == Configuring views
84
87
 
@@ -96,31 +99,35 @@ Please refer to {Devise's README}[http://github.com/plataformatec/devise] for mo
96
99
 
97
100
  === Send an invitation
98
101
 
99
- To send an invitation to a user, use the <tt>invite!</tt> class method. You must set <tt>email</tt> in the parameters hash:
100
- You can also include other attributes in the hash. The record will not be validated.
102
+ 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.
101
103
 
102
- User.invite(:email => "new_user@example.com", :name => "John Doe")
104
+ User.invite!(:email => "new_user@example.com", :name => "John Doe")
103
105
  # => an invitation email will be sent to new_user@example.com
104
106
 
105
107
  === Accept an invitation
106
108
 
107
- To accept an invitation with a token use the <tt>accept_invitation</tt> class method. You must set <tt>invitation_token</tt> in the parameters hash. You can include other attributes in the hash (as in the <tt>update_attributes</tt> method for example).
109
+ To accept an invitation with a token use the <tt>accept_invitation!</tt> class method. <tt>:invitation_token</tt> must be present in the parameters hash. You can also include other attributes in the hash.
108
110
 
109
- User.accept_invitation(:invitation_token => params[:invitation_token], :password => "ad97nwj3o2", :name => "John Doe")
111
+ User.accept_invitation!(:invitation_token => params[:invitation_token], :password => "ad97nwj3o2", :name => "John Doe")
110
112
 
111
113
  == Integration in a Rails application
112
114
 
113
- Since the invitations controller take care of all the invite/accept invitation process, in most cases you wouldn't call the <tt>invite</tt> and <tt>accept_invitation</tt> methods directly.
114
- 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.
115
- This email includes a link to accept the invitation like <tt>/users/invitation/accept?invitation_token=abcd123</tt>.
115
+ 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.
116
+ 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).
117
+ After an invitation is created and sent, the inviter will be redirected to after_sign_in_path_for(resource_name).
118
+
119
+ The invitation email includes a link to accept the invitation that looks like this: <tt>/users/invitation/accept?invitation_token=abcd123</tt>. When clicked, the invited must set a password in order to accept its invitation. Note that if the invitation_token is not present or not valid, the invited is redirected to after_sign_out_path_for(resource_name).
120
+ You can also overwrite after_sign_in_path_for and after_sign_out_path_for to customize your redirect hooks. More on {Devise's README}[http://github.com/plataformatec/devise], "Controller filters and helpers" section.
121
+
122
+ The controller sets the invited_by_id attribute for the new user to the current user. This will let you easily keep track of who invited who.
116
123
 
117
124
  == Controller filter
118
125
 
119
126
  InvitationsController uses authenticate_inviter! filter to restrict who can send invitations. You can override this method in your ApplicationController.
120
127
 
121
- Default behavior requires authentication of the same resource. For example, if your model User is <tt>:invitable</tt>, it will allow all authenticated users to send invitations to other users.
128
+ Default behavior requires authentication of the same resource as the invited one. For example, if your model User is invitable, it will allow all authenticated users to send invitations to other users.
122
129
 
123
- You would have a User model which is configured as invitable and an Admin model which is not. If you would like to allow only admins to send invitations, simply overwrite the authenticate_inviter! method as follow:
130
+ You would have a User model which is configured as invitable and an Admin model which is not. If you want to allow only admins to send invitations, simply overwrite the authenticate_inviter! method as follow:
124
131
 
125
132
  class ApplicationController < ActionController::Base
126
133
  protected
@@ -131,12 +138,13 @@ You would have a User model which is configured as invitable and an Admin model
131
138
 
132
139
  == I18n
133
140
 
134
- DeviseInvitable uses flash messages with I18n with the flash keys <tt>:send_instructions</tt> and <tt>:updated</tt>. To customize your app, you can modify the generated locale file:
141
+ DeviseInvitable uses flash messages with I18n with the flash keys <tt>:send_instructions</tt>, <tt>:invitation_token_invalid</tt> and <tt>:updated</tt>. To customize your app, you can modify the generated locale file:
135
142
 
136
143
  en:
137
144
  devise:
138
145
  invitations:
139
- send_instructions: 'An email with instructions about how to set the password has been sent.'
146
+ send_instructions: 'An invitation email has been sent to %{email}.'
147
+ invitation_token_invalid: 'The invitation token provided is not valid!'
140
148
  updated: 'Your password was set successfully. You are now signed in.'
141
149
 
142
150
  You can also create distinct messages based on the resource you've configured using the singular name given in routes:
@@ -145,17 +153,18 @@ You can also create distinct messages based on the resource you've configured us
145
153
  devise:
146
154
  invitations:
147
155
  user:
148
- send_instructions: 'A new user invitation has been sent.'
156
+ send_instructions: 'A new user invitation has been sent to %{email}.'
157
+ invitation_token_invalid: 'Your invitation token is not valid!'
149
158
  updated: 'Welcome on board! You are now signed in.'
150
159
 
151
- The DeviseInvitable mailer uses the Devise pattern to create subject messages:
160
+ The DeviseInvitable mailer uses the same pattern as Devise to create mail subject messages:
152
161
 
153
162
  en:
154
163
  devise:
155
164
  mailer:
156
- invitation:
165
+ invitation_instructions:
157
166
  subject: 'You got an invitation!'
158
- user_subject: 'You got an user invitation!'
167
+ user_subject: 'You got a user invitation!'
159
168
 
160
169
  Take a look at the generated locale file (in <tt>config/locales/devise_invitable.en.yml</tt>) to check all available messages.
161
170
 
@@ -169,7 +178,7 @@ Check them all at:
169
178
 
170
179
  http://github.com/scambra/devise_invitable/contributors
171
180
 
172
- Special thanks to rymai[http://github.com/rymai] for rails3 support, his fork was a great help.
181
+ Special thanks to rymai[http://github.com/rymai] for the Rails 3 support, his fork was a great help.
173
182
 
174
183
  == Note on Patches/Pull Requests
175
184
 
@@ -2,6 +2,7 @@ class Devise::InvitationsController < ApplicationController
2
2
  include Devise::Controllers::InternalHelpers
3
3
 
4
4
  before_filter :authenticate_inviter!, :only => [:new, :create]
5
+ before_filter :has_invitations_left?, :only => [:create]
5
6
  before_filter :require_no_authentication, :only => [:edit, :update]
6
7
  helper_method :after_sign_in_path_for
7
8
 
@@ -13,11 +14,15 @@ class Devise::InvitationsController < ApplicationController
13
14
 
14
15
  # POST /resource/invitation
15
16
  def create
16
- self.resource = resource_class.invite!(params[resource_name])
17
+ self.resource = resource_class.invite!(params[resource_name], current_inviter)
17
18
 
18
19
  if resource.errors.empty?
19
- set_flash_message :notice, :send_instructions
20
- redirect_to after_update_path_for(resource_name)
20
+ if resource_class.invitation_limit.present? && current_inviter
21
+ current_inviter.invitation_limit ||= resource_class.invitation_limit
22
+ current_inviter.decrement!(:invitation_limit)
23
+ end
24
+ set_flash_message :notice, :send_instructions, :email => self.resource.email
25
+ redirect_to after_sign_in_path_for(resource_name)
21
26
  else
22
27
  render_with_scope :new
23
28
  end
@@ -25,9 +30,12 @@ class Devise::InvitationsController < ApplicationController
25
30
 
26
31
  # GET /resource/invitation/accept?invitation_token=abcdef
27
32
  def edit
28
- self.resource = resource_class.new
29
- resource.invitation_token = params[:invitation_token]
30
- render_with_scope :edit
33
+ if params[:invitation_token] && self.resource = resource_class.first(:conditions => { :invitation_token => params[:invitation_token] })
34
+ render_with_scope :edit
35
+ else
36
+ set_flash_message(:alert, :invitation_token_invalid)
37
+ redirect_to after_sign_out_path_for(resource_name)
38
+ end
31
39
  end
32
40
 
33
41
  # PUT /resource/invitation
@@ -41,4 +49,17 @@ class Devise::InvitationsController < ApplicationController
41
49
  render_with_scope :edit
42
50
  end
43
51
  end
52
+
53
+ protected
54
+ def current_inviter
55
+ @current_inviter ||= authenticate_inviter!
56
+ end
57
+
58
+ def has_invitations_left?
59
+ unless current_inviter.nil? || current_inviter.has_invitations_left?
60
+ build_resource
61
+ set_flash_message :alert, :no_invitations_remaining
62
+ render_with_scope :new
63
+ end
64
+ end
44
65
  end
@@ -0,0 +1,8 @@
1
+ <p>Hello <%= @resource.email %>!</p>
2
+
3
+ <p>Someone has invited you to <%= root_url %>, you can accept it through the link below.</p>
4
+
5
+ <p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
6
+
7
+ <p>If you don't want to accept the invitation, please ignore this email.<br />
8
+ Your account won't be created until you access the link above and set your password.</p>
@@ -1,8 +1,10 @@
1
1
  en:
2
2
  devise:
3
3
  invitations:
4
- send_instructions: 'An email with instructions about how to set the password has been sent.'
4
+ send_instructions: 'An invitation email has been sent to %{email}.'
5
+ invitation_token_invalid: 'The invitation token provided is not valid!'
5
6
  updated: 'Your password was set successfully. You are now signed in.'
7
+ no_invitations_remaining: "No invitations remaining"
6
8
  mailer:
7
- invitiation:
8
- subject: 'Invitation'
9
+ invitation_instructions:
10
+ subject: 'Invitation instructions'
@@ -1,12 +1,7 @@
1
1
  module DeviseInvitable::Controllers::Helpers
2
2
  protected
3
- def authenticate_resource!
4
- ActiveSupport::Deprecation.warn('authenticate_resource! has been renamed to authenticate_inviter!')
5
- authenticate_inviter!
6
- end
7
-
8
3
  def authenticate_inviter!
9
- send(:"authenticate_#{resource_name}!")
4
+ send(:"authenticate_#{resource_name}!", true)
10
5
  end
11
6
  end
12
7
  ActionController::Base.send :include, DeviseInvitable::Controllers::Helpers
@@ -1,8 +1,14 @@
1
1
  module DeviseInvitable
2
2
  module Mailer
3
- # Deliver an invitation when is requested
3
+
4
+ # Deliver an invitation email
5
+ def invitation_instructions(record)
6
+ setup_mail(record, :invitation_instructions)
7
+ end
8
+
4
9
  def invitation(record)
5
- setup_mail(record, :invitation)
10
+ ActiveSupport::Deprecation.warn('invitation has been renamed to invitation_instructions')
11
+ invitation_instructions(record)
6
12
  end
7
13
  end
8
14
  end
@@ -1,29 +1,34 @@
1
1
  module Devise
2
2
  module Models
3
- # Invitable is responsible to send emails with invitations.
4
- # When an invitation is sent to an email, an account is created for it.
5
- # An invitation has a link to set the password, as reset password from recoverable.
3
+ # Invitable is responsible for sending invitation emails.
4
+ # When an invitation is sent to an email address, an account is created for it.
5
+ # Invitation email contains a link allowing the user to accept the invitation
6
+ # by setting a password (as reset password from Devise's recoverable module).
6
7
  #
7
8
  # Configuration:
8
9
  #
9
- # invite_for: the time you want the user will have to confirm the account after
10
- # is invited. When invite_for is zero, the invitation won't expire.
11
- # By default invite_for is 0.
10
+ # invite_for: The period the generated invitation token is valid, after
11
+ # this period, the invited resource won't be able to accept the invitation.
12
+ # When invite_for is 0 (the default), the invitation won't expire.
12
13
  #
13
14
  # Examples:
14
15
  #
15
- # User.find(1).invited? # true/false
16
- # User.invite!(:email => 'someone@example.com') # send invitation
17
- # User.accept_invitation!(:invitation_token => '...') # accept invitation with a token
18
- # User.find(1).accept_invitation! # accept invitation
19
- # User.find(1).invite! # reset invitation status and send invitation again
16
+ # User.find(1).invited? # => true/false
17
+ # User.invite!(:email => 'someone@example.com') # => send invitation
18
+ # User.accept_invitation!(:invitation_token => '...') # => accept invitation with a token
19
+ # User.find(1).accept_invitation! # => accept invitation
20
+ # User.find(1).invite! # => reset invitation status and send invitation again
20
21
  module Invitable
21
22
  extend ActiveSupport::Concern
22
23
 
24
+ included do
25
+ belongs_to :invited_by, :polymorphic => true
26
+ end
27
+
23
28
  # Accept an invitation by clearing invitation token and confirming it if model
24
29
  # is confirmable
25
30
  def accept_invitation!
26
- if self.invited?
31
+ if self.invited? && self.valid?
27
32
  self.invitation_token = nil
28
33
  self.save
29
34
  end
@@ -34,26 +39,30 @@ module Devise
34
39
  persisted? && invitation_token.present?
35
40
  end
36
41
 
37
- # Send invitation by email
38
- def send_invitation
39
- ::Devise.mailer.invitation(self).deliver
42
+ # Return true if this user has invitations left to send
43
+ def has_invitations_left?
44
+ if self.class.invitation_limit.present?
45
+ if invitation_limit
46
+ return invitation_limit > 0
47
+ else
48
+ return self.class.invitation_limit > 0
49
+ end
50
+ else
51
+ return true
52
+ end
40
53
  end
41
54
 
42
55
  # Reset invitation token and send invitation again
43
56
  def invite!
44
57
  if new_record? || invited?
45
- self.skip_confirmation! if self.new_record? and self.respond_to? :skip_confirmation!
46
- generate_invitation_token
47
- save(:validate=>false)
48
- send_invitation
58
+ @skip_password = true
59
+ self.skip_confirmation! if self.new_record? && self.respond_to?(:skip_confirmation!)
60
+ generate_invitation_token if self.invitation_token.nil?
61
+ self.invitation_sent_at = Time.now.utc
62
+ save(:validate => self.class.validate_on_invite) && !!deliver_invitation
49
63
  end
50
64
  end
51
65
 
52
- def resend_invitation!
53
- ActiveSupport::Deprecation.warn('resend_invitation! has been renamed to invite!')
54
- self.invite!
55
- end
56
-
57
66
  # Verify whether a invitation is active or not. If the user has been
58
67
  # invited, we need to calculate if the invitation time has not expired
59
68
  # for this user, in other words, if the invitation is still valid.
@@ -61,8 +70,29 @@ module Devise
61
70
  invited? && invitation_period_valid?
62
71
  end
63
72
 
73
+ # Only verify password when is not invited
74
+ def valid_password?(password)
75
+ super unless invited?
76
+ end
77
+
64
78
  protected
65
79
 
80
+ # Overriding the method in Devise's :validatable module so password is not required on inviting
81
+ def password_required?
82
+ !@skip_password && super
83
+ end
84
+
85
+ # Deliver the invitation email
86
+ def deliver_invitation
87
+ ::Devise.mailer.invitation_instructions(self).deliver
88
+ end
89
+
90
+ # Clear invitation token when reset password token is cleared too
91
+ def clear_reset_password_token
92
+ self.invitation_token = nil if invited?
93
+ super
94
+ end
95
+
66
96
  # Checks if the invitation for the user is within the limit time.
67
97
  # We do this by calculating if the difference between today and the
68
98
  # invitation sent date does not exceed the invite for time configured.
@@ -89,8 +119,7 @@ module Devise
89
119
  # Generates a new random token for invitation, and stores the time
90
120
  # this token is being generated
91
121
  def generate_invitation_token
92
- self.invitation_token = Devise.friendly_token
93
- self.invitation_sent_at = Time.now.utc
122
+ self.invitation_token = self.class.invitation_token
94
123
  end
95
124
 
96
125
  module ClassMethods
@@ -98,33 +127,29 @@ module Devise
98
127
  # user and send invitation to it. If user is found, returns the user with an
99
128
  # email already exists error.
100
129
  # Attributes must contain the user email, other attributes will be set in the record
101
- def invite!(attributes={})
102
- invitable = find_or_initialize_with_error_by(:email, attributes.delete(:email))
130
+ def invite!(attributes={}, invited_by=nil)
131
+ invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
103
132
  invitable.attributes = attributes
133
+ invitable.invited_by = invited_by
104
134
 
105
135
  if invitable.new_record?
106
- invitable.errors.clear if invitable.email.match Devise.email_regexp
136
+ invitable.errors.clear if invitable.email.try(:match, Devise.email_regexp)
107
137
  else
108
- invitable.errors.add(:email, :taken) unless invitable.invited?
138
+ invitable.errors.add(invite_key, :taken) unless invitable.invited?
109
139
  end
110
140
 
111
141
  invitable.invite! if invitable.errors.empty?
112
142
  invitable
113
143
  end
114
144
 
115
- def send_invitation(attributes = {})
116
- ActiveSupport::Deprecation.warn('send_invitation has been renamed to invite!')
117
- self.invite!(attributes)
118
- end
119
-
120
145
  # Attempt to find a user by it's invitation_token to set it's password.
121
146
  # If a user is found, reset it's password and automatically try saving
122
147
  # the record. If not user is found, returns a new user containing an
123
148
  # error in invitation_token attribute.
124
149
  # Attributes must contain invitation_token, password and confirmation
125
150
  def accept_invitation!(attributes={})
126
- invitable = find_or_initialize_with_error_by(:invitation_token, attributes[:invitation_token])
127
- invitable.errors.add(:invitation_token, :invalid) if attributes[:invitation_token] && !invitable.new_record? && !invitable.valid_invitation?
151
+ invitable = find_or_initialize_with_error_by(:invitation_token, attributes.delete(:invitation_token))
152
+ invitable.errors.add(:invitation_token, :invalid) if invitable.invitation_token && invitable.persisted? && !invitable.valid_invitation?
128
153
  if invitable.errors.empty?
129
154
  invitable.attributes = attributes
130
155
  invitable.accept_invitation!
@@ -132,7 +157,15 @@ module Devise
132
157
  invitable
133
158
  end
134
159
 
160
+ # Generate a token checking if one does not already exist in the database.
161
+ def invitation_token
162
+ generate_token(:invitation_token)
163
+ end
164
+
135
165
  Devise::Models.config(self, :invite_for)
166
+ Devise::Models.config(self, :validate_on_invite)
167
+ Devise::Models.config(self, :invitation_limit)
168
+ Devise::Models.config(self, :invite_key)
136
169
  end
137
170
  end
138
171
  end
@@ -2,7 +2,7 @@ module DeviseInvitable
2
2
  class Engine < ::Rails::Engine
3
3
 
4
4
  ActiveSupport.on_load(:action_controller) { include DeviseInvitable::Controllers::UrlHelpers }
5
- ActiveSupport.on_load(:action_view) { include DeviseInvitable::Controllers::UrlHelpers }
5
+ ActiveSupport.on_load(:action_view) { include DeviseInvitable::Controllers::UrlHelpers }
6
6
 
7
7
  config.after_initialize do
8
8
  require 'devise/mailer'
@@ -1,10 +1,13 @@
1
1
  module ActionDispatch::Routing
2
2
  class Mapper
3
- protected
4
- def devise_invitation(mapping, controllers)
5
- resource :invitation, :only => [:new, :create, :update], :path => mapping.path_names[:invitation], :controller => controllers[:invitations] do
6
- get :edit, :path => mapping.path_names[:accept], :as => :accept
7
- end
3
+
4
+ protected
5
+ def devise_invitation(mapping, controllers)
6
+ resource :invitation, :only => [:new, :create, :update],
7
+ :path => mapping.path_names[:invitation], :controller => controllers[:invitations] do
8
+ get :edit, :path => mapping.path_names[:accept], :as => :accept
8
9
  end
10
+ end
11
+
9
12
  end
10
13
  end
@@ -1,9 +1,34 @@
1
1
  module DeviseInvitable
2
2
  module Schema
3
- # Creates invitation_token and invitation_sent_at.
3
+ # Add invitation_token and invitation_sent_at columns in the resource's database table.
4
+ #
5
+ # Examples
6
+ #
7
+ # # For a new resource migration:
8
+ # create_table :the_resources do
9
+ # t.database_authenticatable :null => false # you need at least this
10
+ # t.invitable
11
+ # ...
12
+ # end
13
+ # add_index :the_resources, :invitation_token # for invitable
14
+ #
15
+ # # or if the resource's table already exists, define a migration and put this in:
16
+ # change_table :the_resources do |t|
17
+ # t.string :invitation_token, :limit => 60
18
+ # t.datetime :invitation_sent_at
19
+ # t.index :invitation_token # for invitable
20
+ # end
21
+ #
22
+ # # And allow encrypted_password to be null:
23
+ # change_column :the_resources, :encrypted_password, :string, :null => true
24
+ # # the following line is only if you use Devise's encryptable module!
25
+ # change_column :the_resources, :password_salt, :string, :null => true
4
26
  def invitable
5
- apply_devise_schema :invitation_token, String, :limit => 20
27
+ apply_devise_schema :invitation_token, String, :limit => 60
6
28
  apply_devise_schema :invitation_sent_at, DateTime
29
+ apply_devise_schema :invitation_limit, Integer
30
+ apply_devise_schema :invited_by_id, Integer
31
+ apply_devise_schema :invited_by_type, String
7
32
  end
8
33
  end
9
34
  end
@@ -0,0 +1,3 @@
1
+ module DeviseInvitable
2
+ VERSION = '0.4.rc5'
3
+ end
@@ -1,16 +1,45 @@
1
1
  require 'devise'
2
2
 
3
- module Devise
4
- # Time interval where the invitation token is valid.
5
- mattr_accessor :invite_for
6
- @@invite_for = 0
7
- end
8
-
9
- Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation
10
-
11
3
  require 'devise_invitable/mailer'
12
4
  require 'devise_invitable/routes'
13
5
  require 'devise_invitable/schema'
14
6
  require 'devise_invitable/controllers/url_helpers'
15
7
  require 'devise_invitable/controllers/helpers'
16
8
  require 'devise_invitable/rails'
9
+
10
+ module Devise
11
+ # Public: Validity period of the invitation token (default: 0). If
12
+ # invite_for is 0 or nil, the invitation will never expire.
13
+ # Set invite_for in the Devise configuration file (in config/initializers/devise.rb).
14
+ #
15
+ # config.invite_for = 2.weeks # => The invitation token will be valid 2 weeks
16
+ mattr_accessor :invite_for
17
+ @@invite_for = 0
18
+
19
+ # Public: Flag that force a record to be valid before being actually invited
20
+ # (default: false).
21
+ #
22
+ # Examples (in config/initializers/devise.rb)
23
+ #
24
+ # config.validate_on_invite = true
25
+ mattr_accessor :validate_on_invite
26
+ @@validate_on_invite = false
27
+
28
+ # Public: number of invitations the user is allowed to send
29
+ #
30
+ # Examples (in config/initializers/devise.rb)
31
+ #
32
+ # config.invitation_limit = nil
33
+ mattr_accessor :invitation_limit
34
+ @@invitation_limit = nil
35
+
36
+ # Public: The key to be used to check existing users when sending an invitation
37
+ #
38
+ # Examples (in config/initializers/devise.rb)
39
+ #
40
+ # config.invite_key = :email
41
+ mattr_accessor :invite_key
42
+ @@invite_key = :email
43
+ end
44
+
45
+ Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation