devise_invitable 0.3.0 → 0.3.1

data/lib/devise_invitable/model.rb

@@ -1,6 +1,5 @@
 module Devise
   module Models
-
     # Invitable is responsible to send emails with invitations.
     # When an invitation is sent to an email, an account is created for it.
     # An invitation has a link to set the password, as reset password from recoverable.
@@ -19,7 +18,6 @@ module Devise
     #   User.find(1).accept_invitation!   # accept invitation
     #   User.find(1).resend_invitation!   # reset invitation status and send invitation again
     module Invitable
-
       def self.included(base)
         base.class_eval do
           extend ClassMethods
@@ -29,7 +27,10 @@ module Devise
       # Accept an invitation by clearing invitation token and confirming it if model
       # is confirmable
       def accept_invitation!
-        self.update_attribute :invitation_token, nil if self.invited?
+        if self.invited?
+          self.invitation_token = nil
+          self.save(:validate => false)
+        end
       end
 
       # Verifies whether a user has been invited or not
@@ -39,7 +40,7 @@ module Devise
 
       # Send invitation by email
       def send_invitation
-        ::Devise::Mailer.invitation(self).deliver
+        ::Devise.mailer.invitation(self).deliver
       end
 
       # Reset invitation token and send invitation again

data/lib/devise_invitable/rails.rb

@@ -1,3 +1,14 @@
-Rails.configuration.after_initialize do
-  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
+module DeviseInvitable
+  class Engine < ::Rails::Engine
+    
+    initializer "devise_invitable.add_url_helpers" do |app|
+      ActionController::Base.send :include, DeviseInvitable::Controllers::UrlHelpers
+      ActionView::Base.send :include, DeviseInvitable::Controllers::UrlHelpers
+    end
+    
+    config.after_initialize do
+      Devise::Mailer.send :include, DeviseInvitable::Mailer
+    end
+    
+  end
 end

data/lib/devise_invitable/routes.rb

@@ -1,29 +1,10 @@
-module DeviseInvitable
-  module Routes #:doc:
-    # Adds route generation for invitable. This method is responsible to
-    # generate all needed routes for devise, based on what modules you have
-    # defined in your model.
-    # Examples: Let's say you have an User model configured to use
-    # invitable module. After creating this inside your routes:
-    #
-    #   map.devise_for :users
-    #
-    # this method is going to look inside your User model and create the
-    # needed routes:
-    #
-    #  # Invitation routes for Invitable, if User model has :invitable configured
-    #     new_user_invitation GET  /users/invitation/new(.:format)     {:controller=>"invitations", :action=>"new"}
-    #         user_invitation PUT  /users/invitation(.:format)         {:controller=>"invitations", :action=>"update"}
-    #                         POST /users/invitation(.:format)         {:controller=>"invitations", :action=>"create"}
-    #  accept_user_invitation GET  /users/invitation/accept(.:format)  {:controller=>"invitations", :action=>"edit"}
-    #
-
+module ActionDispatch::Routing
+  class Mapper
     protected
-      def invitable(routes, mapping)
-        routes.resource :invitation, :only => [:new, :create, :update], :as => mapping.path_names[:invitation]
-        routes.send(:"accept_#{mapping.name}_invitation", mapping.path_names[:accept] || 'accept', :controller => 'invitations', :action => 'edit', :name_prefix => nil, :path_prefix => "#{mapping.as}/invitation", :conditions => { :method => :get })
+      def devise_invitation(mapping, controllers)
+        resource :invitation, :only => [:new, :create, :update], :path => mapping.path_names[:invitation], :controller => controllers[:invitations] do
+          get :edit, :path => mapping.path_names[:accept], :as => :accept
+        end
       end
   end
 end
-
-ActionDispatch::Routing::Mapper.send :include, DeviseInvitable::Routes

data/lib/devise_invitable/schema.rb

@@ -2,8 +2,8 @@ module DeviseInvitable
   module Schema
     # Creates invitation_token and invitation_sent_at.
     def invitable
-      apply_schema :invitation_token,   String, :limit => 20
-      apply_schema :invitation_sent_at, DateTime
+      apply_devise_schema :invitation_token,   String, :limit => 20
+      apply_devise_schema :invitation_sent_at, DateTime
     end
   end
 end

data/test/integration/invitable_test.rb

@@ -1,16 +1,15 @@
 require 'test/test_helper'
 require 'test/integration_tests_helper'
 
-class InvitationTest < ActionController::IntegrationTest
+class InvitationTest < ActionDispatch::IntegrationTest
+  def teardown
+    Capybara.reset_sessions!
+  end
 
   def send_invitation(&block)
     visit new_user_invitation_path
 
-    assert_response :success
-    assert_template 'invitations/new'
-    assert warden.authenticated?(:user)
-
-    fill_in 'email', :with => 'user@test.com'
+    fill_in 'user_email', :with => 'user@test.com'
     yield if block_given?
     click_button 'Send an invitation'
   end
@@ -19,62 +18,53 @@ class InvitationTest < ActionController::IntegrationTest
     unless options[:visit] == false
       visit accept_user_invitation_path(:invitation_token => options[:invitation_token])
     end
-    assert_response :success
-    assert_template 'invitations/edit'
 
-    fill_in 'Password', :with => '987654321'
-    fill_in 'Password confirmation', :with => '987654321'
+    fill_in 'user_password', :with => '987654321'
+    fill_in 'user_password_confirmation', :with => '987654321'
     yield if block_given?
     click_button 'Set my password'
   end
 
   test 'not authenticated user should not be able to send an invitation' do
     get new_user_invitation_path
-    assert_not warden.authenticated?(:user)
-
-    assert_redirected_to new_user_session_path(:unauthenticated => true)
+    assert_redirected_to new_user_session_path
   end
 
   test 'authenticated user should be able to send an invitation' do
     sign_in_as_user
 
     send_invitation
-    assert_template 'home/index'
-    assert_equal 'An email with instructions about how to set the password has been sent.', flash[:notice]
+    assert_equal root_path, current_path
+    assert page.has_css?('p#notice', :text => 'An email with instructions about how to set the password has been sent.')
   end
 
   test 'authenticated user with invalid email should receive an error message' do
-    user = create_user
-    sign_in_as_user
+    user = create_full_user
+    sign_in_as_user(user)
     send_invitation do
-      fill_in 'email', :with => user.email
+      fill_in 'user_email', :with => user.email
     end
 
-    assert_response :success
-    assert_template 'invitations/new'
-    assert_have_selector "input[type=text][value='#{user.email}']"
-    assert_contain 'Email has already been taken'
+    assert_equal user_invitation_path, current_path
+    assert page.has_css?("input[type=text][value='#{user.email}']")
+    assert page.has_css?('#error_explanation li', :text => 'Email has already been taken')
   end
 
   test 'authenticated user should not be able to visit edit invitation page' do
     sign_in_as_user
 
-    get accept_user_invitation_path
+    visit accept_user_invitation_path
 
-    assert_response :redirect
-    assert_redirected_to root_path
-    assert warden.authenticated?(:user)
+    assert_equal root_path, current_path
   end
 
   test 'not authenticated user with invalid invitation token should not be able to set his password' do
     user = create_user
     set_password :invitation_token => 'invalid_token'
 
-    assert_response :success
-    assert_template 'invitations/edit'
-    assert_have_selector '#errorExplanation'
-    assert_contain 'Invitation token is invalid'
-    assert_not user.reload.valid_password?('987654321')
+    assert_equal user_invitation_path, current_path
+    assert page.has_css?('#error_explanation li', :text => 'Invitation token is invalid')
+    assert !user.reload.valid_password?('987654321')
   end
 
   test 'not authenticated user with valid invitation token but invalid password should not be able to set his password' do
@@ -83,19 +73,17 @@ class InvitationTest < ActionController::IntegrationTest
       fill_in 'Password confirmation', :with => 'other_password'
     end
 
-    assert_response :success
-    assert_template 'invitations/edit'
-    assert_have_selector '#errorExplanation'
-    assert_contain 'Password doesn\'t match confirmation'
-    assert_not user.reload.valid_password?('987654321')
+    assert_equal user_invitation_path, current_path
+    assert page.has_css?('#error_explanation li', :text => 'Password doesn\'t match confirmation')
+    assert !user.reload.valid_password?('987654321')
   end
 
   test 'not authenticated user with valid data should be able to change his password' do
     user = create_user(false)
     set_password :invitation_token => user.invitation_token
 
-    assert_template 'home/index'
-    assert_equal 'Your password was set successfully. You are now signed in.', flash[:notice]
+    assert_equal root_path, current_path
+    assert page.has_css?('p#notice', :text => 'Your password was set successfully. You are now signed in.')
     assert user.reload.valid_password?('987654321')
   end
 
@@ -104,19 +92,18 @@ class InvitationTest < ActionController::IntegrationTest
     set_password :invitation_token => user.invitation_token do
       fill_in 'Password confirmation', :with => 'other_password'
     end
-    assert_response :success
-    assert_have_selector '#errorExplanation'
-    assert_not user.reload.valid_password?('987654321')
+    assert_equal user_invitation_path, current_path
+    assert page.has_css?('#error_explanation')
+    assert !user.reload.valid_password?('987654321')
 
     set_password :invitation_token => user.invitation_token
-    assert_equal 'Your password was set successfully. You are now signed in.', flash[:notice]
+    assert page.has_css?('p#notice', :text => 'Your password was set successfully. You are now signed in.')
     assert user.reload.valid_password?('987654321')
   end
 
   test 'sign in user automatically after setting it\'s password' do
     user = create_user(false)
     set_password :invitation_token => user.invitation_token
-
-    assert warden.authenticated?(:user)
+    assert_equal root_path, current_path
   end
 end

data/test/integration_tests_helper.rb

@@ -4,8 +4,27 @@ class ActionController::IntegrationTest
     request.env['warden']
   end
   
-  def sign_in_as_user
-    Warden::Proxy.any_instance.stubs(:user).at_least_once.returns(User.new)
+  def create_full_user
+    @user ||= begin
+      user = User.create!(
+        :username => 'usertest',
+        :email => 'fulluser@test.com',
+        :password => '123456',
+        :password_confirmation => '123456',
+        :created_at => Time.now.utc
+      )
+      user.confirm!
+      user
+    end
+  end
+
+  def sign_in_as_user(user = nil)
+    user ||= create_full_user
+    visit new_user_session_path
+    fill_in 'user_email', :with => user.email
+    fill_in 'user_password', :with => '123456'
+    fill_in 'user_password', :with => user.password
+    click_button 'Sign in'
   end
 
   def create_user(accept_invitation = true)
@@ -13,7 +32,7 @@ class ActionController::IntegrationTest
     user.skip_confirmation!
     user.invitation_token = 'token'
     user.invitation_sent_at = Time.now.utc
-    user.save(false)
+    user.save(:validate => false)
     user.accept_invitation! if accept_invitation
     user
   end

data/test/mailers/invitation_test.rb

@@ -27,7 +27,7 @@ class InvitationMailTest < ActionMailer::TestCase
   end
 
   test 'content type should be set to html' do
-    assert_equal 'text/html', mail.content_type
+    assert_equal 'text/html; charset=UTF-8', mail.content_type
   end
 
   test 'send invitation to the user email' do
@@ -39,13 +39,13 @@ class InvitationMailTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :mailer => { :invitation => 'Invitation' } } do
-      assert_equal 'Invitation', mail.subject
+    store_translations :en, :devise => { :mailer => { :invitation => { :subject => 'Localized Invitation' } } } do
+      assert_equal 'Localized Invitation', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :mailer => { :user => { :invitation => 'User Invitation' } } } do
+    store_translations :en, :devise => { :mailer => { :invitation => { :user_subject => 'User Invitation' } } } do
       assert_equal 'User Invitation', mail.subject
     end
   end

data/test/model_tests_helper.rb

@@ -35,7 +35,7 @@ class ActiveSupport::TestCase
     user.skip_confirmation!
     user.invitation_token = invitation_token
     user.invitation_sent_at = Time.now.utc
-    user.save(false)
+    user.save(:validate => false)
     user
   end
 end

data/test/models/invitable_test.rb

@@ -45,7 +45,7 @@ class InvitableTest < ActiveSupport::TestCase
 
     User.stubs(:invite_for).returns(1.day)
     user.invitation_sent_at = 1.day.ago
-    assert_not user.valid_invitation?
+    assert !user.valid_invitation?
   end
 
   test 'should never generate the same invitation token for different users' do
@@ -112,7 +112,7 @@ class InvitableTest < ActiveSupport::TestCase
     user.update_attribute(:invitation_token, nil)
     invited_user = User.send_invitation(:email => user.email)
     assert_equal invited_user, user
-    assert_equal 'has already been taken', invited_user.errors[:email]
+    assert_equal ['has already been taken'], invited_user.errors[:email]
   end
 
   test 'should return a new record with errors if e-mail is blank' do
@@ -124,7 +124,7 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if e-mail is invalid' do
     invited_user = User.send_invitation(:email => 'invalid_email')
     assert invited_user.new_record?
-    assert_equal "is invalid", invited_user.errors[:email]
+    assert_equal ["is invalid"], invited_user.errors[:email]
   end
 
   test 'should find a user to set his password based on invitation_token' do
@@ -138,13 +138,13 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if no invitation_token is found' do
     invited_user = User.accept_invitation!(:invitation_token => 'invalid_token')
     assert invited_user.new_record?
-    assert_equal 'is invalid', invited_user.errors[:invitation_token]
+    assert_equal ['is invalid'], invited_user.errors[:invitation_token]
   end
 
   test 'should return a new record with errors if invitation_token is blank' do
     invited_user = User.accept_invitation!(:invitation_token => '')
     assert invited_user.new_record?
-    assert_equal "can't be blank", invited_user.errors[:invitation_token]
+    assert_equal ["can't be blank"], invited_user.errors[:invitation_token]
   end
 
   test 'should return record with errors if invitation_token has expired' do
@@ -153,7 +153,7 @@ class InvitableTest < ActiveSupport::TestCase
     User.stubs(:invite_for).returns(10.hours)
     invited_user = User.accept_invitation!(:invitation_token => 'valid_token')
     assert_equal user, invited_user
-    assert_equal "is invalid", invited_user.errors[:invitation_token]
+    assert_equal ["is invalid"], invited_user.errors[:invitation_token]
   end
 
   test 'should set successfully user password given the new password and confirmation' do

data/test/models_test.rb

@@ -14,14 +14,10 @@ class ActiveRecordTest < ActiveSupport::TestCase
     modules.each do |mod|
       assert include_module?(klass, mod), "#{klass} not include #{mod}"
     end
-
-    (Devise::ALL - modules).each do |mod|
-      assert_not include_module?(klass, mod), "#{klass} include #{mod}"
-    end
   end
 
   test 'add invitable module only' do
-    assert_include_modules Invitable, :database_authenticatable, :invitable
+    assert_include_modules Invitable, :invitable
   end
 
   test 'set a default value for invite_for' do

data/test/rails_app/app/controllers/application_controller.rb

@@ -1,10 +1,3 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
 class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password
+  protect_from_forgery
 end

data/test/rails_app/app/helpers/application_helper.rb

@@ -1,3 +1,2 @@
-# Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

data/test/rails_app/app/models/user.rb

@@ -1,4 +1,4 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :confirmable, :recoverable, :rememberable, :validatable
+  devise :database_authenticatable, :confirmable, :invitable, :validatable
   attr_accessible :username, :email, :password, :password_confirmation
 end

data/test/rails_app/app/views/layouts/application.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>RailsApp</title>
+  <%= stylesheet_link_tag :all %>
+  <%= javascript_include_tag :defaults %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= content_tag :p, flash[:notice], :id => 'notice' unless flash[:notice].blank? %>
+<%= yield %>
+
+</body>
+</html>

data/test/rails_app/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run TestApp::Application

data/test/rails_app/config/application.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+require 'devise'
+require 'devise_invitable'
+
+module RailsApp
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end