devise_invitable 0.4.rc5 → 0.4.0

data/README.rdoc

@@ -104,6 +104,18 @@ To send an invitation to a user, use the <tt>invite!</tt> class method. <tt>:ema
   User.invite!(:email => "new_user@example.com", :name => "John Doe")
   # => an invitation email will be sent to new_user@example.com
 
+If you want to create the invitation but not send it, you can set <tt>skip_invitation</tt> to true.
+
+  User.invite!(:email => "new_user@example.com", :name => "John Doe") do |u|
+    u.skip_invitation = true
+  end
+  # => the record will be created, but the invitation email will not be sent
+
+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)
+  # => the record will be created, but the invitation email will not be sent
+
 === Accept an invitation
 
 To accept an invitation with a token use the <tt>accept_invitation!</tt> class method. <tt>:invitation_token</tt> must be present in the parameters hash. You can also include other attributes in the hash.

data/app/controllers/devise/invitations_controller.rb

@@ -17,10 +17,6 @@ class Devise::InvitationsController < ApplicationController
     self.resource = resource_class.invite!(params[resource_name], current_inviter)
 
     if resource.errors.empty?
-      if resource_class.invitation_limit.present? && current_inviter
-        current_inviter.invitation_limit ||= resource_class.invitation_limit
-        current_inviter.decrement!(:invitation_limit)
-      end
       set_flash_message :notice, :send_instructions, :email => self.resource.email
       redirect_to after_sign_in_path_for(resource_name)
     else

data/lib/devise_invitable/model.rb

@@ -21,6 +21,8 @@ module Devise
     module Invitable
       extend ActiveSupport::Concern
 
+      attr_accessor :skip_invitation
+
       included do
         belongs_to :invited_by, :polymorphic => true
       end
@@ -59,7 +61,10 @@ module Devise
           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 => self.class.validate_on_invite) && !!deliver_invitation
+          if save(:validate => self.class.validate_on_invite)
+            self.invited_by.decrement_invitation_limit! if self.invited_by
+            !!deliver_invitation unless @skip_invitation
+          end
         end
       end
 
@@ -76,6 +81,12 @@ module Devise
       end
 
       protected
+        def decrement_invitation_limit!
+          if self.class.invitation_limit.present?
+            self.invitation_limit ||= self.class.invitation_limit
+            self.decrement!(:invitation_limit)
+          end
+        end
 
         # Overriding the method in Devise's :validatable module so password is not required on inviting
         def password_required?
@@ -127,7 +138,7 @@ module Devise
         # user and send invitation to it. If user is found, returns the user with an
         # email already exists error.
         # Attributes must contain the user email, other attributes will be set in the record
-        def invite!(attributes={}, invited_by=nil)
+        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
@@ -138,7 +149,10 @@ module Devise
             invitable.errors.add(invite_key, :taken) unless invitable.invited?
           end
 
-          invitable.invite! if invitable.errors.empty?
+          if invitable.errors.empty?
+            yield invitable if block_given?
+            invitable.invite!
+          end
           invitable
         end
 

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.4.rc5'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 15424207
-  prerelease: 4
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 4
-  - rc
-  - 5
-  version: 0.4.rc5
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424225
+        hash: 31
         segments: 
         - 1
         - 2
-        - rc
-        - 2
-        version: 1.2.rc2
+        - 0
+        version: 1.2.0
   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.
@@ -82,7 +80,6 @@ files:
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
-- app/views/devise/mailer/invitation.html.erb
 - config/locales/en.yml
 - lib/devise_invitable.rb
 - lib/devise_invitable/mailer.rb

data/app/views/devise/mailer/invitation.html.erb

@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has invited you to <%= root_url %>, you can accept it through the link below.</p>
-
-<p><%= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
-
-<p>If you don't want to accept the invitation, please ignore this email.<br />
-Your account won't be created until you access the link above and set your password.</p>