devise 3.2.3 → 3.2.4

data/test/support/helpers.rb

@@ -23,10 +23,10 @@ class ActiveSupport::TestCase
   end
 
   def valid_attributes(attributes={})
-    { :username => "usertest",
-      :email => generate_unique_email,
-      :password => '12345678',
-      :password_confirmation => '12345678' }.update(attributes)
+    { username: "usertest",
+      email: generate_unique_email,
+      password: '12345678',
+      password_confirmation: '12345678' }.update(attributes)
   end
 
   def new_user(attributes={})

data/test/support/integration.rb

@@ -8,11 +8,11 @@ class ActionDispatch::IntegrationTest
   def create_user(options={})
     @user ||= begin
       user = User.create!(
-        :username => 'usertest',
-        :email => options[:email] || 'user@test.com',
-        :password => options[:password] || '12345678',
-        :password_confirmation => options[:password] || '12345678',
-        :created_at => Time.now.utc
+        username: 'usertest',
+        email: options[:email] || 'user@test.com',
+        password: options[:password] || '12345678',
+        password_confirmation: options[:password] || '12345678',
+        created_at: Time.now.utc
       )
       user.update_attribute(:confirmation_sent_at, options[:confirmation_sent_at]) if options[:confirmation_sent_at]
       user.confirm! unless options[:confirm] == false
@@ -24,9 +24,9 @@ class ActionDispatch::IntegrationTest
   def create_admin(options={})
     @admin ||= begin
       admin = Admin.create!(
-        :email => options[:email] || 'admin@test.com',
-        :password => '123456', :password_confirmation => '123456',
-        :active => options[:active]
+        email: options[:email] || 'admin@test.com',
+        password: '123456', password_confirmation: '123456',
+        active: options[:active]
       )
       admin.confirm! unless options[:confirm] == false
       admin
@@ -36,8 +36,8 @@ class ActionDispatch::IntegrationTest
   def sign_in_as_user(options={}, &block)
     user = create_user(options)
     visit_with_option options[:visit], new_user_session_path
-    fill_in 'email', :with => options[:email] || 'user@test.com'
-    fill_in 'password', :with => options[:password] || '12345678'
+    fill_in 'email', with: options[:email] || 'user@test.com'
+    fill_in 'password', with: options[:password] || '12345678'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?
     click_button 'Sign In'
@@ -47,8 +47,8 @@ class ActionDispatch::IntegrationTest
   def sign_in_as_admin(options={}, &block)
     admin = create_admin(options)
     visit_with_option options[:visit], new_admin_session_path
-    fill_in 'email', :with => 'admin@test.com'
-    fill_in 'password', :with => '123456'
+    fill_in 'email', with: 'admin@test.com'
+    fill_in 'password', with: '123456'
     yield if block_given?
     click_button 'Sign In'
     admin

data/test/test_helpers_test.rb

@@ -17,7 +17,7 @@ class TestHelpersTest < ActionController::TestCase
   end
 
   test "redirects if attempting to access a page with an unconfirmed account" do
-    swap Devise, :allow_unconfirmed_access_for => 0.days do
+    swap Devise, allow_unconfirmed_access_for: 0.days do
       user = create_user
       assert !user.active_for_authentication?
 
@@ -28,12 +28,12 @@ class TestHelpersTest < ActionController::TestCase
   end
 
   test "returns nil if accessing current_user with an unconfirmed account" do
-    swap Devise, :allow_unconfirmed_access_for => 0.days do
+    swap Devise, allow_unconfirmed_access_for: 0.days do
       user = create_user
       assert !user.active_for_authentication?
 
       sign_in user
-      get :accept, :id => user
+      get :accept, id: user
       assert_nil assigns(:current_user)
     end
   end

data/test/test_models.rb

@@ -1,11 +1,11 @@
 class Configurable < User
   devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
+         stretches: 15, pepper: 'abcdef', allow_unconfirmed_access_for: 5.days,
+         remember_for: 7.days, timeout_in: 15.minutes, unlock_in: 10.days
 end
 
 class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
+  devise :database_authenticatable, :validatable, password_length: 2..6
 end
 
 class UserWithValidation < User
@@ -20,8 +20,8 @@ class UserWithCustomEncryption < User
 end
 
 class UserWithVirtualAttributes < User
-  devise :case_insensitive_keys => [ :email, :email_confirmation ]
-  validates :email, :presence => true, :confirmation => {:on => :create}
+  devise case_insensitive_keys: [ :email, :email_confirmation ]
+  validates :email, presence: true, confirmation: {on: :create}
 end
 
 class Several < Admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: devise
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flexible authentication solution for Rails with Warden