devise_invitable 1.0.3 → 1.1.0

data/app/controllers/devise/invitations_controller.rb

@@ -13,7 +13,7 @@ class Devise::InvitationsController < DeviseController
 
   # POST /resource/invitation
   def create
-    self.resource = resource_class.invite!(params[resource_name], current_inviter)
+    self.resource = resource_class.invite!(resource_params, current_inviter)
 
     if resource.errors.empty?
       set_flash_message :notice, :send_instructions, :email => self.resource.email
@@ -35,7 +35,7 @@ class Devise::InvitationsController < DeviseController
 
   # PUT /resource/invitation
   def update
-    self.resource = resource_class.accept_invitation!(params[resource_name])
+    self.resource = resource_class.accept_invitation!(resource_params)
 
     if resource.errors.empty?
       set_flash_message :notice, :updated

data/lib/devise_invitable/controllers/registrations.rb~

@@ -1,42 +1,35 @@
 module DeviseInvitable::Controllers::Registrations
   def self.included(controller)
-    controller.send :around_filter, :keep_invitation_info, :only => :create
+    controller.send :around_filter, :destroy_if_previously_invited, :only => :create
   end
 
   protected
 
   def destroy_if_previously_invited
-    @invitation_info = {}
+    invitation_info = {}
 
     hash = params[resource_name]
-    if hash && hash[:email]
+    if resource_class.modules.include?(:invitable) && hash && hash[:email]
       resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
       if resource
-        @invitation_info[:invitation_sent_at] = resource[:invitation_sent_at]
-        @invitation_info[:invited_by_id] = resource[:invited_by_id]
-        @invitation_info[:invited_by_type] = resource[:invited_by_type]
+        invitation_info[:invitation_sent_at] = resource[:invitation_sent_at]
+        invitation_info[:invited_by_id] = resource[:invited_by_id]
+        invitation_info[:invited_by_type] = resource[:invited_by_type]
         resource.destroy
       end
     end
-  end
-  
-  def keep_invitation_info
-    resource_invitable = resource_class.devise_modules.include?(:invitable)
-    destroy_if_previously_invited if resource_invitable
+
+    # execute the action (create)
     yield
-    reset_invitation_info if resource_invitable
-  end
-  
-  def reset_invitation_info
-    puts @invitation_info.inspect
+    # Note that the after_filter is executed at THIS position !
+
     # Restore info about the last invitation (for later reference)
     # Reset the invitation_info only, if invited_by_id is still nil at this stage:
-    resource = resource_class.where(:email => params[resource_name][:email], :invited_by_id => nil).first
-    puts resource.inspect
+    resource = resource_class.where(:email => hash[:email], :invited_by_id => nil).first
     if resource
-      resource[:invitation_sent_at] = @invitation_info[:invitation_sent_at]
-      resource[:invited_by_id] = @invitation_info[:invited_by_id]
-      resource[:invited_by_type] = @invitation_info[:invited_by_type]
+      resource[:invitation_sent_at] = invitation_info[:invitation_sent_at]
+      resource[:invited_by_id] = invitation_info[:invited_by_id]
+      resource[:invited_by_type] = invitation_info[:invited_by_type]
       resource.save!
     end
   end

data/lib/devise_invitable/model.rb

@@ -44,6 +44,12 @@ module Devise
           scope :invitation_accepted, where(:invitation_accepted_at.ne => nil)
         else
           scope :invitation_accepted, where(arel_table[:invitation_accepted_at].not_eq(nil))
+
+          [:before_invitation_accepted, :after_invitation_accepted].each do |callback_method|
+            send callback_method do
+              notify_observers callback_method
+            end
+          end
         end
       end
 
@@ -109,7 +115,7 @@ module Devise
         generate_invitation_token if self.invitation_token.nil?
         self.invitation_sent_at = Time.now.utc
         self.invited_by = invited_by if invited_by
-        
+
         # Call these before_validate methods since we aren't validating on save
         self.downcase_keys if self.new_record? && self.respond_to?(:downcase_keys)
         self.strip_whitespace if self.new_record? && self.respond_to?(:strip_whitespace)
@@ -152,7 +158,7 @@ module Devise
 
         # Deliver the invitation email
         def deliver_invitation
-          ::Devise.mailer.invitation_instructions(self).deliver
+          send_devise_notification(:invitation_instructions)
         end
 
         # Checks if the invitation for the user is within the limit time.

data/lib/devise_invitable/model.rb~

@@ -52,7 +52,7 @@ module Devise
 
       # Verifies whether a user has accepted an invite, was never invited, or is in the process of accepting an invitation, or not
       def accepting_or_not_invited?
-        !!completing_invite || !invited_to_sign_up?
+        !!completing_invite || invited_to_sign_up?
       end
 
       # Verifies whether a user has been invited or not
@@ -98,13 +98,6 @@ module Devise
         super
         accept_invitation!
       end
-      
-      def invite_key_valid?
-        return true unless self.class.invite_key.is_a? Hash # FIXME: remove this line when deprecation is removed
-        self.class.invite_key.all? do |key, regexp|
-          regexp.nil? || self.send(key).try(:match, regexp)
-        end
-      end
 
       protected
         # Overriding the method in Devise's :validatable module so password is not required on inviting
@@ -147,16 +140,6 @@ module Devise
         end
 
       module ClassMethods
-        # Return fields to invite
-        def invite_key_fields
-          if invite_key.is_a? Hash
-            invite_key.keys
-          else
-            ActiveSupport::Deprecation.warn("invite_key should be a hash like {#{invite_key.inspect} => /.../}")
-            Array(invite_key)
-          end
-        end
-        
         # Attempt to find a user by it's email. If a record is not found, create a new
         # user and send invitation to it. If user is found, returns the user with an
         # email already exists error.
@@ -164,24 +147,16 @@ module Devise
         # 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)
-          invite_key_array = invite_key_fields
-          attributes_hash = {}
-          invite_key_array.each do |k,v|
-            attributes_hash[k] = attributes.delete(k)
-          end
-
-          invitable = find_or_initialize_with_errors(invite_key_array, attributes_hash)
+          invitable = find_or_initialize_with_error_by(invite_key, attributes.delete(invite_key))
           invitable.assign_attributes(attributes, :as => inviter_role(invited_by))
           invitable.invited_by = invited_by
 
           invitable.skip_password = true
           invitable.valid? if self.validate_on_invite
           if invitable.new_record?
-            invitable.errors.clear if !self.validate_on_invite and invitable.invite_key_valid?
-          elsif !invitable.invited_to_sign_up? || !self.resend_invitation
-            invite_key_fields.each do |key|
-              invitable.errors.add(key, :taken)
-            end
+            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_to_sign_up? && self.resend_invitation
           end
 
           if invitable.errors.empty?

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 Z
+date: 2012-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -49,34 +49,34 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: actionmailer
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
-        - 2
-        - 0
+        - 3
         - 0
-        version: 2.0.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: devise
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
-        - 3
+        - 2
+        - 1
         - 0
-        version: "3.0"
+        version: 2.1.0
   type: :runtime
   version_requirements: *id004
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.
@@ -89,35 +89,31 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/views/devise/mailer/invitation_instructions.html.erb
-- app/views/devise/invitations/new.html.erb~
+- app/controllers/devise/invitations_controller.rb
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
-- app/controllers/devise/invitations_controller.rb
-- app/controllers/devise/invitations_controller.rb~
+- app/views/devise/mailer/invitation_instructions.html.erb
 - config/locales/en.yml
 - lib/devise_invitable.rb
-- lib/devise_invitable.rb~
-- lib/devise_invitable/routes.rb
+- lib/devise_invitable/mailer.rb
 - lib/devise_invitable/model.rb
 - lib/devise_invitable/rails.rb
-- lib/devise_invitable/mailer.rb
+- lib/devise_invitable/routes.rb
 - lib/devise_invitable/version.rb
-- lib/devise_invitable/model.rb~
-- lib/devise_invitable/inviter.rb
-- lib/devise_invitable/controllers/url_helpers.rb
 - lib/devise_invitable/controllers/helpers.rb
-- lib/devise_invitable/controllers/registrations.rb~
+- lib/devise_invitable/controllers/url_helpers.rb
 - lib/devise_invitable/controllers/registrations.rb
-- lib/generators/active_record/templates/migration.rb
+- lib/devise_invitable/controllers/registrations.rb~
+- lib/devise_invitable/inviter.rb
+- lib/devise_invitable/model.rb~
 - lib/generators/active_record/devise_invitable_generator.rb
-- lib/generators/mongoid/devise_invitable_generator.rb
-- lib/generators/devise_invitable/templates/simple_form_for/invitations/edit.html.erb
-- lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb
-- lib/generators/devise_invitable/install_generator.rb
+- lib/generators/active_record/templates/migration.rb
 - lib/generators/devise_invitable/views_generator.rb
 - lib/generators/devise_invitable/devise_invitable_generator.rb
-- lib/generators/devise_invitable/install_generator.rb~
+- lib/generators/devise_invitable/install_generator.rb
+- lib/generators/devise_invitable/templates/simple_form_for/invitations/edit.html.erb
+- lib/generators/devise_invitable/templates/simple_form_for/invitations/new.html.erb
+- lib/generators/mongoid/devise_invitable_generator.rb
 - LICENSE
 - README.rdoc
 homepage: https://github.com/scambra/devise_invitable
@@ -155,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An invitation strategy for Devise

data/app/controllers/devise/invitations_controller.rb~

@@ -1,48 +0,0 @@
-class Devise::InvitationsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
-  before_filter :authenticate_inviter!, :only => [:new, :create]
-  before_filter :require_no_authentication, :only => [:edit, :update]
-  helper_method :after_sign_in_path_for
-
-  # GET /resource/invitation/new
-  def new
-    build_resource
-    render_with_scope :new
-  end
-
-  # POST /resource/invitation
-  def create
-    self.resource = resource_class.invite!(params[resource_name])
-
-    if resource.errors.empty?
-      puts params.inspect
-      set_flash_message :notice, :send_instructions, :email => self.resource.email
-      redirect_to after_sign_in_path_for(resource_name)
-    else
-      render_with_scope :new
-    end
-  end
-
-  # GET /resource/invitation/accept?invitation_token=abcdef
-  def edit
-    if params[:invitation_token] && self.resource = resource_class.first(:conditions => { :invitation_token => params[:invitation_token] })
-      render_with_scope :edit
-    else
-      set_flash_message(:alert, :invitation_token_invalid)
-      redirect_to after_sign_out_path_for(resource_name)
-    end
-  end
-
-  # PUT /resource/invitation
-  def update
-    self.resource = resource_class.accept_invitation!(params[resource_name])
-
-    if resource.errors.empty?
-      set_flash_message :notice, :updated
-      sign_in_and_redirect(resource_name, resource)
-    else
-      render_with_scope :edit
-    end
-  end
-end

data/app/views/devise/invitations/new.html.erb~

@@ -1,14 +0,0 @@
-<h2>Send invitation</h2>
-
-<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
-  <%= devise_error_messages! %>
-
-<% Array(resource.class.invite_key).each do |field| -%>
-  <p><%= f.label field %><br />
-  <%= f.text_field field %></p>
-<% end -%>
-
-  <p><%= f.submit "Send an invitation" %></p>
-<% end %>
-
-<%= link_to "Home", after_sign_in_path_for(resource_name) %><br />

data/lib/devise_invitable.rb~

@@ -1,68 +0,0 @@
-require 'devise'
-
-module DeviseInvitable
-  autoload :Inviter, 'devise_invitable/inviter'
-end
-
-require 'devise_invitable/mailer'
-require 'devise_invitable/routes'
-require 'devise_invitable/controllers/url_helpers'
-require 'devise_invitable/controllers/registrations'
-require 'devise_invitable/controllers/helpers'
-require 'devise_invitable/rails'
-
-module Devise
-  # Public: Validity period of the invitation token (default: 0). If
-  # invite_for is 0 or nil, the invitation will never expire.
-  # Set invite_for in the Devise configuration file (in config/initializers/devise.rb).
-  #
-  #   config.invite_for = 2.weeks # => The invitation token will be valid 2 weeks
-  mattr_accessor :invite_for
-  @@invite_for = 0
-
-  # Public: Flag that force a record to be valid before being actually invited
-  # (default: false).
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.validate_on_invite = true
-  mattr_accessor :validate_on_invite
-  @@validate_on_invite = false
-
-  # Public: number of invitations the user is allowed to send
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.invitation_limit = nil
-  mattr_accessor :invitation_limit
-  @@invitation_limit = nil
-
-  # Public: The key to be used to check existing users when sending an invitation.
-  # It can be an array.
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.invite_key = :email
-  mattr_accessor :invite_key
-  @@invite_key = :email
-
-  # Public: The regexp to be used to test invite key when sending an invitation.
-  # It must be a hash indexed by invite_key
-  #
-  # Examples (in config/initializers/devise.rb)
-  #
-  #   config.invite_key = :email
-  mattr_accessor :invite_key_validation_regexp
-  @@invite_key_validation_regexp = {:email => Devise.email_regexp}
-
-  # Public: Resend invitation if user with invited status is invited again
-  # (default: true)
-  #
-  # Example (in config/initializers/devise.rb)
-  #
-  #   config.resend_invitation = false
-  mattr_accessor :resend_invitation
-  @@resend_invitation = true
-end
-
-Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation

data/lib/generators/devise_invitable/install_generator.rb~

@@ -1,54 +0,0 @@
-module DeviseInvitable
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-      desc "Add DeviseInvitable config variables to the Devise initializer and copy DeviseInvitable locale files to your application."
-      
-      # def devise_install
-      #   invoke "devise:install"
-      # end
-      
-      def add_config_options_to_initializer
-        devise_initializer_path = "config/initializers/devise.rb"
-        if File.exist?(devise_initializer_path)
-          old_content = File.read(devise_initializer_path)
-          
-          if old_content.match(Regexp.new(/^\s# ==> Configuration for :invitable\n/))
-            false
-          else
-            inject_into_file(devise_initializer_path, :before => "  # ==> Configuration for :confirmable\n") do
-<<-CONTENT
-  # ==> Configuration for :invitable
-  # 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.
-  # 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 => /\A[^@]+@[^@]+\z/}
-  # config.invite_key = {:email => /\A[^@]+@[^@]+\z/, :username => nil}
-  
-  # Flag that force a record to be valid before being actually invited 
-  # Default: false
-  # config.validate_on_invite = true
-
-CONTENT
-            end
-          end
-        end
-      end
-      
-      def copy_locale
-        copy_file "../../../config/locales/en.yml", "config/locales/devise_invitable.en.yml"
-      end
-      
-    end
-  end
-end