devise_invitable 0.5.5 → 0.5.6

data/README.rdoc

@@ -184,6 +184,18 @@ And include DeviseInvitable::Inviter module into Admin model:
     include DeviseInvitable::Inviter
   end
 
+== Has many invitations
+
+If you want to get all records invited by a resource, you should define has_many association in the model allowed to send invitations.
+
+For the default behavior, define it like this:
+
+  has_many :invitations, :class_name => self.class.to_s, :as => :invited_by
+
+For the previous example, where admins send invitations to users, define it like this:
+
+  has_many :invitations, :class_name => 'User', :as => :invited_by
+
 == I18n
 
 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:

data/lib/devise_invitable/model.rb

@@ -33,7 +33,7 @@ module Devise
       def accept_invitation!
         if self.invited? && self.valid?
           self.invitation_token = nil
-          self.invitation_accepted_at = Time.now.utc
+          self.invitation_accepted_at = Time.now.utc if has_attribute? :invitation_accepted_at
           self.save
         end
       end
@@ -51,7 +51,7 @@ module Devise
         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
-          !!deliver_invitation unless @skip_invitation
+          deliver_invitation unless @skip_invitation
         end
       end
 
@@ -120,7 +120,7 @@ module Devise
         # If user is found and still have pending invitation, email is resend unless
         # resend_invitation is set to false
         # Attributes must contain the user email, other attributes will be set in the record
-        def invite!(attributes={}, invited_by=nil, &block)
+        def _invite(attributes={}, invited_by=nil, &block)
           invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
           invitable.attributes = attributes
           invitable.invited_by = invited_by
@@ -131,13 +131,23 @@ module Devise
             invitable.errors.add(invite_key, :taken) unless invitable.invited? && self.resend_invitation
           end
 
-          if invitable.errors.empty?
+          if self.validate_on_invite || invitable.errors.empty?
             yield invitable if block_given?
-            invitable.invite!
+            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

data/lib/devise_invitable/version.rb

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

metadata

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