devise_invitable 0.5.6 → 0.6.0

data/README.rdoc

@@ -149,6 +149,18 @@ To accept an invitation with a token use the <tt>accept_invitation!</tt> class m
 
   User.accept_invitation!(:invitation_token => params[:invitation_token], :password => "ad97nwj3o2", :name => "John Doe")
 
+=== Callbacks
+
+A callback event is fired before and after an invitation is accepted (User#accept_invitation!). For example, in your resource model you can add:
+
+  after_invitation_accepted :email_invited_by
+
+  def email_invited_by
+     # ... 
+  end
+
+The callbacks support all options and arguments available to the standard callbacks provided by AR.
+
 == Integration in a Rails application
 
 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.
@@ -173,7 +185,7 @@ You would have a User model which is configured as invitable and an Admin model
   class ApplicationController < ActionController::Base
   protected
     def authenticate_inviter!
-      authenticate_admin!(true)
+      authenticate_admin!(:force => true)
     end
   end
 

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/controllers/helpers.rb

@@ -1,7 +1,7 @@
 module DeviseInvitable::Controllers::Helpers
   protected
   def authenticate_inviter!
-    send(:"authenticate_#{resource_name}!", true)
+    send(:"authenticate_#{resource_name}!", :force => true)
   end
 end
 ActionController::Base.send :include, DeviseInvitable::Controllers::Helpers

data/lib/devise_invitable/mailer.rb

@@ -5,10 +5,5 @@ module DeviseInvitable
     def invitation_instructions(record)
       devise_mail(record, :invitation_instructions)
     end
-    
-    def invitation(record)
-      ActiveSupport::Deprecation.warn('invitation has been renamed to invitation_instructions')
-      invitation_instructions(record)
-    end
   end
 end

data/lib/devise_invitable/model.rb

@@ -24,17 +24,22 @@ module Devise
       attr_accessor :skip_invitation
 
       included do
-        include ::DeviseInvitable::Inviter
+        include ::DeviseInvitable::Inviter        
         belongs_to :invited_by, :polymorphic => true
+        
+        include ActiveSupport::Callbacks
+        define_callbacks :invitation_accepted
       end
 
       # Accept an invitation by clearing invitation token and confirming it if model
       # is confirmable
       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
+          run_callbacks :invitation_accepted do
+            self.invitation_token = nil
+            self.invitation_accepted_at = Time.now.utc if respond_to? :"invitation_accepted_at="
+            self.save(:validate => false)
+          end
         end
       end
 
@@ -46,11 +51,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 +131,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
@@ -167,6 +174,16 @@ module Devise
         def invitation_token
           generate_token(:invitation_token)
         end
+        
+        # Callback convenience methods
+        def before_invitation_accepted(*args, &blk)
+          set_callback(:invitation_accepted, :before, *args, &blk)
+        end
+        
+        def after_invitation_accepted(*args, &blk)
+          set_callback(:invitation_accepted, :after, *args, &blk)
+        end
+        
 
         Devise::Models.config(self, :invite_for)
         Devise::Models.config(self, :validate_on_invite)
@@ -177,3 +194,4 @@ module Devise
     end
   end
 end
+

data/lib/devise_invitable/version.rb

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 0
+  version: 0.6.0
 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-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -62,14 +62,21 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 11
         segments: 
         - 1
         - 4
+        - 6
+        version: 1.4.6
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 1
-        version: 1.4.1
+        - 6
+        version: "1.6"
   type: :runtime
   version_requirements: *id003
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.