devise_invitable 0.2.2 → 0.2.3

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

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/devise_invitable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_invitable}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Cambra"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-05-17}
   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 = [
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/scambra/devise_invitable}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{An invitation strategy for devise}
   s.test_files = [
     "test/integration/invitable_test.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>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<devise>, ["~> 1.0.6"])
     else
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<webrat>, [">= 0"])
-      s.add_dependency(%q<devise>, ["~> 1.0.0"])
+      s.add_dependency(%q<devise>, ["~> 1.0.6"])
     end
   else
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<webrat>, [">= 0"])
-    s.add_dependency(%q<devise>, ["~> 1.0.0"])
+    s.add_dependency(%q<devise>, ["~> 1.0.6"])
   end
 end
 

data/lib/devise_invitable/model.rb

@@ -98,13 +98,15 @@ module Devise
         # Options must contain the user email
         def send_invitation(attributes={})
           invitable = find_or_initialize_by_email(attributes[:email])
-          if invitable.email.blank?
-            invitable.errors.add(:email, :blank)
-          elsif invitable.new_record? || invitable.invited?
-            invitable.resend_invitation!
+
+          if invitable.new_record?
+            invitable.errors.add(:email, :blank) if invitable.email.blank?
+            invitable.errors.add(:email, :invalid) unless invitable.email.match Devise::EMAIL_REGEX
           else
-            invitable.errors.add(:email, :already_exits, :default => 'already exists')
+            invitable.errors.add(:email, :taken) unless invitable.invited?
           end
+
+          invitable.resend_invitation! if invitable.errors.empty?
           invitable
         end
 

data/test/integration/invitable_test.rb

@@ -53,7 +53,7 @@ class InvitationTest < ActionController::IntegrationTest
     assert_response :success
     assert_template 'invitations/new'
     assert_have_selector "input[type=text][value='#{user.email}']"
-    assert_contain 'Email already exists'
+    assert_contain 'Email has already been taken'
   end
 
   test 'authenticated user should not be able to visit edit invitation page' do

data/test/model_tests_helper.rb

@@ -30,10 +30,6 @@ class ActiveSupport::TestCase
     User.new(valid_attributes(attributes))
   end
 
-  def create_user(attributes={})
-    User.create!(valid_attributes(attributes))
-  end
-
   def create_user_with_invitation(invitation_token, attributes={})
     user = new_user({:password => nil, :password_confirmation => nil}.update(attributes))
     user.skip_confirmation!
@@ -42,19 +38,4 @@ class ActiveSupport::TestCase
     user.save(false)
     user
   end
-
-  # Execute the block setting the given values and restoring old values after
-  # the block is executed.
-  def swap(object, new_values)
-    old_values = {}
-    new_values.each do |key, value|
-      old_values[key] = object.send key
-      object.send :"#{key}=", value
-    end
-    yield
-  ensure
-    old_values.each do |key, value|
-      object.send :"#{key}=", value
-    end
-  end
 end

data/test/models/invitable_test.rb

@@ -92,7 +92,7 @@ class InvitableTest < ActiveSupport::TestCase
     assert_present user.invitation_token
   end
 
-  test 'should reset reset password token and send invitation by email' do
+  test 'should reset invitation token and send invitation by email' do
     user = new_user
     assert_difference('ActionMailer::Base.deliveries.size') do
       token = user.invitation_token
@@ -102,7 +102,7 @@ class InvitableTest < ActiveSupport::TestCase
   end
 
   test 'should return a record with invitation token and no errors to send invitation by email' do
-    invited_user = User.send_invitation(:email => "invalid@email.com")
+    invited_user = User.send_invitation(:email => "valid@email.com")
     assert invited_user.errors.blank?
     assert_present invited_user.invitation_token
   end
@@ -112,13 +112,19 @@ 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 'already exists', 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
     invited_user = User.send_invitation(:email => '')
     assert invited_user.new_record?
-    assert_equal "can't be blank", invited_user.errors[:email]
+    assert_equal ["can't be blank", "is invalid"], invited_user.errors[:email]
+  end
+
+  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]
   end
 
   test 'should find a user to set his password based on invitation_token' do

data/test/models_test.rb

@@ -1,7 +1,7 @@
 require 'test/test_helper'
 
 class Invitable < User
-  devise :authenticatable, :invitable, :invite_for => 5.days
+  devise :database_authenticatable, :invitable, :invite_for => 5.days
 end
 
 class ActiveRecordTest < ActiveSupport::TestCase
@@ -21,10 +21,10 @@ class ActiveRecordTest < ActiveSupport::TestCase
   end
 
   test 'add invitable module only' do
-    assert_include_modules Invitable, :authenticatable, :invitable
+    assert_include_modules Invitable, :database_authenticatable, :invitable
   end
 
-  test 'set a default value for invit_for' do
+  test 'set a default value for invite_for' do
     assert_equal 5.days, Invitable.invite_for
   end
 

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

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

data/test/rails_app/config/initializers/devise.rb

@@ -1,15 +1,13 @@
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
-  # Configure Devise modules used by default. You should always set this value
-  # because if Devise adds a new strategy, it won't be added to your application
-  # by default, unless you configure it here.
-  #
-  # Remember that Devise includes other modules on its own (like :activatable
-  # and :timeoutable) which are not included here and also plugins. So be sure
-  # to check the docs for a complete set.
-  config.all = [:authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable]
+  # Configure the e-mail address which will be shown in DeviseMailer.
+  config.mailer_sender = "please-change-me@config-initializers-devise.com"
+  
+  # Configure the content type of DeviseMailer mails (defaults to text/html")
+  # config.mailer_content_type = "text/plain"
 
+  # ==> Configuration for :authenticatable
   # Invoke `rake secret` and use the printed value to setup a pepper to generate
   # the encrypted password. By default no pepper is used.
   # config.pepper = "rake secret output"
@@ -18,10 +16,10 @@ Devise.setup do |config|
   # config.stretches = 10
 
   # Define which will be the encryption algorithm. Supported algorithms are :sha1
-  # (default) and :sha512. Devise also supports encryptors from others authentication
-  # frameworks as :clearance_sha1, :authlogic_sha512 (then you should set stretches
-  # above to 20 for default behavior) and :restful_authentication_sha1 (then you
-  # should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
+  # (default), :sha512 and :bcrypt. Devise also supports encryptors from others
+  # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
+  # stretches above to 20 for default behavior) and :restful_authentication_sha1
+  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
   # config.encryptor = :sha1
 
   # Configure which keys are used when authenticating an user. By default is
@@ -31,21 +29,43 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # config.authentication_keys = [ :email ]
 
+  # The realm used in Http Basic Authentication
+  # config.http_authentication_realm = "Application"
+
+  # ==> Configuration for :confirmable
   # The time you want give to your user to confirm his account. During this time
   # he will be able to access your application without confirming. Default is nil.
   # config.confirm_within = 2.days
 
+  # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
 
+  # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again.
   # config.timeout_in = 10.minutes
 
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  # config.mailer_sender = "foo.bar@yourapp.com"
+  # ==> Configuration for :lockable
+  # Number of authentication tries before locking an account.
+  # config.maximum_attempts = 20
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Reanables login after a certain ammount of time (see :unlock_in below)
+  # :both  = enables both strategies
+  # config.unlock_strategy = :both
 
-  # Load and configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # ==> General configuration
+  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper
+  # (requires mongo_ext installed) and :data_mapper (experimental).
   # require 'devise/orm/mongo_mapper'
   # config.orm = :mongo_mapper
 
@@ -54,6 +74,16 @@ Devise.setup do |config|
   # are using only default views.
   # config.scoped_views = true
 
+  # By default, devise detects the role accessed based on the url. So whenever
+  # accessing "/users/sign_in", it knows you are accessing an User. This makes
+  # routes as "/sign_in" not possible, unless you tell Devise to use the default
+  # scope, setting true below.
+  # config.use_default_scope = true
+
+  # Configure the default scope used by Devise. By default it's the first devise
+  # role declared in your routes.
+  # config.default_scope = :user
+
   # If you want to use other strategies, that are not (yet) supported by Devise,
   # you can configure them inside the config.warden block. The example below
   # allows you to setup OAuth, using http://github.com/roman/warden_oauth
@@ -69,7 +99,6 @@ Devise.setup do |config|
 
   # Configure default_url_options if you are using dynamic segments in :path_prefix
   # for devise_for.
-  #
   # config.default_url_options do
   #   { :locale => I18n.locale }
   # end

data/test/test_helper.rb

@@ -21,7 +21,7 @@ ActiveRecord::Base.logger = Logger.new(nil)
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
-    t.authenticatable :null => true
+    t.database_authenticatable :null => true
     t.string :username
     t.confirmable
     t.invitable
@@ -30,7 +30,7 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 class User
-  devise :authenticatable, :invitable
+  devise :database_authenticatable, :invitable
 end
 ActionController::Routing::Routes.draw do |map|
   map.devise_for :users

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: devise_invitable
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -9,39 +14,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +01:00
+date: 2010-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: webrat
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: devise
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 6
+        version: 1.0.6
+  type: :runtime
+  version_requirements: *id003
 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
 executables: []
@@ -115,18 +128,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An invitation strategy for devise