devise_invitable 1.1.2 → 1.1.3

data/app/controllers/devise_invitable/registrations_controller.rb

@@ -0,0 +1,15 @@
+class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
+  protected
+
+  def build_resource(*args)
+    hash = args.pop || resource_params || {}
+    if hash[:email]
+      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
+      if self.resource
+        self.resource.attributes = hash
+        self.resource.accept_invitation!
+      end
+    end
+    self.resource ||= super
+  end
+end

data/app/controllers/devise_invitable/registrations_controller.rb~

@@ -0,0 +1,15 @@
+class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
+  protected
+
+  def build_resource(*args)
+    hash = args.pop || resource_params || {}
+    if hash[:email]
+      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
+      if self.resource
+        self.resource.attributes = hash
+        self.resource.accept_invitation!
+      end
+    end
+    self.resource ||= super(hash, *args)
+  end
+end

data/lib/devise_invitable.rb

@@ -1,14 +1,16 @@
-require 'devise'
-
 module DeviseInvitable
   autoload :Inviter, 'devise_invitable/inviter'
+  autoload :Mailer, 'devise_invitable/mailer'
+  autoload :Mapping, 'devise_invitable/mapping'
+  module Controllers
+    autoload :UrlHelpers, 'devise_invitable/controllers/url_helpers'
+    autoload :Registrations, 'devise_invitable/controllers/registrations'
+    autoload :Helpers, 'devise_invitable/controllers/helpers'
+  end
 end
 
-require 'devise_invitable/mailer'
+require 'devise'
 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

data/lib/devise_invitable.rb~

@@ -0,0 +1,65 @@
+module DeviseInvitable
+  autoload :Inviter, 'devise_invitable/inviter'
+  autoload :Mailer, 'devise_invitable/mailer'
+  module Controllers
+    autoload :UrlHelpers, 'devise_invitable/controllers/url_helpers'
+    autoload :Registrations, 'devise_invitable/controllers/registrations'
+    autoload :Helpers, 'devise_invitable/controllers/helpers'
+  end
+end
+
+require 'devise'
+require 'devise_invitable/routes'
+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,
+  # and the regexp used to test it when validate_on_invite is not set.
+  #
+  # Examples (in config/initializers/devise.rb)
+  #
+  #   config.invite_key = {:email => /\A[^@]+@[^@]+\z/}
+  mattr_accessor :invite_key
+  @@invite_key = {: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
+
+  # Public: The class name of the inviting model. If this is nil,
+  # the #invited_by association is declared to be polymorphic. (default: nil)
+  mattr_accessor :invited_by_class_name
+  @@invited_by_class_name = nil
+end
+
+Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => :invitation

data/lib/devise_invitable/controllers/helpers.rb

@@ -19,4 +19,4 @@ module DeviseInvitable::Controllers::Helpers
   end
   
 end
-ActionController::Base.send :include, DeviseInvitable::Controllers::Helpers
+

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

@@ -0,0 +1,21 @@
+module DeviseInvitable::Controllers::Helpers
+  extend ActiveSupport::Concern
+
+  included do
+    hide_action :after_invite_path_for, :after_accept_path_for
+  end
+  
+  def after_invite_path_for(resource)
+    after_sign_in_path_for(resource)
+  end
+  
+  def after_accept_path_for(resource)
+    after_sign_in_path_for(resource)
+  end
+  
+  protected
+  def authenticate_inviter!
+    send(:"authenticate_#{resource_name}!", :force => true)
+  end
+  
+end

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

@@ -1,36 +1,21 @@
 module DeviseInvitable::Controllers::Registrations
   def self.included(controller)
-    controller.send :around_filter, :destroy_if_previously_invited, :only => :create
+    controller.alias_method_chain :build_resource, :invitation
   end
 
   protected
 
-  def destroy_if_previously_invited
-    invitation_info = {}
-
-    hash = params[resource_name]
-    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]
-        resource.destroy
+  def build_resource_with_invitation(*args)
+    hash = args.pop || resource_params || {}
+    if hash[:email]
+      self.resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
+      if self.resource
+        puts self.resource.inspect
+        self.resource.attributes = hash
+        self.resource.accept_invitation!
+        puts self.resource.inspect
       end
     end
-
-    # execute the action (create)
-    yield
-    # 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 => 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.save!
-    end
+    self.resource ||= build_resource_without_invitation(hash, *args)
   end
 end

data/lib/devise_invitable/mapping.rb

@@ -0,0 +1,14 @@
+module DeviseInvitable
+  module Mapping
+    def self.included(base)
+      base.alias_method_chain :default_controllers, :invitable
+    end
+    
+    private
+    def default_controllers_with_invitable(options)
+      options[:controllers] ||= {}
+      options[:controllers][:registrations] ||= "devise_invitable/registrations"
+      default_controllers_without_invitable(options)
+    end
+  end
+end

data/lib/devise_invitable/rails.rb

@@ -1,7 +1,10 @@
 module DeviseInvitable
   class Engine < ::Rails::Engine
 
-    ActiveSupport.on_load(:action_controller) { include DeviseInvitable::Controllers::UrlHelpers }
+    ActiveSupport.on_load(:action_controller) do
+      include DeviseInvitable::Controllers::UrlHelpers
+      include DeviseInvitable::Controllers::Helpers
+    end
     ActiveSupport.on_load(:action_view)       { include DeviseInvitable::Controllers::UrlHelpers }
 
     # We use to_prepare instead of after_initialize here because Devise is a Rails engine; its
@@ -10,7 +13,7 @@ module DeviseInvitable
     config.to_prepare do
       require 'devise/mailer'
       Devise::Mailer.send :include, DeviseInvitable::Mailer
-      Devise::RegistrationsController.send :include, DeviseInvitable::Controllers::Registrations
+      Devise::Mapping.send :include, DeviseInvitable::Mapping
     end
   end
 end

data/lib/devise_invitable/rails.rb~

@@ -0,0 +1,21 @@
+module DeviseInvitable
+  class Engine < ::Rails::Engine
+
+    ActiveSupport.on_load(:action_controller) do
+      include DeviseInvitable::Controllers::UrlHelpers
+      include DeviseInvitable::Controllers::Helpers
+    end
+    ActiveSupport.on_load(:action_view)       { include DeviseInvitable::Controllers::UrlHelpers }
+
+    # We use to_prepare instead of after_initialize here because Devise is a Rails engine; its
+    # mailer is reloaded like the rest of the user's app.  Got to make sure that our mailer methods
+    # are included each time Devise::Mailer is (re)loaded.
+    config.to_prepare do
+      require 'devise/mailer'
+      Devise::Mailer.send :include, DeviseInvitable::Mailer
+      Devise::Mapping.send :include, DeviseInvitable::Mapping
+    end
+    config.after_initialize do
+    end
+  end
+end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-12 00:00:00 Z
+date: 2012-11-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,19 +34,18 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: railties
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
-        - 1
+        - 3
         - 0
-        version: 2.1.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -65,18 +64,19 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: railties
+  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.
@@ -90,6 +90,8 @@ extra_rdoc_files: []
 
 files: 
 - app/controllers/devise/invitations_controller.rb
+- app/controllers/devise_invitable/registrations_controller.rb
+- app/controllers/devise_invitable/registrations_controller.rb~
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
@@ -102,9 +104,11 @@ files:
 - lib/devise_invitable/version.rb
 - lib/devise_invitable/controllers/helpers.rb
 - lib/devise_invitable/controllers/url_helpers.rb
-- lib/devise_invitable/controllers/registrations.rb
 - lib/devise_invitable/controllers/registrations.rb~
+- lib/devise_invitable/controllers/helpers.rb~
+- lib/devise_invitable/rails.rb~
 - lib/devise_invitable/inviter.rb
+- lib/devise_invitable/mapping.rb
 - lib/devise_invitable/model.rb~
 - lib/generators/active_record/devise_invitable_generator.rb
 - lib/generators/active_record/templates/migration.rb
@@ -114,6 +118,7 @@ files:
 - 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
+- lib/devise_invitable.rb~
 - LICENSE
 - README.rdoc
 homepage: https://github.com/scambra/devise_invitable

data/lib/devise_invitable/controllers/registrations.rb

@@ -1,39 +0,0 @@
-module DeviseInvitable::Controllers::Registrations
-  def self.included(controller)
-    controller.send :around_filter, :keep_invitation_info, :only => :create
-  end
-
-  protected
-
-  def destroy_if_previously_invited
-    hash = params[resource_name]
-    if hash && hash[:email]
-      resource = resource_class.where(:email => hash[:email], :encrypted_password => '').first
-      if resource
-        @invitation_info = Hash[resource.invitation_fields.map {|field|
-          [field, resource.send(field)]
-        }]
-        resource.destroy
-      end
-    end
-  end
-
-  def keep_invitation_info
-    resource_invitable = resource_class.devise_modules.include?(:invitable)
-    destroy_if_previously_invited if resource_invitable
-    yield
-    reset_invitation_info if resource_invitable
-  end
-
-  def reset_invitation_info
-    # 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 rescue nil
-    if resource && @invitation_info
-      resource.invitation_fields.each do |field|
-        resource.send("#{field}=", @invitation_info[field])
-      end
-      resource.save!
-    end
-  end
-end