devise-authy 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9157eb5b102b0297c975ea71d190f500e0bf6dc5831717df0ca5695b9f0af13e
-  data.tar.gz: 7582bfb6b18310dd7697a808460ac87282d1c2e3fc9fd09838c431d69315d655
+  metadata.gz: 172c6e55ba9cea022fd4428e398af18be1668965361249ee0dff1e6d45ed042f
+  data.tar.gz: 5b8b1cbc2529cfa5b448ae2b3f3b4b7c7759f3b82173d26387e89738bda427c1
 SHA512:
-  metadata.gz: 36cc430cf270f535c3068c15668a398bbc9a297d345bb0c659db49ef5fb9febb43761abcf118c340476797a8c7150de37cb6ddcd0caf14b408cdecb94ab856f6
-  data.tar.gz: 856434e4038f931c25f84ddac5281f0b5f762e4a6d9d27a355362822342c255bea58ee6b087a52d912802b654436ef7505efc6a310375cafb67bdfafa5d800e1
+  metadata.gz: 3c462910e527dbfdb1ed0fa46295d7cbe783aa7feab75dbd3d30fc07ee016a793f0824262a533e4b0f41ea89f87018be6b8af5cf1205a9d26864fda8b5246d85
+  data.tar.gz: 29039ec4944775c87dcc25c17269409f072cef4db8b054b082242435f5affe786df45a9c16be54f79fe1309a321e0e0150af63e17512110b53437d8294ed5fa6

data/.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, 3.0, head]
+        gemfile: [rails_5_2, rails_6]
+        exclude:
+          - ruby: 3.0
+            gemfile: rails_5_2
+          - ruby: head
+            gemfile: rails_5_2
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rspec

data/Appraisals

@@ -7,7 +7,7 @@ appraise "rails-5-2" do
     gem 'rspec-rails', "~>4.0.0.beta3", :require => false
     gem 'database_cleaner', :require => false
   end
-end
+end if RUBY_VERSION.to_f < 3.0
 
 appraise "rails-6" do
   gem "rails", "~> 6.0.0"

data/CHANGELOG.md

@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ...
 
+## [2.3.0] - 2021-01-07
+
+### Fixed
+
+- Fixes calls to `I18n.t` with keyword arguments to support Ruby 3.0
+- Replaces Travis CI with GitHub Actions
+- Updates webmock development dependency
+- Removes sdoc from Gemfile
+
 ## [2.2.1] - 2020-10-13
 
 ### Fixed

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
-
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
+gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2020 Authy Inc
+Copyright (c) 2012-2021 Authy Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,4 @@
-# Authy Devise [![Build Status](https://travis-ci.org/twilio/authy-devise.svg?branch=master)](https://travis-ci.org/twilio/authy-devise)
+# Authy Devise [![Build Status](https://github.com/twilio/authy-devise/workflows/build/badge.svg)](https://github.com/twilio/authy-devise/actions)
 
 This is a [Devise](https://github.com/plataformatec/devise) extension to add [Two-Factor Authentication with Authy](https://www.twilio.com/docs/authy) to your Rails application.
 
@@ -227,20 +227,12 @@ end
 
 ## Running Tests
 
-To prepare the tests run the following commands:
-
-```bash
-$ cd spec/rails-app
-$ bundle install
-$ RAILS_ENV=test bundle exec rake db:migrate
-```
-
-Now on the project root run the following commands:
+Run the following command:
 
 ```bash
-$ bundle exec rspec spec/
+$ bundle exec rspec
 ```
 
 ## Copyright
 
-Copyright (c) 2012-2020 Authy Inc. See LICENSE.txt for further details.
+Copyright (c) 2012-2021 Authy Inc. See LICENSE.txt for further details.

data/app/views/devise/enable_authy.html.erb

@@ -1,7 +1,7 @@
-<h2><%= I18n.t('authy_register_title', {:scope => 'devise'}) %></h2>
+<h2><%= I18n.t('authy_register_title', scope: 'devise') %></h2>
 
 <%= enable_authy_form do %>
   <%= text_field_tag :country_code, '', :autocomplete => :off, :placeholder => I18n.t('devise.country'), :id => "authy-countries"%>
   <%= text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"%>
-  <p><%= submit_tag I18n.t('enable_authy', {:scope => 'devise'}) %></p>
+  <p><%= submit_tag I18n.t('enable_authy', scope: 'devise') %></p>
 <% end %>

data/app/views/devise/enable_authy.html.haml

@@ -1,5 +1,5 @@
-%h2= I18n.t('authy_register_title', {:scope => 'devise'})
+%h2= I18n.t('authy_register_title', scope: 'devise')
 = enable_authy_form do
   = text_field_tag :country_code, '', :autocomplete => :off, :placeholder => I18n.t('devise.country'), :id => "authy-countries"
   = text_field_tag :cellphone, '', :autocomplete => :off, :placeholder => I18n.t('devise.cellphone'), :id => "authy-cellphone"
-  %p= submit_tag I18n.t('enable_authy', {:scope => 'devise'})
+  %p= submit_tag I18n.t('enable_authy', scope: 'devise')

data/app/views/devise/verify_authy.html.erb

@@ -1,14 +1,14 @@
 <h2>
-  <%= I18n.t('submit_token_title', {:scope => 'devise'}) %>
+  <%= I18n.t('submit_token_title', scope: 'devise') %>
 </h2>
 
 <%= verify_authy_form do %>
-  <legend><%= I18n.t('submit_token_title', {:scope => 'devise'}) %></legend>
+  <legend><%= I18n.t('submit_token_title', scope: 'devise') %></legend>
   <%= label_tag 'authy-token' %>
   <%= text_field_tag :token, "", :autocomplete => "one-time-code", :inputmode => "numeric", :pattern => "[0-9]*", :id => 'authy-token' %>
   <label>
     <%= check_box_tag :remember_device %>
-    <span><%= I18n.t('remember_device', {:scope => 'devise'}) %></span>
+    <span><%= I18n.t('remember_device', scope: 'devise') %></span>
   </label>
 
   <!-- Help tooltip -->
@@ -17,7 +17,7 @@
   <!-- <%= link_to '?', '#', :id => 'authy-help' %> -->
 
   <%= authy_request_sms_link %>
-  <%= submit_tag I18n.t('submit_token', {:scope => 'devise'}), :class => 'btn' %>
+  <%= submit_tag I18n.t('submit_token', scope: 'devise'), :class => 'btn' %>
 <% end %>
 
 <% if @onetouch_uuid %>

data/app/views/devise/verify_authy.html.haml

@@ -1,13 +1,13 @@
-%h2= I18n.t('authy_register_title', {:scope => 'devise'})
+%h2= I18n.t('authy_register_title', scope: 'devise')
 
 = verify_authy_form do
-  %legend= I18n.t('submit_token_title', {:scope => 'devise'})
+  %legend= I18n.t('submit_token_title', scope: 'devise')
   = hidden_field_tag :"#{resource_name}_id", @resource.id
   = label_tag 'authy-token'
   = text_field_tag :token, "", :autocomplete => "one-time-code", :inputmode => "numeric", :pattern => "[0-9]*", :id => 'authy-token'
   %label
     = check_box_tag :remember_device
-    %span= I18n.t('remember_device', {:scope => 'devise'})
+    %span= I18n.t('remember_device', scope: 'devise')
 
   / Help Tooltip
   / You need to configure a help message.
@@ -15,7 +15,7 @@
   / = link_to '?', '#', :id => 'authy-help', :'data-message' => 'a message'
 
   = authy_request_sms_link
-  = submit_tag I18n.t('submit_token', {:scope => 'devise'}), :class => 'btn'
+  = submit_tag I18n.t('submit_token', scope: 'devise'), :class => 'btn'
 
 - if @onetouch_uuid
   :javascript

data/app/views/devise/verify_authy_installation.html.erb

@@ -1,18 +1,18 @@
-<h2><%= I18n.t('authy_verify_installation_title', {:scope => 'devise'}) %></h2>
+<h2><%= I18n.t('authy_verify_installation_title', scope: 'devise') %></h2>
 
 <% if @authy_qr_code %>
-  <%= image_tag @authy_qr_code, :size => '256x256', :alt => I18n.t('authy_qr_code_alt', {:scope => 'devise'}) %>
-  <p><%= I18n.t('authy_qr_code_instructions', {:scope => 'devise'}) %></p>
+  <%= image_tag @authy_qr_code, :size => '256x256', :alt => I18n.t('authy_qr_code_alt', scope: 'devise') %>
+  <p><%= I18n.t('authy_qr_code_instructions', scope: 'devise') %></p>
 <% end %>
 
 <%= verify_authy_installation_form do %>
-  <legend><%= I18n.t('submit_token_title', {:scope => 'devise'}) %></legend>
+  <legend><%= I18n.t('submit_token_title', scope: 'devise') %></legend>
   <%= label_tag :token %>
   <%= text_field_tag :token, "", :autocomplete => "one-time-code", :inputmode => "numeric", :pattern => "[0-9]*", :id => 'authy-token' %>
   <label>
     <%= check_box_tag :remember_device %>
-    <span><%= I18n.t('remember_device', {:scope => 'devise'}) %></span>
+    <span><%= I18n.t('remember_device', scope: 'devise') %></span>
   </label>
   <%= authy_request_sms_link %>
-  <%= submit_tag I18n.t('enable_my_account', {:scope => 'devise'}), :class => 'btn' %>
+  <%= submit_tag I18n.t('enable_my_account', scope: 'devise'), :class => 'btn' %>
 <% end %>

data/app/views/devise/verify_authy_installation.html.haml

@@ -1,16 +1,16 @@
-%h2= I18n.t('authy_verify_installation_title', {:scope => 'devise'})
+%h2= I18n.t('authy_verify_installation_title', scope: 'devise')
 
 - if @authy_qr_code
-  = image_tag @authy_qr_code, :size => '256x256', :alt => I18n.t('authy_qr_code_alt', {:scope => 'devise'})
-  %p= I18n.t('authy_qr_code_instructions', {:scope => 'devise'})
+  = image_tag @authy_qr_code, :size => '256x256', :alt => I18n.t('authy_qr_code_alt', scope: 'devise')
+  %p= I18n.t('authy_qr_code_instructions', scope: 'devise')
 
 = verify_authy_installation_form do
-  %legend= I18n.t('submit_token_title', {:scope => 'devise'})
+  %legend= I18n.t('submit_token_title', scope: 'devise')
   = label_tag :token
   = text_field_tag :token, "", :autocomplete => "one-time-code", :inputmode => "numeric", :pattern => "[0-9]*", :id => 'authy-token'
   %label
     = check_box_tag :remember_device
-    %span= I18n.t('remember_device', {:scope => 'devise'})
+    %span= I18n.t('remember_device', scope: 'devise')
   = authy_request_sms_link
-  = submit_tag I18n.t('enable_my_account', {:scope => 'devise'}), :class => 'btn'
+  = submit_tag I18n.t('enable_my_account', scope: 'devise'), :class => 'btn'
 

data/devise-authy.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "devise", ">= 4.0.0"
-  spec.add_dependency "authy", ">= 2.7.5"
+  spec.add_dependency "authy", "~> 3.0"
 
   spec.add_development_dependency "appraisal", "~> 2.2"
   spec.add_development_dependency "bundler", ">= 1.16"
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard", "~> 0.9.11"
   spec.add_development_dependency "rdoc", "~> 4.3.0"
   spec.add_development_dependency "simplecov", "~> 0.17.1"
-  spec.add_development_dependency "webmock", "~> 3.7.6"
+  spec.add_development_dependency "webmock", "~> 3.11.0"
   spec.add_development_dependency "rails", ">= 5"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "generator_spec"

data/gemfiles/rails_5_2.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sdoc", "~> 0.4.0", group: :doc
 gem "rails", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.13"
 

data/gemfiles/rails_6.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sdoc", "~> 0.4.0", group: :doc
 gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4"
 

data/lib/devise-authy/controllers/helpers.rb

@@ -77,7 +77,7 @@ module DeviseAuthy
       end
 
       def send_one_touch_request(authy_id)
-        Authy::OneTouch.send_approval_request(id: authy_id, message: I18n.t('request_to_login', { :scope => 'devise' }))
+        Authy::OneTouch.send_approval_request(id: authy_id, message: I18n.t('request_to_login', scope: 'devise'))
       end
 
       def record_authy_authentication

data/lib/devise-authy/controllers/view_helpers.rb

@@ -3,7 +3,7 @@ module DeviseAuthy
     module Helpers
       def authy_request_phone_call_link(opts = {})
         title = opts.delete(:title) do
-          I18n.t('request_phone_call', { :scope => 'devise' })
+          I18n.t('request_phone_call', scope: 'devise')
         end
         opts = {
           :id => "authy-request-phone-call-link",

data/lib/devise-authy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseAuthy
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-authy
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Authy Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -28,16 +28,16 @@ dependencies:
   name: authy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -270,9 +270,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-script: bundle exec rspec
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-  - ruby-head
-gemfile:
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6.gemfile
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6.gemfile