devise_invitable 1.1.7 → 1.1.8

data/README.rdoc

@@ -169,6 +169,13 @@ If you want to create the invitation but not send it, you can set <tt>skip_invit
   end
   # => the record will be created, but the invitation email will not be sent
 
+When skip_invitation is used, you must also then set the invitation_sent_at field when the user is sent their 
+token. Failure to do so will yield "Invalid invitation token" errors when the user attempts to accept the invite.
+You can set it like so:
+
+  user.invitation_sent_at = Time.now.utc
+  user.save!
+
 You can add :skip_invitation to attributes hash if skip_invitation is added to attr_accessible.
 
   User.invite!(:email => "new_user@example.com", :name => "John Doe", :skip_invitation => true)

data/app/controllers/devise/invitations_controller.rb

@@ -1,9 +1,9 @@
 class Devise::InvitationsController < DeviseController
 
-  before_filter :authenticate_inviter!, :only => [:new, :create]
-  before_filter :has_invitations_left?, :only => [:create]
-  before_filter :require_no_authentication, :only => [:edit, :update, :destroy]
-  before_filter :resource_from_invitation_token, :only => [:edit, :destroy]
+  prepend_before_filter :authenticate_inviter!, :only => [:new, :create]
+  prepend_before_filter :has_invitations_left?, :only => [:create]
+  prepend_before_filter :require_no_authentication, :only => [:edit, :update, :destroy]
+  prepend_before_filter :resource_from_invitation_token, :only => [:edit, :destroy]
   helper_method :after_sign_in_path_for
 
   # GET /resource/invitation/new

data/lib/devise_invitable/model.rb

@@ -41,12 +41,12 @@ module Devise
 
         attr_writer :skip_password
 
-        scope :active, lambda { where(:confirmation_token => nil) }
+        scope :active, lambda { where(:invitation_token => nil) }
         if defined?(Mongoid) && self < Mongoid::Document
-          scope :invitation_not_accepted, lambda { where(:invitation_accepted_at => nil, :confirmation_token.ne => nil) }
+          scope :invitation_not_accepted, lambda { where(:invitation_accepted_at => nil, :invitation_token.ne => nil) }
           scope :invitation_accepted, lambda { where(:invitation_accepted_at.ne => nil) }
         else
-          scope :invitation_not_accepted, lambda { where(arel_table[:confirmation_token].not_eq(nil)).where(:invitation_accepted_at => nil) }
+          scope :invitation_not_accepted, lambda { where(arel_table[:invitation_token].not_eq(nil)).where(:invitation_accepted_at => nil) }
           scope :invitation_accepted, lambda { where(arel_table[:invitation_accepted_at].not_eq(nil)) }
 
           [:before_invitation_accepted, :after_invitation_accepted].each do |callback_method|
@@ -124,7 +124,7 @@ module Devise
 
         # Required to workaround confirmable model's confirmation_required? method
         # being implemented to check for non-nil value of confirmed_at
-        if self.new_record? && self.respond_to?(:confirmation_required?)
+        if self.new_record? && self.respond_to?(:confirmation_required?, true)
           def self.confirmation_required?; false; end
         end
 
@@ -133,8 +133,8 @@ module Devise
         self.invited_by = invited_by if invited_by
 
         # Call these before_validate methods since we aren't validating on save
-        self.downcase_keys if self.new_record? && self.respond_to?(:downcase_keys)
-        self.strip_whitespace if self.new_record? && self.respond_to?(:strip_whitespace)
+        self.downcase_keys if self.new_record? && self.respond_to?(:downcase_keys, true)
+        self.strip_whitespace if self.new_record? && self.respond_to?(:strip_whitespace, true)
 
         if save(:validate => false)
           self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
@@ -173,7 +173,7 @@ module Devise
         end
 
         def confirmation_required_for_invited?
-          respond_to?(:confirmation_required?) && confirmation_required? && invitation_accepted?
+          respond_to?(:confirmation_required?, true) && confirmation_required? && invitation_accepted?
         end
 
         # Deliver the invitation email

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-01 00:00:00 Z
+date: 2013-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,23 +34,22 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: railties
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: railties
+  name: actionmailer
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -65,18 +64,19 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: devise
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 15
         segments: 
-        - 3
-        - 0
-        version: "3.0"
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id004
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.