devise_invitable 0.4.rc2 → 0.4.rc3

data/README.rdoc

@@ -61,7 +61,7 @@ or for a model that already exists, define a migration to add DeviseInvitable to
 
 == Model configuration
 
-DeviseInvitable adds two new configuration options:
+DeviseInvitable adds three new configuration options:
 
 * invite_for: The period the generated invitation token is valid, after this period, the invited resource won't be able to accept the invitation. When invite_for is 0 (the default), the invitation won't expire.
 
@@ -79,6 +79,8 @@ or directly as parameters to the <tt>devise</tt> method:
 
 * invitation_limit: The number of invitations users can send.  The default value of nil means users can send as many invites as they want.  A setting of 0 means they can't send invitations.  A setting n > 0 means they can send n invitations.
 
+* invite_key: The key to be used to check existing users when sending an invitation. The key must be an unique field. The default value is looking for users by email.
+
 For more details, see <tt>config/initializers/devise.rb</tt> (after you invoked the "devise_invitable:install" generator described above).
 
 == Configuring views

data/app/controllers/devise/invitations_controller.rb

@@ -14,12 +14,12 @@ class Devise::InvitationsController < ApplicationController
 
   # POST /resource/invitation
   def create
-    self.resource = resource_class.invite!(params[resource_name], authenticate_inviter!)
+    self.resource = resource_class.invite!(params[resource_name], current_inviter)
 
     if resource.errors.empty?
-      if resource_class.invitation_limit.present?
-        current_user.invitation_limit ||= resource_class.invitation_limit
-        current_user.decrement!(:invitation_limit)
+      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)
@@ -51,11 +51,14 @@ class Devise::InvitationsController < ApplicationController
   end
 
   protected
+  def current_inviter
+    @current_inviter ||= authenticate_inviter!
+  end
 
   def has_invitations_left?
-    if !current_user.has_invitations_left?
+    unless current_inviter.nil? || current_inviter.has_invitations_left?
       build_resource
-      set_flash_message :notice, :no_invitations_remaining 
+      set_flash_message :alert, :no_invitations_remaining 
       render_with_scope :new
     end
   end

data/lib/devise_invitable.rb

@@ -19,6 +19,10 @@ module Devise
   #   config.invitation_limit = nil
   mattr_accessor :invitation_limit
   @@invitation_limit = nil
+  
+  # The key to be used to check existing users when sending an invitation
+  mattr_accessor :invite_key
+  @@invite_key = :email
 end
 
 Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation

data/lib/devise_invitable/model.rb

@@ -70,8 +70,19 @@ module Devise
         invited? && invitation_period_valid?
       end
 
+      # Only verify password when is not invited
+      def valid_password?(password)
+        super unless invited?
+      end
+
       protected
 
+        # Clear invitation token when reset password token is cleared too
+        def clear_reset_password_token
+          self.invitation_token = nil if invited?
+          super
+        end
+
         # Checks if the invitation for the user is within the limit time.
         # We do this by calculating if the difference between today and the
         # invitation sent date does not exceed the invite for time configured.
@@ -107,14 +118,14 @@ module Devise
         # email already exists error.
         # Attributes must contain the user email, other attributes will be set in the record
         def invite!(attributes={}, invited_by=nil)
-          invitable = find_or_initialize_with_error_by(:email, attributes.delete(:email))
+          invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
           invitable.attributes = attributes
           invitable.invited_by = invited_by
 
           if invitable.new_record?
             invitable.errors.clear if invitable.email.try(:match, Devise.email_regexp)
           else
-            invitable.errors.add(:email, :taken) unless invitable.invited?
+            invitable.errors.add(invite_key, :taken) unless invitable.invited?
           end
 
           invitable.invite! if invitable.errors.empty?
@@ -143,6 +154,7 @@ module Devise
 
         Devise::Models.config(self, :invite_for)
         Devise::Models.config(self, :invitation_limit)
+        Devise::Models.config(self, :invite_key)
       end
     end
   end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '0.4.rc2'
+  VERSION = '0.4.rc3'
 end

data/lib/generators/devise_invitable/install_generator.rb

@@ -24,6 +24,16 @@ module DeviseInvitable
   # When invite_for is 0 (the default), the invitation won't expire.
   # config.invite_for = 2.weeks
   
+  # Number of invitations users can send.
+  # If invitation_limit is nil, users can send unlimited invitations.
+  # If invitation_limit is 0, users can't send invitations.
+  # If invitation_limit n > 0, users can send n invitations.
+  # Default: nil
+  # config.invitation_limit = 5
+  
+  # The key to be used to check existing users when sending an invitation
+  # config.invite_key = :email
+  
 CONTENT
             end
           end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 977940495
-  prerelease: true
+  hash: 15424195
+  prerelease: 4
   segments: 
   - 0
   - 4
-  - rc2
-  version: 0.4.rc2
+  - rc
+  - 3
+  version: 0.4.rc3
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,29 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +34,11 @@ dependencies:
         - 7
         version: 1.0.7
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +50,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: devise
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,7 +66,7 @@ dependencies:
         - rc
         version: 1.2.rc
   type: :runtime
-  version_requirements: *id004
+  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.
 email: 
 - sergio@entrecables.com
@@ -151,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: An invitation strategy for Devise