tiddle 1.3.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b1f9267f263f6a7f6f8b571bd641dbdba3a3defeea0b1327288c2cb5ea00c9
-  data.tar.gz: 59aa159c44adf4677e4820d2fd7ab63852376d1a8f80e3a58f807361e560ba6c
+  metadata.gz: d20d30a11350b4ee5ffe3a9c6ba9640afa90c13ddf87dac2c9bf6d4160339627
+  data.tar.gz: fcd8811ba7c94de4accbf4a7920e6903f780707d5af858c7e9a153691ec53351
 SHA512:
-  metadata.gz: 2a03e818d5e1e2c220a6d7bbf4cabfcb7aab34123c4045c06ea443d12814b8e5c8e5799089286de24608066571ea90fc530fec0846b0f2eb537b71cada558972
-  data.tar.gz: 1eb86b866420fa4877f587a1fbfcf6e7df55a9053f0883564d5b153596253e1f4f11d5007a09c5922802e737987e9b03adee9f53c175bc46e3741d5a7a1b6228
+  metadata.gz: baf2289d634255233c6efe5c2988789a63ca05bdf1c278be92d500e50a5009e6875b29ef15c7e1cbb9bd03f131349bcf11757938f166a329389fa3cc720a7399
+  data.tar.gz: b972e36c75bb0b1c3bc5f21ef9977d5d9f93e595dfaef6905bd59f458079b9b4f7fb6e5068e35fd6b1aaa6e4e63740c62609db68c89bb87a0353bddf1c702721

data/.github/workflows/ruby.yml

@@ -0,0 +1,46 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          - rails5.2
+          - rails6.0
+          - rails6.1
+        ruby:
+          - 2.6
+          - 2.7
+          - 3.0
+        backend:
+          - active_record
+          - mongoid
+        exclude:
+          - gemfile: rails5.2
+            ruby: 3.0
+    name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}, ${{ matrix.backend }}
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      BACKEND: ${{ matrix.backend }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      if: ${{ matrix.backend == 'mongoid' }}
+    - name: Run tests
+      run: |
+        bundle exec rake spec

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
   Include:
-    - 'lib'
-    - 'spec'
+    - 'lib/**/*.rb'
+    - 'spec/**/*.rb'
   Exclude:
     - 'spec/rails_app/**/*'
     - 'spec/spec_helper.rb'
+    - 'vendor/bundle/**/*'
+  SuggestExtensions: false
 Style/StringLiterals:
   Enabled: false
 Style/Documentation:
@@ -14,17 +16,73 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/SignalException:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 Gemspec/OrderedDependencies:
   Enabled: false
-Naming/FileName:
-  Exclude:
-    - 'Rakefile'
-    - 'Gemfile'
-    - 'Appraisals'
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 Metrics/MethodLength:
   Max: 15
+
+Gemspec/DateAssignment:
+  Enabled: true
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
+Lint/DeprecatedConstants:
+  Enabled: true
+Lint/DuplicateBranch:
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+Lint/EmptyBlock:
+  Enabled: true
+Lint/EmptyClass:
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+Lint/NumberedParameterAssignment:
+  Enabled: true
+Lint/OrAssignmentToConstant:
+  Enabled: true
+Lint/RedundantDirGlobSort:
+  Enabled: true
+Lint/SymbolConversion:
+  Enabled: true
+Lint/ToEnumArguments:
+  Enabled: true
+Lint/TripleQuotes:
+  Enabled: true
+Lint/UnexpectedBlockArity:
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+Style/ArgumentsForwarding:
+  Enabled: true
+Style/CollectionCompact:
+  Enabled: true
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+Style/EndlessMethod:
+  Enabled: true
+Style/HashConversion:
+  Enabled: true
+Style/HashExcept:
+  Enabled: true
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+Style/NegatedIfElseCondition:
+  Enabled: true
+Style/NilLambda:
+  Enabled: true
+Style/RedundantArgument:
+  Enabled: true
+Style/StringChars:
+  Enabled: true
+Style/SwapValues:
+  Enabled: true

data/Appraisals

@@ -1,19 +1,17 @@
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.0"
-  gem "mongoid", "~> 5"
-end
-
-appraise "rails5.0" do
-  gem "rails", "~> 5.0.0"
+appraise "rails5.2" do
+  gem "rails", "~> 5.2.1"
   gem "mongoid", "~> 6"
+  gem "sqlite3", "~> 1.3.13"
 end
 
-appraise "rails5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "mongoid", "~> 6"
+appraise "rails6.0" do
+  gem "rails", "~> 6.0.0"
+  gem "mongoid", "~> 7"
+  gem "sqlite3"
 end
 
-appraise "rails5.2" do
-  gem "rails", "~> 5.2.1"
-  gem "mongoid", "~> 6"
+appraise "rails6.1" do
+  gem "rails", "~> 6.1.0"
+  gem "mongoid"
+  gem "sqlite3"
 end

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+### 1.7.0
+
+Add ability to track additional info in tokens (Marcelo Silveira)
+
+Remove Ruby 2.5 support
+
+### 1.6.0
+
+Add Rails 6.1 support
+
+Add Ruby 3.0 support
+
+Remove Rails 4.2 support
+
+Remove Ruby 2.4 support
+
+### 1.5.0
+
+Add Rails 6 support
+
+Fix warning on Ruby 2.7 (Andy Klimczak)
+
+Skip CSRF clean up (Marcelo Silveira)
+
+### 1.4.0
+
+Support for Devise 4.6.
+
+Relax dependency on Devise.
+
+### 1.3.0
+
+Support for Devise 4.5
+
 ### 1.2.0
 
 Adds support for MongoDB.

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem "rubocop", "~> 0.52.0"
-
 # Specify your gem's dependencies in tiddle.gemspec
 gemspec

data/README.md

@@ -1,17 +1,11 @@
 # Tiddle
 
-[![Build Status](https://travis-ci.org/adamniedzielski/tiddle.svg?branch=master)](https://travis-ci.org/adamniedzielski/tiddle)
-[![Coverage Status](https://coveralls.io/repos/adamniedzielski/tiddle/badge.svg?branch=master)](https://coveralls.io/r/adamniedzielski/tiddle?branch=master)
 [![Code Climate](https://codeclimate.com/github/adamniedzielski/tiddle/badges/gpa.svg)](https://codeclimate.com/github/adamniedzielski/tiddle)
 
 Tiddle provides Devise strategy for token authentication in API-only Ruby on Rails applications. Its main feature is **support for multiple tokens per user**.
 
 Tiddle is lightweight and non-configurable. It does what it has to do and leaves some manual implementation to you.
 
-## Versions
-
-Versions 0.7.x+ are meant to support Rails 5.0, but they require Devise 4. If you want to use Devise 3 with Rails 4.2 then take a look at the ```0.6.x``` branch.
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -6,7 +6,7 @@ require 'appraisal'
 RSpec::Core::RakeTask.new(spec: :rubocop)
 RuboCop::RakeTask.new(:rubocop)
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+if !ENV["APPRAISAL_INITIALIZED"]
   task default: :appraisal
 else
   task default: :spec

data/gemfiles/rails5.2.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 5.2.1"
 gem "mongoid", "~> 6"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/{rails4.2.gemfile → rails6.0.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 4.2.0"
-gem "mongoid", "~> 5"
+gem "rails", "~> 6.0.0"
+gem "mongoid", "~> 7"
+gem "sqlite3"
 
 gemspec path: "../"

data/gemfiles/{rails5.0.gemfile → rails6.1.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 5.0.0"
-gem "mongoid", "~> 6"
+gem "rails", "~> 6.1.0"
+gem "mongoid"
+gem "sqlite3"
 
 gemspec path: "../"

data/lib/tiddle/strategy.rb

@@ -28,6 +28,14 @@ module Devise
         false
       end
 
+      # Avoid CSRF clean up for token authentication as it might trigger session creation in API
+      # environments even if CSRF prevention is not being used.
+      # Devise provides a `clean_up_csrf_token_on_authentication` option but it's not always viable
+      # in applications with multiple user models and authentication strategies.
+      def clean_up_csrf?
+        false
+      end
+
       private
 
       def authentication_keys_from_headers

data/lib/tiddle/token_issuer.rb

@@ -12,12 +12,17 @@ module Tiddle
       self.maximum_tokens_per_user = maximum_tokens_per_user
     end
 
-    def create_and_return_token(resource, request, expires_in: nil)
+    def create_and_return_token(resource, request, expires_in: nil, metadata: {})
       token_class = authentication_token_class(resource)
       token, token_body = Devise.token_generator.generate(token_class, :body)
 
       resource.authentication_tokens.create!(
-        token_attributes(token_body, request, expires_in)
+        token_attributes(
+          token_body: token_body,
+          request: request,
+          expires_in: expires_in,
+          metadata: metadata
+        )
       )
 
       token
@@ -56,13 +61,13 @@ module Tiddle
       end
     end
 
-    def token_attributes(token_body, request, expires_in)
+    def token_attributes(token_body:, request:, expires_in:, metadata: {})
       attributes = {
         body: token_body,
         last_used_at: Time.current,
         ip_address: request.remote_ip,
         user_agent: request.user_agent
-      }
+      }.merge(metadata)
 
       if expires_in
         attributes.merge(expires_in: expires_in)

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.3.0".freeze
+  VERSION = "1.7.0".freeze
 end

data/lib/tiddle.rb

@@ -6,7 +6,7 @@ require "tiddle/token_issuer"
 
 module Tiddle
   def self.create_and_return_token(resource, request, options = {})
-    TokenIssuer.build.create_and_return_token(resource, request, options)
+    TokenIssuer.build.create_and_return_token(resource, request, **options)
   end
 
   def self.expire_token(resource, request)

data/spec/rails_app_active_record/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require "active_model/railtie"
 require "active_record/railtie"
@@ -8,7 +8,7 @@ require "action_view/railtie"
 module RailsApp
   class Application < Rails::Application
     config.eager_load = true
-    config.root = File.expand_path('../../.', __FILE__)
+    config.root = File.expand_path('..', __dir__)
     config.consider_all_requests_local = true
     config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
   end

data/spec/rails_app_active_record/config/boot.rb

@@ -1,2 +1,2 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
 require 'bundler/setup'

data/spec/rails_app_active_record/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/rails_app_active_record/db/migrate/20150217000000_create_tables.rb

@@ -1,10 +1,4 @@
-migration_class = if Rails::VERSION::MAJOR > 4
-                    ActiveRecord::Migration[4.2]
-                  else
-                    ActiveRecord::Migration
-                  end
-
-class CreateTables < migration_class
+class CreateTables < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def change
@@ -61,6 +55,7 @@ class CreateTables < migration_class
       t.integer :expires_in, null: false, default: 0
       t.string :ip_address
       t.string :user_agent
+      t.string :metadata_attr1
 
       t.timestamps null: false
     end

data/spec/rails_app_mongoid/app/models/authentication_token.rb

@@ -8,4 +8,5 @@ class AuthenticationToken
   field :ip_address, type: String
   field :user_agent, type: String
   field :expires_in, type: Integer, default: 0
+  field :metadata_attr1, type: String
 end

data/spec/rails_app_mongoid/app/models/user.rb

@@ -5,7 +5,7 @@ class User
          :registerable,
          :recoverable,
          :trackable,
-         #:validatable Triggers callback to will_save_change_to_email?, fails with mongoid
+         :validatable,
          :token_authenticatable
 
   has_many :authentication_tokens

data/spec/rails_app_mongoid/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require "active_model/railtie"
 require "active_job/railtie"
@@ -9,8 +9,7 @@ require "action_view/railtie"
 module RailsApp
   class Application < Rails::Application
     config.eager_load = true
-    config.root = File.expand_path('../../.', __FILE__)
+    config.root = File.expand_path('..', __dir__)
     config.consider_all_requests_local = true
-    config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
   end
 end

data/spec/rails_app_mongoid/config/boot.rb

@@ -1,2 +1,2 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
 require 'bundler/setup'

data/spec/rails_app_mongoid/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require 'bundler/setup'
 require 'simplecov'
-require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
 SimpleCov.start do
   add_filter "/spec/"
 end
@@ -13,16 +8,16 @@ end
 ENV["RAILS_ENV"] = 'test'
 ENV["DATABASE_URL"] = "sqlite3:db/test.sqlite3"
 
-require 'rails/all'
-require 'rspec/rails'
+Dir[__dir__ + "/support/**/*.rb"].each { |f| require f }
+
 require 'devise'
 require 'tiddle'
 
-Dir[__dir__ + "/support/**/*.rb"].each { |f| require f }
-
 backend = Backend.from_name(ENV['BACKEND'])
 backend.load!
 
+require 'rspec/rails'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

data/spec/strategy_spec.rb

@@ -6,7 +6,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "allows to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "test@example.com",
@@ -25,7 +25,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
         it "updates last_used_at field" do
           expect do
-            warningless_get(
+            get(
               secrets_path,
               headers: {
                 "X-USER-EMAIL" => "test@example.com",
@@ -43,7 +43,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
         it "does not update last_used_at field" do
           expect do
-            warningless_get(
+            get(
               secrets_path,
               headers: {
                 "X-USER-EMAIL" => "test@example.com",
@@ -57,7 +57,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     context "when email contains uppercase letters" do
       it "converts email to lower case and authenticates user" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "TEST@example.com",
@@ -76,7 +76,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "does not allow to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "wrong@example.com",
@@ -94,7 +94,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "does not allow to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "test@example.com",
@@ -107,7 +107,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
   context "when no headers are passed" do
     it "does not allow to access endpoints which require authentication" do
-      warningless_get secrets_path, headers: {}
+      get secrets_path, headers: {}
       expect(response.status).to eq 401
     end
   end
@@ -119,7 +119,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "allows to access endpoints which require authentication" do
-      warningless_get(
+      get(
         long_secrets_path,
         headers: {
           "X-ADMIN-USER-EMAIL" => "test@example.com",
@@ -152,7 +152,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     it "allows to access endpoints which require authentication with valid \
       nick name and token" do
-      warningless_get(
+      get(
         secrets_path,
         headers: { "X-USER-NICK-NAME" => "test", "X-USER-TOKEN" => @token }
       )
@@ -168,7 +168,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     describe "token is not expired" do
       it "does allow to access endpoints which require authentication" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "test@example.com",
@@ -181,12 +181,12 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     describe "token is expired" do
       before do
-        token = @user.authentication_tokens.sort_by(&:id).last
+        token = @user.authentication_tokens.max_by(&:id)
         token.update_attribute(:last_used_at, 1.month.ago)
       end
 
       it "does not allow to access endpoints which require authentication" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "test@example.com",

data/spec/support/backend.rb

@@ -23,10 +23,13 @@ module Backend
       # Do initial migration
       path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))
 
-      if Gem::Requirement.new(">= 5.2.0.rc1") =~ Rails.gem_version
-        ActiveRecord::MigrationContext.new(path).migrate
+      if Gem::Requirement.new(">= 6.0.0") =~ Rails.gem_version
+        ActiveRecord::MigrationContext.new(
+          path,
+          ActiveRecord::SchemaMigration
+        ).migrate
       else
-        ActiveRecord::Migrator.migrate(path)
+        ActiveRecord::MigrationContext.new(path).migrate
       end
     end
   end
@@ -36,11 +39,11 @@ module Backend
       require 'mongoid'
       require 'devise/orm/mongoid'
       require 'rails_app_mongoid/config/environment'
-      require 'database_cleaner'
+      require 'database_cleaner-mongoid'
     end
 
     def setup_database_cleaner
-      DatabaseCleaner[:mongoid].strategy = :truncation
+      DatabaseCleaner.allow_remote_database_url = true
     end
 
     def migrate!

data/spec/support/fake_request.rb

@@ -9,7 +9,5 @@ class FakeRequest
     self.headers = headers
   end
 
-  attr_accessor :remote_ip
-  attr_accessor :user_agent
-  attr_accessor :headers
+  attr_accessor :remote_ip, :user_agent, :headers
 end

data/spec/tiddle_spec.rb

@@ -38,6 +38,11 @@ describe Tiddle do
                                      FakeRequest.new(user_agent: "Internet Explorer 4.0")
       expect(@user.authentication_tokens.last.user_agent).to eq "Internet Explorer 4.0"
     end
+
+    it "saves additional metadata" do
+      Tiddle.create_and_return_token @user, FakeRequest.new, metadata: { metadata_attr1: "abc" }
+      expect(@user.authentication_tokens.last.metadata_attr1).to eq "abc"
+    end
   end
 
   describe "find_token" do

data/tiddle.gemspec

@@ -16,17 +16,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency "devise", ">= 4.0.0.rc1", "< 4.6"
-  spec.add_dependency "activerecord", ">= 4.2.0"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
+  spec.add_dependency "activerecord", ">= 5.2.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "database_cleaner-active_record"
+  spec.add_development_dependency "database_cleaner-mongoid"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,51 +29,23 @@ dependencies:
         version: 4.0.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,10 +149,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -189,10 +161,9 @@ files:
 - README.md
 - Rakefile
 - config/locales/en.yml
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -228,7 +199,6 @@ files:
 - spec/strategy_spec.rb
 - spec/support/backend.rb
 - spec/support/fake_request.rb
-- spec/support/warningless_get.rb
 - spec/tiddle_spec.rb
 - tiddle.gemspec
 homepage: ''
@@ -243,15 +213,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Token authentication for Devise which supports multiple tokens per model
@@ -284,5 +253,4 @@ test_files:
 - spec/strategy_spec.rb
 - spec/support/backend.rb
 - spec/support/fake_request.rb
-- spec/support/warningless_get.rb
 - spec/tiddle_spec.rb

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-before_install: gem update --system
-services:
-- mongodb
-rvm:
-  - "2.3.5"
-  - "2.4.2"
-  - "2.5.0"
-gemfile:
-  - "gemfiles/rails4.2.gemfile"
-  - "gemfiles/rails5.0.gemfile"
-  - "gemfiles/rails5.1.gemfile"
-  - "gemfiles/rails5.2.gemfile"
-env:
-  - BACKEND=mongoid
-  - BACKEND=active_record

data/gemfiles/rails5.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 5.1.0"
-gem "mongoid", "~> 6"
-
-gemspec path: "../"

data/spec/support/warningless_get.rb

@@ -1,7 +0,0 @@
-def warningless_get(path, headers:)
-  if Gem::Requirement.new(">= 5") =~ Rails.gem_version
-    get path, headers: headers
-  else
-    get path, {}, headers
-  end
-end