tiddle 1.1.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 636a498dc602f9309c1baf81f3f34276aad7e710fd14d170c02ba5af381b40f1
-  data.tar.gz: 670f3801abc579331c721d66ee5cf68e46817a89bdadfc6356d0f02ce0276176
+  metadata.gz: ceda852fb296447c9da00e1f7cafabbfe6eefa599f457bcf1885aa937ba549db
+  data.tar.gz: 4d0133d03bd53b4e75595a26ebb6ca115cb9ab6858f3a557eb38fb70dddf01c1
 SHA512:
-  metadata.gz: d5305d3d877befdee9203d7001f05e07ef38a3ad77abcc74563140f2217f69319d39d723be4453410b1935ed01a839995e8c296c767349b2355657b36ba7532b
-  data.tar.gz: c114628903a18817a6a99ab3e233639d4e2c428e7216c06e46eed4407aac243f89533db8cae5edf05335d351c4903ea3559da60e1b42821b3c98ffdbf984eb0b
+  metadata.gz: 97f53dad24042c517c85445a98e26206995d0242e7d80f42bfd1a49dd6cc40e8f55cfcfbfb9e704aed8992b3872897f8b39b5bb8d4b145e758536bc2ce1d7712
+  data.tar.gz: ebdda46f4045e4aeb26ea535b233b3b75b6c434b7a2062fdc5f2342b0e529189c0f413c9d7d1e94693774efb4d95617b2f2b0082af038f1dd9ddcf8d483e28e4

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+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.5
+          - 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/.gitignore

@@ -17,3 +17,4 @@ mkmf.log
 *.sqlite3
 *.log
 *.gemfile.lock
+.idea

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
   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,15 +1,17 @@
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.0"
-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"
+appraise "rails6.0" do
+  gem "rails", "~> 6.0.0"
+  gem "mongoid", "~> 7"
+  gem "sqlite3"
 end
 
-appraise "rails5.2" do
-  gem "rails", "5.2.0.beta2"
+appraise "rails6.1" do
+  gem "rails", "~> 6.1.0"
+  gem "mongoid"
+  gem "sqlite3"
 end

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+### 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.
+
 ### 1.1.0
 
 New feature: optional token expiration after period of inactivity - #37

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,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
-gem "rails", "5.2.0.beta2"
+gem "rails", "~> 5.2.1"
+gem "mongoid", "~> 6"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

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

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

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

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

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

@@ -31,7 +31,8 @@ module Tiddle
     def find_token(resource, token_from_headers)
       token_class = authentication_token_class(resource)
       token_body = Devise.token_generator.digest(token_class, :body, token_from_headers)
-      resource.authentication_tokens.find_by(body: token_body)
+      # 'find_by' behaves differently in AR vs Mongoid, so using 'where' instead
+      resource.authentication_tokens.where(body: token_body).first
     end
 
     def purge_old_tokens(resource)
@@ -46,7 +47,13 @@ module Tiddle
     attr_accessor :maximum_tokens_per_user
 
     def authentication_token_class(resource)
-      resource.association(:authentication_tokens).klass
+      if resource.respond_to?(:association) # ActiveRecord
+        resource.association(:authentication_tokens).klass
+      elsif resource.respond_to?(:relations) # Mongoid
+        resource.relations['authentication_tokens'].klass
+      else
+        raise 'Cannot determine authentication token class, unsupported ORM/ODM?'
+      end
     end
 
     def token_attributes(token_body, request, expires_in)

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.1.0".freeze
+  VERSION = "1.6.0".freeze
 end

data/spec/rails_app_active_record/config/application.rb

@@ -0,0 +1,15 @@
+require File.expand_path('boot', __dir__)
+
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+
+module RailsApp
+  class Application < Rails::Application
+    config.eager_load = true
+    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_active_record/config/boot.rb

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

data/spec/{rails_app → 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 → rails_app_active_record}/db/migrate/20150217000000_create_tables.rb

@@ -1,10 +1,6 @@
-if Rails::VERSION::MAJOR > 4
-  migration_class = ActiveRecord::Migration[4.2]
-else
-  migration_class = ActiveRecord::Migration
-end
-
-class CreateTables < migration_class
+class CreateTables < ActiveRecord::Migration[4.2]
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength
   def change
     create_table(:users) do |t|
       ## Database authenticatable
@@ -63,4 +59,6 @@ class CreateTables < migration_class
       t.timestamps null: false
     end
   end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/MethodLength
 end

data/spec/rails_app_mongoid/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/rails_app_mongoid/app/controllers/long_secrets_controller.rb

@@ -0,0 +1,7 @@
+class LongSecretsController < ApplicationController
+  before_action :authenticate_admin_user!
+
+  def index
+    head :ok
+  end
+end

data/spec/rails_app_mongoid/app/controllers/secrets_controller.rb

@@ -0,0 +1,7 @@
+class SecretsController < ApplicationController
+  before_action :authenticate_user!
+
+  def index
+    head :ok
+  end
+end

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

@@ -0,0 +1,2 @@
+class AdminUser < User
+end

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

@@ -0,0 +1,11 @@
+class AuthenticationToken
+  include Mongoid::Document
+
+  belongs_to :user
+
+  field :body, type: String
+  field :last_used_at, type: Time
+  field :ip_address, type: String
+  field :user_agent, type: String
+  field :expires_in, type: Integer, default: 0
+end

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

@@ -0,0 +1,22 @@
+class User
+  include Mongoid::Document
+
+  devise :database_authenticatable,
+         :registerable,
+         :recoverable,
+         :trackable,
+         #:validatable Triggers callback to will_save_change_to_email?, fails with mongoid
+         :token_authenticatable
+
+  has_many :authentication_tokens
+
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
+  field :reset_password_token, type: String
+  field :reset_password_sent_at, type: Time
+  field :sign_in_count, type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at, type: Time
+  field :current_sign_in_ip, type: String
+  field :nick_name, type: String
+end

data/spec/{rails_app → rails_app_mongoid}/config/application.rb

@@ -1,15 +1,15 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require "active_model/railtie"
-require "active_record/railtie"
+require "active_job/railtie"
 require "action_controller/railtie"
+require "action_mailer/railtie"
 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
   end
 end
-

data/spec/rails_app_mongoid/config/boot.rb

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

data/spec/rails_app_mongoid/config/environment.rb

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

data/spec/rails_app_mongoid/config/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  clients:
+    default:
+      database: tiddle_test
+      hosts:
+        - 0.0.0.0:27017

data/spec/rails_app_mongoid/config/routes.rb

@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+  devise_for :users
+  devise_for :admin_users
+  resources :secrets, only: [:index], defaults: { format: 'json' }
+  resources :long_secrets, only: [:index], defaults: { format: 'json' }
+end

data/spec/rails_app_mongoid/config/secrets.yml

@@ -0,0 +1,2 @@
+test:
+  secret_key_base: 01c37cff57639eef8aa511ae6ab64298c1da89dc32dfdda363473716f49e25d2473e48b6253c69d17c8ae8c9b6a027ec5a4ac0ffbd6c06defe1b70dd2ef32df8

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,15 +8,15 @@ 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 'devise/orm/active_record'
 require 'tiddle'
 
-require 'rails_app/config/environment'
+backend = Backend.from_name(ENV['BACKEND'])
+backend.load!
 
-Dir[__dir__ + "/support/**/*.rb"].each { |f| require f }
+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`.
@@ -66,8 +61,12 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
-    # Do initial migration
-    ActiveRecord::Migrator.migrate(File.expand_path("rails_app/db/migrate/", File.dirname(__FILE__)))
+    backend.setup_database_cleaner
+    backend.migrate!
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.clean if defined?(DatabaseCleaner)
   end
 
   config.use_transactional_fixtures = true

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,14 +25,14 @@ 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",
                 "X-USER-TOKEN" => @token
               }
             )
-          end.to(change { @user.authentication_tokens.last.last_used_at })
+          end.to(change { @user.reload.authentication_tokens.last.last_used_at })
         end
       end
 
@@ -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.order(: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

@@ -0,0 +1,53 @@
+module Backend
+  def self.from_name(name)
+    puts "Backend: #{name}"
+    case name
+    when 'mongoid'
+      MongoidBackend.new
+    else
+      ActiveRecordBackend.new
+    end
+  end
+
+  class ActiveRecordBackend
+    def load!
+      require 'devise/orm/active_record'
+      require 'rails_app_active_record/config/environment'
+    end
+
+    def setup_database_cleaner
+      # Not necessary
+    end
+
+    def migrate!
+      # Do initial migration
+      path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))
+
+      if Gem::Requirement.new(">= 6.0.0") =~ Rails.gem_version
+        ActiveRecord::MigrationContext.new(
+          path,
+          ActiveRecord::SchemaMigration
+        ).migrate
+      else
+        ActiveRecord::MigrationContext.new(path).migrate
+      end
+    end
+  end
+
+  class MongoidBackend
+    def load!
+      require 'mongoid'
+      require 'devise/orm/mongoid'
+      require 'rails_app_mongoid/config/environment'
+      require 'database_cleaner-mongoid'
+    end
+
+    def setup_database_cleaner
+      DatabaseCleaner.allow_remote_database_url = true
+    end
+
+    def migrate!
+      # Not necessary
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ describe Tiddle do
 
     it "sets last_used_at field" do
       Tiddle.create_and_return_token(@user, FakeRequest.new)
-      expect(@user.authentication_tokens.last.last_used_at)
+      expect(@user.authentication_tokens.last.last_used_at.to_time)
         .to be_within(1).of(Time.current)
     end
 

data/tiddle.gemspec

@@ -16,16 +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.2.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_dependency "devise", ">= 4.0.0.rc1", "< 4.5"
-  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-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.1.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2021-04-12 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.5'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,49 +29,35 @@ dependencies:
         version: 4.0.0.rc1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        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'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,10 +149,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -175,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
@@ -186,22 +171,34 @@ files:
 - lib/tiddle/strategy.rb
 - lib/tiddle/token_issuer.rb
 - lib/tiddle/version.rb
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/long_secrets_controller.rb
-- spec/rails_app/app/controllers/secrets_controller.rb
-- spec/rails_app/app/models/admin_user.rb
-- spec/rails_app/app/models/authentication_token.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/routes.rb
-- spec/rails_app/config/secrets.yml
-- spec/rails_app/db/migrate/20150217000000_create_tables.rb
+- spec/rails_app_active_record/app/controllers/application_controller.rb
+- spec/rails_app_active_record/app/controllers/long_secrets_controller.rb
+- spec/rails_app_active_record/app/controllers/secrets_controller.rb
+- spec/rails_app_active_record/app/models/admin_user.rb
+- spec/rails_app_active_record/app/models/authentication_token.rb
+- spec/rails_app_active_record/app/models/user.rb
+- spec/rails_app_active_record/config/application.rb
+- spec/rails_app_active_record/config/boot.rb
+- spec/rails_app_active_record/config/environment.rb
+- spec/rails_app_active_record/config/routes.rb
+- spec/rails_app_active_record/config/secrets.yml
+- spec/rails_app_active_record/db/migrate/20150217000000_create_tables.rb
+- spec/rails_app_mongoid/app/controllers/application_controller.rb
+- spec/rails_app_mongoid/app/controllers/long_secrets_controller.rb
+- spec/rails_app_mongoid/app/controllers/secrets_controller.rb
+- spec/rails_app_mongoid/app/models/admin_user.rb
+- spec/rails_app_mongoid/app/models/authentication_token.rb
+- spec/rails_app_mongoid/app/models/user.rb
+- spec/rails_app_mongoid/config/application.rb
+- spec/rails_app_mongoid/config/boot.rb
+- spec/rails_app_mongoid/config/environment.rb
+- spec/rails_app_mongoid/config/mongoid.yml
+- spec/rails_app_mongoid/config/routes.rb
+- spec/rails_app_mongoid/config/secrets.yml
 - spec/spec_helper.rb
 - 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: ''
@@ -216,33 +213,44 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.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
 test_files:
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/long_secrets_controller.rb
-- spec/rails_app/app/controllers/secrets_controller.rb
-- spec/rails_app/app/models/admin_user.rb
-- spec/rails_app/app/models/authentication_token.rb
-- spec/rails_app/app/models/user.rb
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/routes.rb
-- spec/rails_app/config/secrets.yml
-- spec/rails_app/db/migrate/20150217000000_create_tables.rb
+- spec/rails_app_active_record/app/controllers/application_controller.rb
+- spec/rails_app_active_record/app/controllers/long_secrets_controller.rb
+- spec/rails_app_active_record/app/controllers/secrets_controller.rb
+- spec/rails_app_active_record/app/models/admin_user.rb
+- spec/rails_app_active_record/app/models/authentication_token.rb
+- spec/rails_app_active_record/app/models/user.rb
+- spec/rails_app_active_record/config/application.rb
+- spec/rails_app_active_record/config/boot.rb
+- spec/rails_app_active_record/config/environment.rb
+- spec/rails_app_active_record/config/routes.rb
+- spec/rails_app_active_record/config/secrets.yml
+- spec/rails_app_active_record/db/migrate/20150217000000_create_tables.rb
+- spec/rails_app_mongoid/app/controllers/application_controller.rb
+- spec/rails_app_mongoid/app/controllers/long_secrets_controller.rb
+- spec/rails_app_mongoid/app/controllers/secrets_controller.rb
+- spec/rails_app_mongoid/app/models/admin_user.rb
+- spec/rails_app_mongoid/app/models/authentication_token.rb
+- spec/rails_app_mongoid/app/models/user.rb
+- spec/rails_app_mongoid/config/application.rb
+- spec/rails_app_mongoid/config/boot.rb
+- spec/rails_app_mongoid/config/environment.rb
+- spec/rails_app_mongoid/config/mongoid.yml
+- spec/rails_app_mongoid/config/routes.rb
+- spec/rails_app_mongoid/config/secrets.yml
 - spec/spec_helper.rb
 - 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,12 +0,0 @@
-language: ruby
-before_install: gem update --system
-rvm:
-  - "2.2.8"
-  - "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"

data/gemfiles/rails5.1.gemfile

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

data/spec/rails_app/config/boot.rb

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

data/spec/support/warningless_get.rb

@@ -1,7 +0,0 @@
-def warningless_get(path, headers:)
-  if Rails::VERSION::MAJOR >= 5
-    get path, headers: headers
-  else
-    get path, {}, headers
-  end
-end