devise_invitable 0.5.6 → 0.5.7

data/app/controllers/devise/invitations_controller.rb

@@ -26,7 +26,7 @@ class Devise::InvitationsController < ApplicationController
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
-    if params[:invitation_token] && self.resource = resource_class.first(:conditions => { :invitation_token => params[:invitation_token] })
+    if params[:invitation_token] && self.resource = resource_class.to_adapter.find_first( :invitation_token => params[:invitation_token] )
       render_with_scope :edit
     else
       set_flash_message(:alert, :invitation_token_invalid)
@@ -55,7 +55,7 @@ class Devise::InvitationsController < ApplicationController
   def has_invitations_left?
     unless current_inviter.nil? || current_inviter.has_invitations_left?
       build_resource
-      set_flash_message :alert, :no_invitations_remaining 
+      set_flash_message :alert, :no_invitations_remaining
       respond_with_navigational(resource) { render_with_scope :new }
     end
   end
@@ -68,3 +68,4 @@ class Devise::InvitationsController < ApplicationController
     after_sign_in_path_for(resource)
   end
 end
+

data/lib/devise_invitable/model.rb

@@ -33,8 +33,8 @@ module Devise
       def accept_invitation!
         if self.invited? && self.valid?
           self.invitation_token = nil
-          self.invitation_accepted_at = Time.now.utc if has_attribute? :invitation_accepted_at
-          self.save
+          self.invitation_accepted_at = Time.now.utc # if has_attribute? :invitation_accepted_at
+          self.save(:validate => false)
         end
       end
 
@@ -46,11 +46,12 @@ module Devise
       # Reset invitation token and send invitation again
       def invite!
         @skip_password = true
+        was_invited = invited?
         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
-        if save(:validate => self.class.validate_on_invite)
-          self.invited_by.decrement_invitation_limit! if self.invited_by
+        if save(:validate => false)
+          self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
           deliver_invitation unless @skip_invitation
         end
       end
@@ -125,29 +126,30 @@ module Devise
           invitable.attributes = attributes
           invitable.invited_by = invited_by
 
+          invitable.valid? if self.validate_on_invite
           if invitable.new_record?
-            invitable.errors.clear if invitable.email.try(:match, Devise.email_regexp)
+            invitable.errors.clear if !self.validate_on_invite and invitable.email.try(:match, Devise.email_regexp)
           else
             invitable.errors.add(invite_key, :taken) unless invitable.invited? && self.resend_invitation
           end
 
-          if self.validate_on_invite || invitable.errors.empty?
+          if invitable.errors.empty?
             yield invitable if block_given?
             mail = invitable.invite!
           end
           [invitable, mail]
         end
-        
+
         def invite!(attributes={}, invited_by=nil, &block)
           invitable, mail = _invite(attributes, invited_by, &block)
           invitable
         end
-        
+
         def invite_mail!(attributes={}, invited_by=nil, &block)
           invitable, mail = _invite(attributes, invited_by, &block)
           mail
         end
-        
+
         # Attempt to find a user by it's invitation_token to set it's password.
         # If a user is found, reset it's password and automatically try saving
         # the record. If not user is found, returns a new user containing an
@@ -177,3 +179,4 @@ module Devise
     end
   end
 end
+

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler