devise 3.4.1 → 3.5.10

data/test/rails_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class RailsTest < ActiveSupport::TestCase
+  test 'correct initializer position' do
+    initializer = Devise::Engine.initializers.detect { |i| i.name == 'devise.omniauth' }
+    assert_equal :load_config_initializers, initializer.after
+    assert_equal :build_middleware_stack, initializer.before
+  end
+end

data/test/support/helpers.rb

@@ -46,6 +46,10 @@ class ActiveSupport::TestCase
     Admin.create!(valid_attributes)
   end
 
+  def create_user_without_email(attributes={})
+    UserWithoutEmail.create!(valid_attributes(attributes))
+  end
+
   # Execute the block setting the given values and restoring old values after
   # the block is executed.
   def swap(object, new_values)

data/test/support/integration.rb

@@ -15,7 +15,7 @@ class ActionDispatch::IntegrationTest
         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
+      user.confirm unless options[:confirm] == false
       user.lock_access! if options[:locked] == true
       user
     end
@@ -28,7 +28,7 @@ class ActionDispatch::IntegrationTest
         password: '123456', password_confirmation: '123456',
         active: options[:active]
       )
-      admin.confirm! unless options[:confirm] == false
+      admin.confirm unless options[:confirm] == false
       admin
     end
   end

data/test/test_helpers_test.rb

@@ -34,7 +34,7 @@ class TestHelpersTest < ActionController::TestCase
 
   test "does not redirect with valid user" do
     user = create_user
-    user.confirm!
+    user.confirm
 
     sign_in user
     get :index
@@ -46,7 +46,7 @@ class TestHelpersTest < ActionController::TestCase
     assert_response :redirect
 
     user = create_user
-    user.confirm!
+    user.confirm
 
     sign_in user
     get :index
@@ -55,7 +55,7 @@ class TestHelpersTest < ActionController::TestCase
 
   test "redirects if valid user signed out" do
     user = create_user
-    user.confirm!
+    user.confirm
 
     sign_in user
     get :index
@@ -105,7 +105,7 @@ class TestHelpersTest < ActionController::TestCase
       end
 
       user = create_user
-      user.confirm!
+      user.confirm
       sign_in user
     ensure
       Warden::Manager._after_set_user.pop
@@ -118,7 +118,7 @@ class TestHelpersTest < ActionController::TestCase
         flunk "callback was called while it should not"
       end
       user = create_user
-      user.confirm!
+      user.confirm
 
       sign_in user
       sign_out user
@@ -146,7 +146,7 @@ class TestHelpersTest < ActionController::TestCase
 
   test "allows to sign in with different users" do
     first_user = create_user
-    first_user.confirm!
+    first_user.confirm
 
     sign_in first_user
     get :index
@@ -154,10 +154,25 @@ class TestHelpersTest < ActionController::TestCase
     sign_out first_user
 
     second_user = create_user
-    second_user.confirm!
+    second_user.confirm
 
     sign_in second_user
     get :index
     assert_match /User ##{second_user.id}/, @response.body
   end
+
+  test "creates a new warden proxy if the request object has changed" do
+    old_warden_proxy = warden
+    @request = ActionController::TestRequest.new
+    new_warden_proxy = warden
+
+    assert_not_equal old_warden_proxy, new_warden_proxy
+  end
+
+  test "doesn't create a new warden proxy if the request object hasn't changed" do
+    old_warden_proxy = warden
+    new_warden_proxy = warden
+
+    assert_equal old_warden_proxy, new_warden_proxy
+  end
 end

data/test/test_models.rb

@@ -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

data/test/time_helpers.rb

@@ -0,0 +1,137 @@
+# A copy of Rails time helpers. With this file we can support the `travel_to`
+# helper for Rails versions prior 4.1.
+# File origin: https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/activesupport/lib/active_support/testing/time_helpers.rb
+module ActiveSupport
+  module Testing
+    class SimpleStubs # :nodoc:
+      Stub = Struct.new(:object, :method_name, :original_method)
+
+      def initialize
+        @stubs = {}
+      end
+
+      def stub_object(object, method_name, return_value)
+        key = [object.object_id, method_name]
+
+        if stub = @stubs[key]
+          unstub_object(stub)
+        end
+
+        new_name = "__simple_stub__#{method_name}"
+
+        @stubs[key] = Stub.new(object, method_name, new_name)
+
+        object.singleton_class.send :alias_method, new_name, method_name
+        object.define_singleton_method(method_name) { return_value }
+      end
+
+      def unstub_all!
+        @stubs.each_value do |stub|
+          unstub_object(stub)
+        end
+        @stubs = {}
+      end
+
+      private
+
+        def unstub_object(stub)
+          singleton_class = stub.object.singleton_class
+          singleton_class.send :undef_method, stub.method_name
+          singleton_class.send :alias_method, stub.method_name, stub.original_method
+          singleton_class.send :undef_method, stub.original_method
+        end
+    end
+
+    # Contains helpers that help you test passage of time.
+    module TimeHelpers
+      # Changes current time to the time in the future or in the past by a given time difference by
+      # stubbing +Time.now+, +Date.today+, and +DateTime.now+.
+      #
+      #   Time.current     # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      #   travel 1.day
+      #   Time.current     # => Sun, 10 Nov 2013 15:34:49 EST -05:00
+      #   Date.current     # => Sun, 10 Nov 2013
+      #   DateTime.current # => Sun, 10 Nov 2013 15:34:49 -0500
+      #
+      # This method also accepts a block, which will return the current time back to its original
+      # state at the end of the block:
+      #
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      #   travel 1.day do
+      #     User.create.created_at # => Sun, 10 Nov 2013 15:34:49 EST -05:00
+      #   end
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      def travel(duration, &block)
+        travel_to Time.now + duration, &block
+      end
+
+      # Changes current time to the given time by stubbing +Time.now+,
+      # +Date.today+, and +DateTime.now+ to return the time or date passed into this method.
+      #
+      #   Time.current     # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      #   travel_to Time.new(2004, 11, 24, 01, 04, 44)
+      #   Time.current     # => Wed, 24 Nov 2004 01:04:44 EST -05:00
+      #   Date.current     # => Wed, 24 Nov 2004
+      #   DateTime.current # => Wed, 24 Nov 2004 01:04:44 -0500
+      #
+      # Dates are taken as their timestamp at the beginning of the day in the
+      # application time zone. <tt>Time.current</tt> returns said timestamp,
+      # and <tt>Time.now</tt> its equivalent in the system time zone. Similarly,
+      # <tt>Date.current</tt> returns a date equal to the argument, and
+      # <tt>Date.today</tt> the date according to <tt>Time.now</tt>, which may
+      # be different. (Note that you rarely want to deal with <tt>Time.now</tt>,
+      # or <tt>Date.today</tt>, in order to honor the application time zone
+      # please always use <tt>Time.current</tt> and <tt>Date.current</tt>.)
+      #
+      # Note that the usec for the time passed will be set to 0 to prevent rounding
+      # errors with external services, like MySQL (which will round instead of floor,
+      # leading to off-by-one-second errors).
+      #
+      # This method also accepts a block, which will return the current time back to its original
+      # state at the end of the block:
+      #
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      #   travel_to Time.new(2004, 11, 24, 01, 04, 44) do
+      #     Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
+      #   end
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      def travel_to(date_or_time)
+        if date_or_time.is_a?(Date) && !date_or_time.is_a?(DateTime)
+          now = date_or_time.midnight.to_time
+        else
+          now = date_or_time.to_time.change(usec: 0)
+        end
+
+        simple_stubs.stub_object(Time, :now, now)
+        simple_stubs.stub_object(Date, :today, now.to_date)
+        simple_stubs.stub_object(DateTime, :now, now.to_datetime)
+
+        if block_given?
+          begin
+            yield
+          ensure
+            travel_back
+          end
+        end
+      end
+
+      # Returns the current time back to its original state, by removing the stubs added by
+      # `travel` and `travel_to`.
+      #
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      #   travel_to Time.new(2004, 11, 24, 01, 04, 44)
+      #   Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
+      #   travel_back
+      #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
+      def travel_back
+        simple_stubs.unstub_all!
+      end
+
+      private
+
+        def simple_stubs
+          @simple_stubs ||= SimpleStubs.new
+        end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.10
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -111,6 +111,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -128,6 +129,7 @@ files:
 - app/mailers/devise/mailer.rb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/password_change.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
 - app/views/devise/passwords/edit.html.erb
@@ -146,6 +148,8 @@ files:
 - gemfiles/Gemfile.rails-4.0-stable.lock
 - gemfiles/Gemfile.rails-4.1-stable
 - gemfiles/Gemfile.rails-4.1-stable.lock
+- gemfiles/Gemfile.rails-4.2-stable
+- gemfiles/Gemfile.rails-4.2-stable.lock
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/rememberable.rb
@@ -154,6 +158,7 @@ files:
 - lib/devise/controllers/store_location.rb
 - lib/devise/controllers/url_helpers.rb
 - lib/devise/delegator.rb
+- lib/devise/encryptor.rb
 - lib/devise/failure_app.rb
 - lib/devise/hooks/activatable.rb
 - lib/devise/hooks/csrf_cleaner.rb
@@ -215,6 +220,7 @@ files:
 - lib/generators/templates/controllers/unlocks_controller.rb
 - lib/generators/templates/devise.rb
 - lib/generators/templates/markerb/confirmation_instructions.markerb
+- lib/generators/templates/markerb/password_change.markerb
 - lib/generators/templates/markerb/reset_password_instructions.markerb
 - lib/generators/templates/markerb/unlock_instructions.markerb
 - lib/generators/templates/simple_form_for/confirmations/new.html.erb
@@ -228,8 +234,11 @@ files:
 - script/s3-put
 - test/controllers/custom_registrations_controller_test.rb
 - test/controllers/custom_strategy_test.rb
+- test/controllers/helper_methods_test.rb
 - test/controllers/helpers_test.rb
+- test/controllers/inherited_controller_i18n_messages_test.rb
 - test/controllers/internal_helpers_test.rb
+- test/controllers/load_hooks_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
@@ -282,6 +291,7 @@ files:
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/active_record/user_on_engine.rb
 - test/rails_app/app/active_record/user_on_main_app.rb
+- test/rails_app/app/active_record/user_without_email.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
@@ -301,6 +311,7 @@ files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/mongoid/user_on_engine.rb
 - test/rails_app/app/mongoid/user_on_main_app.rb
+- test/rails_app/app/mongoid/user_without_email.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
 - test/rails_app/app/views/home/admin_dashboard.html.erb
@@ -334,11 +345,13 @@ files:
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/lib/shared_user_without_email.rb
 - test/rails_app/lib/shared_user_without_omniauth.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
+- test/rails_test.rb
 - test/routes_test.rb
 - test/support/action_controller/record_identifier.rb
 - test/support/assertions.rb
@@ -350,6 +363,7 @@ files:
 - test/test_helper.rb
 - test/test_helpers_test.rb
 - test/test_models.rb
+- test/time_helpers.rb
 homepage: https://github.com/plataformatec/devise
 licenses:
 - MIT
@@ -369,16 +383,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: devise
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Flexible authentication solution for Rails with Warden
 test_files:
 - test/controllers/custom_registrations_controller_test.rb
 - test/controllers/custom_strategy_test.rb
+- test/controllers/helper_methods_test.rb
 - test/controllers/helpers_test.rb
+- test/controllers/inherited_controller_i18n_messages_test.rb
 - test/controllers/internal_helpers_test.rb
+- test/controllers/load_hooks_controller_test.rb
 - test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
@@ -431,6 +448,7 @@ test_files:
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/active_record/user_on_engine.rb
 - test/rails_app/app/active_record/user_on_main_app.rb
+- test/rails_app/app/active_record/user_without_email.rb
 - test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
@@ -450,6 +468,7 @@ test_files:
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/app/mongoid/user_on_engine.rb
 - test/rails_app/app/mongoid/user_on_main_app.rb
+- test/rails_app/app/mongoid/user_without_email.rb
 - test/rails_app/app/views/admins/index.html.erb
 - test/rails_app/app/views/admins/sessions/new.html.erb
 - test/rails_app/app/views/home/admin_dashboard.html.erb
@@ -483,11 +502,13 @@ test_files:
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/lib/shared_user_without_email.rb
 - test/rails_app/lib/shared_user_without_omniauth.rb
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
+- test/rails_test.rb
 - test/routes_test.rb
 - test/support/action_controller/record_identifier.rb
 - test/support/assertions.rb
@@ -499,3 +520,4 @@ test_files:
 - test/test_helper.rb
 - test/test_helpers_test.rb
 - test/test_models.rb
+- test/time_helpers.rb