devise 1.0.7 → 1.0.8

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.0.8
+
+* enhancements
+  * Support for latest MongoMapper
+  * Added anybody_signed_in? helper (by github.com/SSDany)
+
+* bug fix
+  * confirmation_required? is properly honored on active? calls. (by github.com/paulrosania)
+
 == 1.0.7
 
 * bug fix

data/README.rdoc

@@ -36,7 +36,7 @@ Install warden gem if you don't have it installed:
 
 Install devise gem:
 
-  sudo gem install devise --version=1.0.6
+  sudo gem install devise --version=1.0.7
 
 Configure warden and devise gems inside your app:
 
@@ -247,7 +247,9 @@ Please refer to TODO file.
 
 == Contributors
 
-We have a long running list of contributors. Check them in the CHANGELOG or do `git shortlog -s -n` in the cloned repository.
+We have a long running list of contributors. Check them all here:
+
+http://github.com/plataformatec/devise/contributors
 
 == Bugs and Feedback
 

data/generators/devise/templates/model.rb

@@ -1,7 +1,7 @@
 class <%= class_name %> < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :http_authenticatable, :token_authenticatable, :confirmable, :lockable, :timeoutable and :activatable
-  devise :registerable, :authenticatable, :recoverable,
+  devise :registerable, :database_authenticatable, :recoverable,
          :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model

data/lib/devise/controllers/helpers.rb

@@ -5,7 +5,7 @@ module Devise
 
       def self.included(base)
         base.class_eval do
-          helper_method :warden, :signed_in?, :devise_controller?,
+          helper_method :warden, :signed_in?, :devise_controller?, :anybody_signed_in?,
                         *Devise.mappings.keys.map { |m| [:"current_#{m}", :"#{m}_signed_in?", :"#{m}_session"] }.flatten
 
           # Use devise default_url_options. We have to declare it here to overwrite
@@ -48,6 +48,12 @@ module Devise
         warden.authenticate?(:scope => scope)
       end
 
+      # Check if the any scope is signed in session, without running
+      # authentication hooks.
+      def anybody_signed_in?
+        Devise.mappings.keys.any? { |scope| signed_in?(scope) }
+      end
+
       # Sign in an user that already was authenticated. This helper is useful for logging
       # users in after sign up.
       #

data/lib/devise/models/confirmable.rb

@@ -57,6 +57,7 @@ module Devise
 
       # Send confirmation instructions by email
       def send_confirmation_instructions
+        generate_confirmation_token if self.confirmation_token.nil?
         ::DeviseMailer.deliver_confirmation_instructions(self)
       end
 
@@ -70,7 +71,7 @@ module Devise
       # is already confirmed, it should never be blocked. Otherwise we need to
       # calculate if the confirm time has not expired for this user.
       def active?
-        super && (confirmed? || confirmation_period_valid?)
+        super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
       end
 
       # The message to be shown if the account is inactive.

data/lib/devise/orm/mongo_mapper.rb

@@ -43,5 +43,10 @@ module Devise
   end
 end
 
-MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
-MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
+if MongoMapper::Version >= "0.8.0"
+  MongoMapper::Plugins::Document::ClassMethods.send(:include, Devise::Models)
+  MongoMapper::Plugins::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
+else
+  MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
+  MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
+end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.0.7".freeze
+  VERSION = "1.0.8".freeze
 end

data/test/controllers/helpers_test.rb

@@ -36,6 +36,13 @@ class ControllerAuthenticableTest < ActionController::TestCase
     @controller.signed_in?(:my_scope)
   end
 
+  test 'proxy anybody_signed_in? to signed_in?' do
+    Devise.mappings.keys.each { |scope| # :user, :admin, :manager
+      @controller.expects(:signed_in?).with(scope)
+    }
+    @controller.anybody_signed_in?
+  end
+
   test 'proxy current_admin to authenticate with admin scope' do
     @mock_warden.expects(:authenticate).with(:scope => :admin)
     @controller.current_admin

data/test/models/confirmable_test.rb

@@ -134,6 +134,14 @@ class ConfirmableTest < ActiveSupport::TestCase
       User.send_confirmation_instructions(:email => user.email)
     end
   end
+  
+  test 'should always have confirmation token when email is sent' do
+    user = new_user
+    user.instance_eval { def confirmation_required?; false end }
+    user.save
+    user.send_confirmation_instructions
+    assert_not_nil user.confirmation_token
+  end
 
   test 'should not resend email instructions if the user change his email' do
     user = create_user
@@ -209,4 +217,12 @@ class ConfirmableTest < ActiveSupport::TestCase
     user.save
     assert_not user.reload.active?
   end
+  
+  test 'should be active without confirmation when confirmation is not required' do
+    user = create_user
+    user.instance_eval { def confirmation_required?; false end }
+    user.confirmation_sent_at = nil
+    user.save
+    assert user.reload.active?
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +02:00
+date: 2010-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: warden
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
@@ -121,6 +124,65 @@ files:
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
 - rails/init.rb
+- test/controllers/helpers_test.rb
+- test/controllers/internal_helpers_test.rb
+- test/controllers/url_helpers_test.rb
+- test/devise_test.rb
+- test/encryptors_test.rb
+- test/failure_app_test.rb
+- test/integration/authenticatable_test.rb
+- test/integration/confirmable_test.rb
+- test/integration/http_authenticatable_test.rb
+- test/integration/lockable_test.rb
+- test/integration/rack_middleware_test.rb
+- test/integration/recoverable_test.rb
+- test/integration/registerable_test.rb
+- test/integration/rememberable_test.rb
+- test/integration/timeoutable_test.rb
+- test/integration/token_authenticatable_test.rb
+- test/integration/trackable_test.rb
+- test/mailers/confirmation_instructions_test.rb
+- test/mailers/reset_password_instructions_test.rb
+- test/mailers/unlock_instructions_test.rb
+- test/mapping_test.rb
+- test/models/authenticatable_test.rb
+- test/models/confirmable_test.rb
+- test/models/lockable_test.rb
+- test/models/recoverable_test.rb
+- test/models/rememberable_test.rb
+- test/models/timeoutable_test.rb
+- test/models/token_authenticatable_test.rb
+- test/models/trackable_test.rb
+- test/models/validatable_test.rb
+- test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongo_mapper.rb
+- test/rails_app/app/active_record/admin.rb
+- test/rails_app/app/active_record/user.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/helpers/application_helper.rb
+- test/rails_app/app/mongo_mapper/admin.rb
+- test/rails_app/app/mongo_mapper/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/devise.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/routes.rb
+- test/routes_test.rb
+- test/support/assertions_helper.rb
+- test/support/integration_tests_helper.rb
+- test/support/test_silencer.rb
+- test/support/tests_helper.rb
+- test/test_helper.rb
+- test/test_helpers_test.rb
 has_rdoc: true
 homepage: http://github.com/plataformatec/devise
 licenses: []
@@ -131,23 +193,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden