From eb335234d414d282b31d189eb4b574f47b2515e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 19 Nov 2009 20:55:40 -0200
Subject: [PATCH] Release Devise 0.5.5 bringing back Ruby 1.8.6 compatibility.

---
 CHANGELOG.rdoc                    | 7 ++++++-
 lib/devise/controllers/filters.rb | 2 +-
 lib/devise/version.rb             | 2 +-
 test/controllers/filters_test.rb  | 5 +++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 607c8b3f..9c82cda3 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -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
@@ -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
 
diff --git a/lib/devise/controllers/filters.rb b/lib/devise/controllers/filters.rb
index b68350df..3dbce708 100644
--- a/lib/devise/controllers/filters.rb
+++ b/lib/devise/controllers/filters.rb
@@ -126,7 +126,7 @@ module Devise
       # 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
 
diff --git a/lib/devise/version.rb b/lib/devise/version.rb
index fbf0b57e..13133f61 100644
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.5.4".freeze
+  VERSION = "0.5.5".freeze
 end
diff --git a/test/controllers/filters_test.rb b/test/controllers/filters_test.rb
index ce6b12cf..8ba58868 100644
--- a/test/controllers/filters_test.rb
+++ b/test/controllers/filters_test.rb
@@ -149,6 +149,11 @@ class ControllerAuthenticableTest < ActionController::TestCase
     @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)