devise_invitable 0.2.0 → 0.2.1

data/README.rdoc

@@ -68,6 +68,10 @@ Define a migration to add invitable to your model:
     t.index :invitation_token
   end
 
+  # Allow null encrypted_password and password_salt
+  change_column :your_table, :encrypted_password, :string, :null => true
+  change_column :your_table, :password_salt, :string, :null => true
+
 Add :invitable to the devise line of your model, or to config.all in devise initializer if your model uses devise :all.
 
 Override authenticate_resource! filter if you need to customize who can send invitations.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Sergio Cambra"]
     gem.add_development_dependency 'mocha'
     gem.add_development_dependency 'webrat'
-    gem.add_dependency 'devise', '~> 0.8.0'
+    gem.add_dependency 'devise', '~> 0.9.0'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/invitations_controller.rb

@@ -1,22 +1,17 @@
 class InvitationsController < ApplicationController
-  include Devise::Controllers::Helpers
+  include Devise::Controllers::InternalHelpers
+  include Devise::Controllers::Common
 
   before_filter :authenticate_resource!, :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.send_invitation(params[resource_name])
+    self.resource = resource_class.send(send_instructions_with, params[resource_name])
 
     if resource.errors.empty?
-      set_flash_message :success, :send_invitation
+      set_flash_message :notice, :send_instructions
       redirect_to after_sign_in_path_for(resource_name)
     else
       render_with_scope :new
@@ -35,10 +30,15 @@ class InvitationsController < ApplicationController
     self.resource = resource_class.accept_invitation!(params[resource_name])
 
     if resource.errors.empty?
-      set_flash_message :success, :updated
+      set_flash_message :notice, :updated
       sign_in_and_redirect(resource_name, resource)
     else
       render_with_scope :edit
     end
   end
+
+  protected
+  def send_instructions_with
+    :send_invitation
+  end
 end

data/devise_invitable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_invitable}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Cambra"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-02-08}
   s.description = %q{It adds support for send invitations by email (it requires to be authenticated) and accept the invitation setting the password}
   s.email = %q{sergio@entrecables.com}
   s.extra_rdoc_files = [
@@ -29,12 +29,12 @@ Gem::Specification.new do |s|
      "app/views/invitations/new.html.erb",
      "devise_invitable.gemspec",
      "init.rb",
-     "lib/devise/controllers/filters.rb",
+     "lib/devise/controllers/helpers.rb",
      "lib/devise/controllers/url_helpers.rb",
-     "lib/devise/models/invitable.rb",
      "lib/devise_invitable.rb",
      "lib/devise_invitable/locales/en.yml",
      "lib/devise_invitable/mailer.rb",
+     "lib/devise_invitable/model.rb",
      "lib/devise_invitable/rails.rb",
      "lib/devise_invitable/routes.rb",
      "lib/devise_invitable/schema.rb",
@@ -109,16 +109,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<webrat>, [">= 0"])
-      s.add_runtime_dependency(%q<devise>, ["~> 0.8.0"])
+      s.add_runtime_dependency(%q<devise>, ["~> 0.9.0"])
     else
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<webrat>, [">= 0"])
-      s.add_dependency(%q<devise>, ["~> 0.8.0"])
+      s.add_dependency(%q<devise>, ["~> 0.9.0"])
     end
   else
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<webrat>, [">= 0"])
-    s.add_dependency(%q<devise>, ["~> 0.8.0"])
+    s.add_dependency(%q<devise>, ["~> 0.9.0"])
   end
 end
 

data/lib/devise/controllers/{filters.rb → helpers.rb}

@@ -1,4 +1,4 @@
-Devise::Controllers::Filters.module_eval do
+Devise::Controllers::Helpers.module_eval do
   protected
   def authenticate_resource!
     authenticate!(resource_name)

data/lib/devise_invitable.rb

@@ -3,8 +3,7 @@ Devise.module_eval do
   mattr_accessor :invite_for
   @@invite_for = 0
 end
-Devise::ALL << :invitable
-Devise::CONTROLLERS[:invitations] = [:invitable]
+Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model'
 
 module DeviseInvitable; end
 

data/lib/devise_invitable/locales/en.yml

@@ -1,5 +1,5 @@
 en:
   devise:
     invitations:
-      send_invitation: 'An email with instructions about how to set the password has been sent.'
+      send_instructions: 'An email with instructions about how to set the password has been sent.'
       updated: 'Your password was set successfully. You are now signed in.'

data/test/integration/invitable_test.rb

@@ -40,7 +40,7 @@ class InvitationTest < ActionController::IntegrationTest
 
     send_invitation
     assert_template 'home/index'
-    assert_equal 'An email with instructions about how to set the password has been sent.', flash[:success]
+    assert_equal 'An email with instructions about how to set the password has been sent.', flash[:notice]
   end
 
   test 'authenticated user with invalid email should receive an error message' do
@@ -95,7 +95,7 @@ class InvitationTest < ActionController::IntegrationTest
     set_password :invitation_token => user.invitation_token
 
     assert_template 'home/index'
-    assert_equal 'Your password was set successfully. You are now signed in.', flash[:success]
+    assert_equal 'Your password was set successfully. You are now signed in.', flash[:notice]
     assert user.reload.valid_password?('987654321')
   end
 
@@ -109,7 +109,7 @@ class InvitationTest < ActionController::IntegrationTest
     assert_not 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[:success]
+    assert_equal 'Your password was set successfully. You are now signed in.', flash[:notice]
     assert user.reload.valid_password?('987654321')
   end
 

data/test/test_helper.rb

@@ -4,9 +4,8 @@ require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
 require 'test_help'
 require 'mocha'
 require 'webrat'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'devise', 'models', 'invitable')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'devise', 'controllers', 'url_helpers')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'devise', 'controllers', 'filters')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'devise', 'controllers', 'helpers')
 ActionView::Base.send :include, Devise::Controllers::UrlHelpers
 
 path = File.join(File.dirname(__FILE__), '..', 'app', 'views')
@@ -37,7 +36,7 @@ ActionController::Routing::Routes.draw do |map|
   map.devise_for :users
 end
 require File.join(File.dirname(__FILE__), '..', 'app', 'controllers', 'invitations_controller')
-InvitationsController.send :include, Devise::Controllers::Filters
+InvitationsController.send :include, Devise::Controllers::Helpers
 
 Webrat.configure do |config|
   config.mode = :rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.9.0
     version: 
 description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation setting the password
 email: sergio@entrecables.com
@@ -64,12 +64,12 @@ files:
 - app/views/invitations/new.html.erb
 - devise_invitable.gemspec
 - init.rb
-- lib/devise/controllers/filters.rb
+- lib/devise/controllers/helpers.rb
 - lib/devise/controllers/url_helpers.rb
-- lib/devise/models/invitable.rb
 - lib/devise_invitable.rb
 - lib/devise_invitable/locales/en.yml
 - lib/devise_invitable/mailer.rb
+- lib/devise_invitable/model.rb
 - lib/devise_invitable/rails.rb
 - lib/devise_invitable/routes.rb
 - lib/devise_invitable/schema.rb