Format with rubyfmt (#88)

.travis.yml

@@ -4,6 +4,7 @@ rvm:
  - 2.4
  - 2.5
  - 2.6
+ - 2.7
 script:
  - bin/rails db:migrate RAILS_ENV=test
  - bin/rails test

README.md

@@ -4,7 +4,7 @@
  <br />
 </p>
 
-[![Travis](https://travis-ci.org/mikker/passwordless.svg?branch=master)](https://travis-ci.org/mikker/passwordless) [![Rubygems](https://img.shields.io/gem/v/passwordless.svg)](https://rubygems.org/gems/passwordless) [![codecov](https://codecov.io/gh/mikker/passwordless/branch/master/graph/badge.svg)](https://codecov.io/gh/mikker/passwordless) [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
+[![Travis](https://travis-ci.org/mikker/passwordless.svg?branch=master)](https://travis-ci.org/mikker/passwordless) [![Rubygems](https://img.shields.io/gem/v/passwordless.svg)](https://rubygems.org/gems/passwordless) [![codecov](https://codecov.io/gh/mikker/passwordless/branch/master/graph/badge.svg)](https://codecov.io/gh/mikker/passwordless)
 
 Add authentication to your Rails app without all the icky-ness of passwords.
 

app/controllers/passwordless/sessions_controller.rb

@@ -43,23 +43,23 @@ def create
  def show
  # Make it "slow" on purpose to make brute-force attacks more of a hassle
  BCrypt::Password.create(params[:token])
- sign_in passwordless_session
+ sign_in(passwordless_session)
 
- redirect_to passwordless_success_redirect_path
+ redirect_to(passwordless_success_redirect_path)
  rescue Errors::TokenAlreadyClaimedError
  flash[:error] = I18n.t(".passwordless.sessions.create.token_claimed")
- redirect_to passwordless_failure_redirect_path
+ redirect_to(passwordless_failure_redirect_path)
  rescue Errors::SessionTimedOutError
  flash[:error] = I18n.t(".passwordless.sessions.create.session_expired")
- redirect_to passwordless_failure_redirect_path
+ redirect_to(passwordless_failure_redirect_path)
  end
 
  # match '/sign_out', via: %i[get delete].
  # Signs user out. Redirects to root_path
  # @see ControllerHelpers#sign_out
  def destroy
- sign_out authenticatable_class
- redirect_to passwordless_sign_out_redirect_path
+ sign_out(authenticatable_class)
+ redirect_to(passwordless_sign_out_redirect_path)
  end
 
  protected

app/mailers/passwordless/mailer.rb

@@ -10,8 +10,7 @@ class Mailer < Passwordless.parent_mailer.constantize
  def magic_link(session)
  @session = session
 
- @magic_link = send(Passwordless.mounted_as)
- .token_sign_in_url(session.token)
+ @magic_link = send(Passwordless.mounted_as).token_sign_in_url(session.token)
 
  email_field = @session.authenticatable.class.passwordless_email_field
  mail(

app/models/passwordless/session.rb

@@ -4,27 +4,33 @@ module Passwordless
  # The session responsible for holding the connection between the record
  # trying to log in and the unique tokens.
  class Session < ApplicationRecord
- belongs_to :authenticatable,
- polymorphic: true, inverse_of: :passwordless_sessions
+ belongs_to(
+ :authenticatable,
+ polymorphic: true,
+ inverse_of: :passwordless_sessions
+ )
 
- validates \
+ validates(
  :authenticatable,
  :timeout_at,
  :expires_at,
  :user_agent,
  :remote_addr,
  :token,
  presence: true
+ )
 
  before_validation :set_defaults
 
- scope :available, lambda {
- where("expires_at > ?", Time.current)
- }
+ scope(
+ :available,
+ lambda { where("expires_at > ?", Time.current) }
+ )
 
  def self.valid
  available
  end
+
  class << self
  deprecate :valid, deprecator: SessionValidDeprecation
  end

config/routes.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Passwordless::Engine.routes.draw do
- get "/sign_in", to: "sessions#new", as: :sign_in
- post "/sign_in", to: "sessions#create"
- get "/sign_in/:token", to: "sessions#show", as: :token_sign_in
- match "/sign_out", to: "sessions#destroy", via: %i[get delete], as: :sign_out
+ get("/sign_in", to: "sessions#new", as: :sign_in)
+ post("/sign_in", to: "sessions#create")
+ get("/sign_in/:token", to: "sessions#show", as: :token_sign_in)
+ match("/sign_out", to: "sessions#destroy", via: %i[get delete], as: :sign_out)
 end

db/migrate/20171104221735_create_passwordless_sessions.rb

@@ -2,18 +2,19 @@
 
 class CreatePasswordlessSessions < ActiveRecord::Migration[5.1]
  def change
- create_table :passwordless_sessions do |t|
+ create_table(:passwordless_sessions) do |t|
  t.belongs_to(
  :authenticatable,
  polymorphic: true,
  index: {name: "authenticatable"}
  )
- t.datetime :timeout_at, null: false
- t.datetime :expires_at, null: false
- t.datetime :claimed_at
- t.text :user_agent, null: false
- t.string :remote_addr, null: false
- t.string :token, null: false
+
+ t.datetime(:timeout_at, null: false)
+ t.datetime(:expires_at, null: false)
+ t.datetime(:claimed_at)
+ t.text(:user_agent, null: false)
+ t.string(:remote_addr, null: false)
+ t.string(:token, null: false)
 
  t.timestamps
  end

lib/passwordless/controller_helpers.rb

@@ -39,6 +39,7 @@ def authenticate_by_cookie(authenticatable_class)
 
  authenticate_by_session(authenticatable_class)
  end
+
  deprecate :authenticate_by_cookie, deprecator: CookieDeprecation
 
  def upgrade_passwordless_cookie(authenticatable_class)
@@ -51,7 +52,7 @@ def upgrade_passwordless_cookie(authenticatable_class)
  return unless (record = authenticatable_class.find_by(id: authenticatable_id))
  new_session = build_passwordless_session(record).tap { |s| s.save! }
 
- sign_in new_session
+ sign_in(new_session)
 
  new_session.authenticatable
  end
@@ -73,15 +74,16 @@ def authenticate_by_session(authenticatable_class)
  # to sign in
  # @return [ActiveRecord::Base] the record that is passed in.
  def sign_in(record)
- passwordless_session =
- if record.is_a?(Passwordless::Session)
-  record
- else
- warn "Passwordless::ControllerHelpers#sign_in with authenticatable " \
+ passwordless_session = if record.is_a?(Passwordless::Session)
+ record
+ else
+ warn(
+ "Passwordless::ControllerHelpers#sign_in with authenticatable " \
  "(`#{record.class}') is deprecated. Falling back to creating a " \
  "new Passwordless::Session"
- build_passwordless_session(record).tap { |s| s.save! }
- end
+ )
+ build_passwordless_session(record).tap { |s| s.save! }
+ end
 
  passwordless_session.claim! if Passwordless.restrict_token_reuse
 
@@ -105,8 +107,8 @@ def sign_out(authenticatable_class)
  key = cookie_name(authenticatable_class)
  cookies.encrypted.permanent[key] = {value: nil}
  cookies.delete(key)
- # /deprecated
 
+ # /deprecated
  reset_session
  true
  end

lib/passwordless/engine.rb

@@ -7,15 +7,17 @@ class Engine < ::Rails::Engine
 
  config.to_prepare do
  require "passwordless/router_helpers"
+
  ActionDispatch::Routing::Mapper.include RouterHelpers
  require "passwordless/model_helpers"
+
  ActiveRecord::Base.extend ModelHelpers
  require "passwordless/controller_helpers"
+
  end
 
  config.before_initialize do |app|
- app.config.i18n.load_path +=
- Dir[Engine.root.join("config", "locales", "*.yml")]
+ app.config.i18n.load_path += Dir[Engine.root.join("config", "locales", "*.yml")]
  end
  end
 end

lib/passwordless/errors.rb

@@ -3,9 +3,11 @@
 module Passwordless
  module Errors
  # Raise this exception when a session is expired.
- class SessionTimedOutError < StandardError; end
+ class SessionTimedOutError < StandardError
+ end
 
  # Raise this exception when the token has been previously claimed
- class TokenAlreadyClaimedError < StandardError; end
+ class TokenAlreadyClaimedError < StandardError
+ end
  end
 end

lib/passwordless/model_helpers.rb

@@ -8,9 +8,11 @@ module ModelHelpers
  # field name (e.g. `:email`)
  # @param field [string] email submitted by user.
  def passwordless_with(field)
- has_many :passwordless_sessions,
+ has_many(
+ :passwordless_sessions,
  class_name: "Passwordless::Session",
  as: :authenticatable
+ )
 
  define_singleton_method(:passwordless_email_field) { field }
  end

lib/passwordless/router_helpers.rb

@@ -20,8 +20,10 @@ def passwordless_for(resource, at: nil, as: nil)
  mount_at = at || resource.to_s
  mount_as = as || resource.to_s
  mount(
- Passwordless::Engine, at: mount_at, as: mount_as,
- defaults: {authenticatable: resource.to_s.singularize}
+ Passwordless::Engine,
+ at: mount_at,
+ as: mount_as,
+ defaults: {authenticatable: resource.to_s.singularize}
  )
 
  Passwordless.mounted_as = mount_as

lib/passwordless/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Passwordless
- VERSION = "0.10.0" # :nodoc:
+ # :nodoc:
+ VERSION = "0.10.0"
 end

test/controllers/deprecated_secrets_controller_test.rb

@@ -12,13 +12,16 @@ def create_session_for(user)
  end
 
  def login(passwordless_session)
- post "/deprecated_fake_login", params: {
- authenticatable_type: passwordless_session.authenticatable_type,
- authenticatable_id: passwordless_session.authenticatable_id,
- }
+ post(
+ "/deprecated_fake_login",
+ params: {
+ authenticatable_type: passwordless_session.authenticatable_type,
+ authenticatable_id: passwordless_session.authenticatable_id
+ }
+ )
  end
 
- test "authenticate_by_cookies" do
+ test("authenticate_by_cookies") do
  user = User.create(email: "[email protected]")
  passwordless_session = create_session_for(user)
  login(passwordless_session)