Skip to content

Commit

Permalink
Release Devise 0.5.5 bringing back Ruby 1.8.6 compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Nov 19, 2009
1 parent 3cee549 commit eb33523
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.rdoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
== 0.5.5

* enhancements
* Allow overwriting find for authentication method
* [#38] Remove Ruby 1.8.7 dependency

== 0.5.4

* deprecations
Expand All @@ -8,7 +14,6 @@
overwriten in ApplicationController
* Create sign_in_and_redirect and sign_out_and_redirect helpers
* Warden::Manager.default_scope is automatically configured to the first given scope
* Allow overwriting find for authentication method

== 0.5.3

Expand Down
2 changes: 1 addition & 1 deletion lib/devise/controllers/filters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def after_sign_out_path_for(resource_or_scope)
# If just a symbol is given, consider that the user was already signed in
# through other means and just perform the redirection.
def sign_in_and_redirect(*args)
sign_in(*args) unless args.one? && args.first.is_a?(Symbol)
sign_in(*args) unless args.size == 1 && args.first.is_a?(Symbol)
redirect_to stored_location_for(args.first) || after_sign_in_path_for(args.first)
end

Expand Down
2 changes: 1 addition & 1 deletion lib/devise/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Devise
VERSION = "0.5.4".freeze
VERSION = "0.5.5".freeze
end
5 changes: 5 additions & 0 deletions test/controllers/filters_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ def setup
@controller.sign_in_and_redirect(admin)
end

test 'only redirect if just a symbol is given' do
@controller.expects(:redirect_to).with(admin_root_path)
@controller.sign_in_and_redirect(:admin)
end

test 'sign out and redirect uses the configured after sign out path' do
@mock_warden.expects(:user).with(:admin).returns(true)
@mock_warden.expects(:logout).with(:admin).returns(true)
Expand Down

0 comments on commit eb33523

Please sign in to comment.