authenticate 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b20e579605068181100a79652e0d2f59b40d7a5
-  data.tar.gz: 4cca1df92302dee427285af9453c9489fe9b985e
+  metadata.gz: 064f6cc3d53977f074f3d50a8bd844741e21061d
+  data.tar.gz: 6158456020cb666d65d1d0d2fb03db0994e58311
 SHA512:
-  metadata.gz: '0855f6f3b59e182affb16b9e71ad9224ac031494c73acb869e335ff86781e5130fa9dcc0d28f24d17cf3f2e9e2dad2fcd82caefd15d0b27604b5cf9096975f58'
-  data.tar.gz: 58f3a8f48083d62280a32221c0130056cb5abf360dce3c9eb50c274667aff6dfc14eedb3e0f145b32579af653b0be068394609f5e59f3058069ef99e2695f45d
+  metadata.gz: a0c0df19972e607c36030c29f08b393fb3da6338348c7130ced5bcb578b3b577758a518b768e414573fcc82ee5b5ac7afc87d563a51f6ef15ff1c533445fa936
+  data.tar.gz: 3319a94b72c651f3add224978dc1f7840670a992c7c539a93059de2df9478d6e78ea9fb3c20ae87eb743d97f6f89cba2395ddce373c1324609d64390d4171759

data/.travis.yml

@@ -13,6 +13,7 @@ gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
   - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
 
 
 matrix:
@@ -21,6 +22,8 @@ matrix:
       gemfile: gemfiles/5.0.gemfile
     - rvm: 2.1.8
       gemfile: gemfiles/5.1.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/5.2.gemfile
     - rvm: 2.4.1
       gemfile: gemfiles/4.2.gemfile
 

data/Appraisals

@@ -4,7 +4,7 @@ if RUBY_VERSION < "2.4.0"
     end
 end
 
-if RUBY_VERSION >= "2.2.0"
+if RUBY_VERSION >= "2.2.2"
   appraise "5.0" do
     gem "rails", "~> 5.0.0"
   end
@@ -12,5 +12,9 @@ if RUBY_VERSION >= "2.2.0"
   appraise "5.1" do
     gem "rails", "~> 5.1"
   end
+
+  appraise "5.2" do
+    gem "rails", "~> 5.2"
+  end
 end
 

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Authenticate Changelog
 
 
+## [0.7.3] - June 7, 2018
+
+### Support for rails 5.2
+- added rails 5.2 support to gemspec
+- added rails 5.2 to Appraisals, .travis.yml, gemfiles
+- added `sqlite3.represent_boolean_as_integer = true` to dummy application config 
+- bumped authenticate version
+- update request specs, looks for 302 after login
+- added build and release tasks to Rakefile
+
+[0.7.3]: https://github.com/tomichj/authenticate/compare/v0.7.2...v0.7.3
+
+
 ## [0.7.2] - June 22, 2017
 
 ### API change

data/Rakefile

@@ -16,3 +16,11 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run all specs in spec directory (excluding plugin specs)'
 task default: :spec
+
+task :build do
+  system "gem build authenticate.gemspec"
+end
+
+task release: :build do
+  system "gem push authenticate-#{Authenticate::VERSION}"
+end

data/app/controllers/authenticate/passwords_controller.rb

@@ -6,14 +6,13 @@ class Authenticate::PasswordsController < Authenticate::AuthenticateController
   before_action :ensure_existing_user, only: [:edit, :update]
 
   # Display screen to request a password change email.
+  #
   # GET /users/passwords/new
   def new
     render template: 'passwords/new'
   end
 
   # Send password change email.
-  #
-  # POST /users/password
   def create
     if (user = find_user_for_create)
       user.forgot_password!
@@ -22,12 +21,12 @@ class Authenticate::PasswordsController < Authenticate::AuthenticateController
     redirect_to sign_in_path, notice: flash_create_description
   end
 
-  # Screen to enter your new password.
+  # Enter a new password.
   #
-  # A get with the token in the url is expected:
+  # A get with the token in the url is expected, for example:
   #   GET /users/passwords/3/edit?token=abcdef
   #
-  # This results in a redirect with the token removed from the url & copied to the session:
+  # Results in a redirect with the token removed from the url & copied to the session:
   #   GET /users/passwords/3/edit
   #
   def edit
@@ -35,7 +34,7 @@ class Authenticate::PasswordsController < Authenticate::AuthenticateController
 
     if params[:token]
       session[:password_reset_token] = params[:token]
-      redirect_to edit_users_password_url(@user)
+      redirect_to url_for
     elsif !@user.reset_password_period_valid?
       redirect_to sign_in_path, notice: flash_failure_token_expired
     else
@@ -43,9 +42,6 @@ class Authenticate::PasswordsController < Authenticate::AuthenticateController
     end
   end
 
-  # Save the new password entered in #edit.
-  #
-  # PUT /users/passwords/3/
   def update
     @user = find_user_for_update
 

data/authenticate.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'bcrypt'
   s.add_dependency 'email_validator', '~> 1.6'
-  s.add_dependency 'rails', '>= 4.0', '< 5.2'
+  s.add_dependency 'rails', '>= 4.0', '< 5.3'
 
-  s.add_development_dependency 'factory_girl', '~> 4.8'
+  s.add_development_dependency 'factory_bot', '~> 4.8.2'
   s.add_development_dependency 'rspec-rails', '~> 3.6'
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_development_dependency 'sqlite3', '~> 1.3'

data/gemfiles/5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+
+gemspec path: "../"

data/lib/authenticate/controller.rb

@@ -16,7 +16,7 @@ module Authenticate
   # * logout - log a user out, invalidating their Authenticate session.
   #
   # Action/Filter:
-  # * require_authentication - restrict access to authenticated users, often from ApplicationController
+  # * require_login - restrict access to authenticated users, often from ApplicationController
   #
   # Helpers, used anywhere:
   # * current_user - get the currently logged in user
@@ -129,7 +129,7 @@ module Authenticate
       is_a?(Authenticate::AuthenticateController)
     end
 
-    # The old API.
+    # The old API. DEPRECATED, use #require_login instead.
     #
     # todo: remove in a future version.
     def require_authentication
@@ -138,7 +138,7 @@ module Authenticate
       require_login
     end
 
-    # The old API.
+    # The old API. DEPRECATED, use #logged_in? instead.
     #
     # todo: remove in a future version.
     def authenticated?

data/lib/authenticate/lifecycle.rb

@@ -62,7 +62,7 @@ module Authenticate
     # Example:
     #   Authenticate.lifecycle.run_callbacks(:after_set_user, @current_user, self, { event: :authentication })
     #
-    def run_callbacks(kind, *args) # args - |user, session, opts|
+    def run_callbacks(kind, user, session, *args) # args - |user, session, opts|
       # Last callback arg MUST be a Hash
       options = args.last
       send("#{kind}_callbacks").each do |callback, conditions| # each callback has 'conditions' stored with it
@@ -70,7 +70,7 @@ module Authenticate
         invalid = conditions.find do |key, value|
           value.is_a?(Array) ? !value.include?(options[key]) : (value != options[key])
         end
-        callback.call(*args) unless invalid
+        callback.call(user, session, *args) unless invalid
       end
       nil
     end

data/lib/authenticate/session.rb

@@ -19,6 +19,7 @@ module Authenticate
     end
 
     # Finish user login process, *after* the user has been authenticated.
+    # The user is authenticated by Authenticate::Controller#authenticate.
     #
     # Called when user creates an account or signs back into the app.
     # Runs all configured callbacks, checking for login failure.
@@ -81,7 +82,7 @@ module Authenticate
       # nuke notion of current_user
       @current_user = nil
 
-      # # nuke cookie
+      # nuke session_token cookie from the client browser
       @cookies.delete cookie_name
     end
 

data/lib/authenticate/version.rb

@@ -1,3 +1,3 @@
 module Authenticate
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

data/spec/dummy/config/application.rb

@@ -26,3 +26,8 @@ module Dummy
 end
 
 Rails.application.routes.default_url_options[:host] = 'localhost:3000'
+
+if Rails.application.config.active_record.sqlite3.respond_to? :represent_boolean_as_integer
+  Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+end
+

data/spec/factories/users.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :email do |n|
     "user#{n}@example.com"
   end

data/spec/requests/csrf_rotation_spec.rb

@@ -23,6 +23,7 @@ describe 'CSRF rotation' do
         do_post session_path, params: { **session_params }
 
         # expect that we now have a new csrf token
+        expect(response).to have_http_status(302)
         expect(csrf_token).not_to eq original_token
         expect(csrf_token).to be_present
       end

data/spec/requests/session_key_spec.rb

@@ -7,6 +7,10 @@ describe 'session key assignment' do
       do_post session_path, params: { session: { email: @user.email, password: @user.password } }
     end
 
+    it 'redirects after login' do
+      expect(response).to have_http_status(302)
+    end
+
     it 'sets user session token' do
       @user.reload
       expect(@user.session_token).to_not be_nil

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ require 'rspec/rails'
 require 'capybara/rails'
 require 'capybara/rspec'
 require 'database_cleaner'
-require 'factory_girl'
+require 'factory_bot'
 require 'timecop'
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
@@ -20,7 +20,7 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 Rails.backtrace_cleaner.remove_silencers!
 DatabaseCleaner.strategy = :truncation
 
-# Load factory girl factories.
+# Load factory bot factories.
 Dir[File.join(File.dirname(__FILE__), 'factories/**/*.rb')].each { |f| require f }
 
 # Build test database in spec/dummy/db. There's probably a better way to do this.
@@ -35,7 +35,7 @@ if ActiveRecord::VERSION::STRING >= '4.2' && ActiveRecord::VERSION::STRING < '5.
 end
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.infer_spec_type_from_file_location!
   config.order = :random
   config.use_transactional_fixtures = true
@@ -54,4 +54,3 @@ RSpec.configure do |config|
     Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authenticate
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Justin Tomich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -47,7 +47,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,21 +57,21 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: 4.8.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
+- gemfiles/5.2.gemfile
 - lib/authenticate.rb
 - lib/authenticate/callbacks/authenticatable.rb
 - lib/authenticate/callbacks/brute_force.rb