devise_invitable 0.4.rc3 → 0.4.rc4

data/lib/devise_invitable.rb

@@ -8,10 +8,23 @@ require 'devise_invitable/controllers/helpers'
 require 'devise_invitable/rails'
 
 module Devise
-  # The period the generated invitation token is valid.
+  # Public: Validity period of the invitation token (default: 0). If 
+  # invite_for is 0 or nil, the invitation will never expire.
+  # Set invite_for in the Devise configuration file (in config/initializers/devise.rb).
+  #
+  #   config.invite_for = 2.weeks # => The invitation token will be valid 2 weeks
   mattr_accessor :invite_for
   @@invite_for = 0
 
+  # Public: Flag that force a record to be valid before being actually invited 
+  # (default: false).
+  #
+  # Examples (in config/initializers/devise.rb)
+  #
+  #   config.validate_on_invite = true
+  mattr_accessor :validate_on_invite
+  @@validate_on_invite = false
+
   # Public: number of invitations the user is allowed to send
   #
   # Examples (in config/initializers/devise.rb)
@@ -20,7 +33,11 @@ module Devise
   mattr_accessor :invitation_limit
   @@invitation_limit = nil
   
-  # The key to be used to check existing users when sending an invitation
+  # Public: The key to be used to check existing users when sending an invitation
+  #
+  # Examples (in config/initializers/devise.rb)
+  #
+  #   config.invite_key = :email
   mattr_accessor :invite_key
   @@invite_key = :email
 end

data/lib/devise_invitable/model.rb

@@ -55,11 +55,11 @@ module Devise
       # Reset invitation token and send invitation again
       def invite!
         if new_record? || invited?
+          @skip_password = true
           self.skip_confirmation! if self.new_record? && self.respond_to?(:skip_confirmation!)
           generate_invitation_token if self.invitation_token.nil?
           self.invitation_sent_at = Time.now.utc
-          save(:validate => false)
-          ::Devise.mailer.invitation_instructions(self).deliver
+          save(:validate => self.class.validate_on_invite) && !!deliver_invitation
         end
       end
 
@@ -77,6 +77,16 @@ module Devise
 
       protected
 
+        # Overriding the method in Devise's :validatable module so password is not required on inviting
+        def password_required?
+          !@skip_password && super
+        end
+
+        # Deliver the invitation email
+        def deliver_invitation
+          ::Devise.mailer.invitation_instructions(self).deliver
+        end
+
         # Clear invitation token when reset password token is cleared too
         def clear_reset_password_token
           self.invitation_token = nil if invited?
@@ -153,6 +163,7 @@ module Devise
         end
 
         Devise::Models.config(self, :invite_for)
+        Devise::Models.config(self, :validate_on_invite)
         Devise::Models.config(self, :invitation_limit)
         Devise::Models.config(self, :invite_key)
       end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.4.rc3'
+  VERSION = '0.4.rc4'
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,12 +1,12 @@
 class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     change_table :<%= table_name %> do |t|
-      t.string   :invitation_token, :limit => 60
-      t.datetime :invitation_sent_at
-      t.integer  :invitation_limit
-      t.integer  :invited_by_id
-      t.index    :invitation_token # for invitable
-      t.index    :invited_by_id
+      t.string     :invitation_token, :limit => 60
+      t.datetime   :invitation_sent_at
+      t.integer    :invitation_limit
+      t.references :invited_by, :polymorphic => true
+      t.index      :invitation_token # for invitable
+      t.index      :invited_by_id
     end
     
     # And allow null encrypted_password and password_salt:
@@ -17,9 +17,9 @@ class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration
   end
   
   def self.down
-    remove_column :<%= table_name %>, :invited_by_id
-    remove_column :<%= table_name %>, :invitation_limit
-    remove_column :<%= table_name %>, :invitation_sent_at
-    remove_column :<%= table_name %>, :invitation_token
+    change_table :<%= table_name %> do |t|
+      remove_references :invited_by, :polymorphic => true
+      remove :invitation_limit, :invitation_sent_at, :invitation_token
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 15424195
+  hash: 15424205
   prerelease: 4
   segments: 
   - 0
   - 4
   - rc
-  - 3
-  version: 0.4.rc3
+  - 4
+  version: 0.4.rc4
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency