devise_invitable 0.1.3 → 0.1.4

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.7.1'
+    gem.add_dependency 'devise', '~> 0.7.2'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/devise_invitable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_invitable}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Cambra"]
-  s.date = %q{2009-12-12}
+  s.date = %q{2009-12-23}
   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 = [
@@ -73,31 +73,31 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{An invitation strategy for devise}
   s.test_files = [
-    "test/model_tests_helper.rb",
+    "test/integration/invitable_test.rb",
      "test/integration_tests_helper.rb",
-     "test/models_test.rb",
      "test/mailers/invitation_test.rb",
-     "test/routes_test.rb",
-     "test/integration/invitable_test.rb",
+     "test/model_tests_helper.rb",
      "test/models/invitable_test.rb",
-     "test/test_helper.rb",
-     "test/rails_app/app/controllers/application_controller.rb",
+     "test/models_test.rb",
      "test/rails_app/app/controllers/admins_controller.rb",
+     "test/rails_app/app/controllers/application_controller.rb",
      "test/rails_app/app/controllers/home_controller.rb",
      "test/rails_app/app/controllers/users_controller.rb",
-     "test/rails_app/app/models/user.rb",
      "test/rails_app/app/helpers/application_helper.rb",
-     "test/rails_app/config/routes.rb",
+     "test/rails_app/app/models/user.rb",
+     "test/rails_app/config/boot.rb",
+     "test/rails_app/config/environment.rb",
+     "test/rails_app/config/environments/development.rb",
+     "test/rails_app/config/environments/production.rb",
+     "test/rails_app/config/environments/test.rb",
      "test/rails_app/config/initializers/backtrace_silencers.rb",
+     "test/rails_app/config/initializers/inflections.rb",
      "test/rails_app/config/initializers/new_rails_defaults.rb",
      "test/rails_app/config/initializers/session_store.rb",
-     "test/rails_app/config/initializers/inflections.rb",
-     "test/rails_app/config/environments/test.rb",
-     "test/rails_app/config/environments/development.rb",
-     "test/rails_app/config/environments/production.rb",
-     "test/rails_app/config/environment.rb",
-     "test/rails_app/config/boot.rb",
-     "test/rails_app/vendor/plugins/devise_invitable/init.rb"
+     "test/rails_app/config/routes.rb",
+     "test/rails_app/vendor/plugins/devise_invitable/init.rb",
+     "test/routes_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -107,16 +107,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.7.1"])
+      s.add_runtime_dependency(%q<devise>, ["~> 0.7.2"])
     else
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<webrat>, [">= 0"])
-      s.add_dependency(%q<devise>, [">= 0.7.1"])
+      s.add_dependency(%q<devise>, ["~> 0.7.2"])
     end
   else
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<webrat>, [">= 0"])
-    s.add_dependency(%q<devise>, [">= 0.7.1"])
+    s.add_dependency(%q<devise>, ["~> 0.7.2"])
   end
 end
 

data/lib/devise/models/invitable.rb

@@ -17,32 +17,19 @@ module Devise
     #   User.send_invitation(:email => 'someone@example.com') # send invitation
     #   User.accept_invitation!(:invitation_token => '...')   # accept invitation with a token
     #   User.find(1).accept_invitation!   # accept invitation
-    #   User.find(1).reset_invitation!    # reset invitation status and send invitation again
+    #   User.find(1).resend_invitation!   # reset invitation status and send invitation again
     module Invitable
 
       def self.included(base)
         base.class_eval do
           extend ClassMethods
-          callbacks = []
-          callbacks.concat before_create_callback_chain.select {|c| c.method == :generate_confirmation_token}
-          callbacks.concat after_create_callback_chain.select {|c| c.method == :send_confirmation_instructions}
-          callbacks.each do |c|
-            c.options[:unless] = lambda{|r| r.class.devise_modules.include?(:invitable) && r.invitation_token}
-          end
         end
       end
 
       # Accept an invitation by clearing invitation token and confirming it if model
       # is confirmable
       def accept_invitation!
-        if self.invited?
-          self.invitation_token = nil
-          if self.class.devise_modules.include? :confirmable
-            self.confirm!
-          else
-            save
-          end
-        end
+        self.update_attribute :invitation_token, nil if self.invited?
       end
 
       # Verifies whether a user has been invited or not
@@ -56,8 +43,9 @@ module Devise
       end
 
       # Reset invitation token and send invitation again
-      def reset_invitation!
+      def resend_invitation!
         if new_record? || invited?
+          self.skip_confirmation! if self.new_record? and self.respond_to? :skip_confirmation!
           generate_invitation_token
           save(false)
           send_invitation
@@ -113,7 +101,7 @@ module Devise
           if invitable.email.blank?
             invitable.errors.add(:email, :blank)
           elsif invitable.new_record? || invitable.invited?
-            invitable.reset_invitation!
+            invitable.resend_invitation!
           else
             invitable.errors.add(:email, :already_exits, :default => 'already exists')
           end

data/test/integration_tests_helper.rb

@@ -10,6 +10,7 @@ class ActionController::IntegrationTest
 
   def create_user(accept_invitation = true)
     user = User.new :email => 'newuser@test.com'
+    user.skip_confirmation!
     user.invitation_token = 'token'
     user.invitation_sent_at = Time.now.utc
     user.save(false)

data/test/mailers/invitation_test.rb

@@ -1,6 +1,6 @@
 require 'test/test_helper'
 
-class InviationTest < ActionMailer::TestCase
+class InvitationMailTest < ActionMailer::TestCase
 
   def setup
     setup_mailer

data/test/model_tests_helper.rb

@@ -36,6 +36,7 @@ class ActiveSupport::TestCase
 
   def create_user_with_invitation(invitation_token, attributes={})
     user = new_user({:password => nil, :password_confirmation => nil}.update(attributes))
+    user.skip_confirmation!
     user.invitation_token = invitation_token
     user.invitation_sent_at = Time.now.utc
     user.save(false)

data/test/models/invitable_test.rb

@@ -15,7 +15,7 @@ class InvitableTest < ActiveSupport::TestCase
     user = new_user
     3.times do
       token = user.invitation_token
-      user.reset_invitation!
+      user.resend_invitation!
       assert_not_equal token, user.invitation_token
     end
   end
@@ -52,7 +52,7 @@ class InvitableTest < ActiveSupport::TestCase
     invitation_tokens = []
     3.times do
       user = new_user
-      user.reset_invitation!
+      user.resend_invitation!
       token = user.invitation_token
       assert !invitation_tokens.include?(token)
       invitation_tokens << token
@@ -74,6 +74,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should clear invitation token while setting the password' do
     user = new_user
+    user.skip_confirmation!
     user.update_attribute(:invitation_token, 'valid_token')
     assert_present user.invitation_token
     assert user.accept_invitation!
@@ -82,6 +83,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should not clear invitation token if record is invalid' do
     user = new_user
+    user.skip_confirmation!
     user.update_attribute(:invitation_token, 'valid_token')
     assert_present user.invitation_token
     User.any_instance.stubs(:valid?).returns(false)
@@ -94,7 +96,7 @@ class InvitableTest < ActiveSupport::TestCase
     user = new_user
     assert_difference('ActionMailer::Base.deliveries.size') do
       token = user.invitation_token
-      user.reset_invitation!
+      user.resend_invitation!
       assert_not_equal token, user.invitation_token
     end
   end
@@ -121,7 +123,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should find a user to set his password based on invitation_token' do
     user = new_user
-    user.reset_invitation!
+    user.resend_invitation!
 
     invited_user = User.accept_invitation!(:invitation_token => user.invitation_token)
     assert_equal invited_user, user
@@ -150,7 +152,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should set successfully user password given the new password and confirmation' do
     user = new_user(:password => nil, :password_confirmation => nil)
-    user.reset_invitation!
+    user.resend_invitation!
 
     invited_user = User.accept_invitation!(
       :invitation_token => user.invitation_token,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 +01:00
+date: 2009-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,9 +38,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.2
     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
@@ -130,28 +130,28 @@ signing_key:
 specification_version: 3
 summary: An invitation strategy for devise
 test_files: 
-- test/model_tests_helper.rb
+- test/integration/invitable_test.rb
 - test/integration_tests_helper.rb
-- test/models_test.rb
 - test/mailers/invitation_test.rb
-- test/routes_test.rb
-- test/integration/invitable_test.rb
+- test/model_tests_helper.rb
 - test/models/invitable_test.rb
-- test/test_helper.rb
-- test/rails_app/app/controllers/application_controller.rb
+- test/models_test.rb
 - test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/models/user.rb
 - test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/config/routes.rb
+- test/rails_app/app/models/user.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/environment.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
 - test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/new_rails_defaults.rb
 - test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/boot.rb
+- test/rails_app/config/routes.rb
 - test/rails_app/vendor/plugins/devise_invitable/init.rb
+- test/routes_test.rb
+- test/test_helper.rb