tiddle 1.5.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd6e3feb1ccba22684e65085d74f245e894178246b8535c4ccc4d885984b154
-  data.tar.gz: c12348cf95c0731af63b99b8804e825652791e7c166d35d8f539a172fbb78601
+  metadata.gz: a348d248985933eddf79f194679aa3c1ee6724006f3386a88d143efff7080b0d
+  data.tar.gz: 36f11c54b9cb1829fbbe07e200f404bb8958265582854dd71583a4f90565ef4b
 SHA512:
-  metadata.gz: c8e9eaf42c24032583f36906d73950ebaab11252193629f5b82045a8d81f51b39ca98beefb58ccec234499458407f4cdf0406902a166a5232ff713678d704207
-  data.tar.gz: d80bf9abe5d72446839eaab8f7dcb6d5c6521f8c15f0d646c564b8bb635c0d3475cf177cfbc917aab7a68b469613b3722657085a2a8599ffc5a394f087f0168e
+  metadata.gz: b2001e1d59b7fe3596dd7727477e3315f7bc91d4725653ace774bdce0804dd11dceded3908d8be15bf05f8bbcb30e29b90ea8e99366069e693e2eb1ed7526960
+  data.tar.gz: 34064918737c1c9d1da935488fee01b711823cedc9c5b7ccfd411b30a94390b241ca7a9f6106ecb8c9acb7a6847a475ad2f9930a431d39417a495e7a9a4df812

data/.github/workflows/ruby.yml

@@ -0,0 +1,53 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          - rails5.2
+          - rails6.0
+          - rails6.1
+          - rails7.0
+        ruby:
+          - "2.7"
+          - "3.0"
+          - "3.1"
+        backend:
+          - active_record
+          - mongoid
+        exclude:
+          - gemfile: rails5.2
+            ruby: "3.0"
+          - gemfile: rails5.2
+            ruby: "3.1"
+          - gemfile: rails6.0
+            ruby: "3.1"
+          - gemfile: rails6.1
+            ruby: "3.1"
+    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.4
+  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/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 1.7.1
+
+Fix invalid headers generated when model is namespaced (Ariel Agne da Silveira)
+
+Add Rails 7.0 support
+
+Add Ruby 3.1 support
+
+Remove Ruby 2.6 support
+
+### 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

data/CONTRIBUTING.md

@@ -4,8 +4,7 @@
 2. Run the tests:
 
   ```
-  appraisal install
-  rake
+  BUNDLE_GEMFILE=gemfiles/<PICK YOUR FAVOURITE>.gemfile rake
   ```
 3. Introduce your change. If it's a new feature then write a test for it as well.
 4. Make sure that tests are passing.

data/README.md

@@ -1,9 +1,5 @@
 # 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.
@@ -85,7 +81,7 @@ end
 
 5) Send ```X-USER-EMAIL``` and ```X-USER-TOKEN``` as headers of every request which requires authentication.
 
-You can read more in a blog post dedicated to Tiddle - http://adamniedzielski.github.io/blog/2015/04/04/token-authentication-with-tiddle/
+You can read more in a blog post dedicated to Tiddle - https://blog.sundaycoding.com/blog/2015/04/04/token-authentication-with-tiddle/
 
 ## Note on Rails session
 
@@ -95,7 +91,7 @@ The safest solution in API-only application is not to rely on Rails session at a
 config.middleware.delete ActionDispatch::Session::CookieStore
 ```
 
-More: http://adamniedzielski.github.io/blog/2015/04/04/token-authentication-with-tiddle/#rails-session
+More: https://blog.sundaycoding.com/blog/2015/04/04/token-authentication-with-tiddle/#rails-session
 
 ## Using field other than email
 

data/Rakefile

@@ -1,13 +1,8 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'appraisal'
 
 RSpec::Core::RakeTask.new(spec: :rubocop)
 RuboCop::RakeTask.new(:rubocop)
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
-  task default: :appraisal
-else
-  task default: :spec
-end
+task default: :spec

data/gemfiles/rails5.2.gemfile

@@ -1,8 +1,5 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 5.2.1"
 gem "mongoid", "~> 6"
 gem "sqlite3", "~> 1.3.13"

data/gemfiles/rails6.0.gemfile

@@ -1,8 +1,5 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 6.0.0"
 gem "mongoid", "~> 7"
 gem "sqlite3"

data/gemfiles/rails6.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails7.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.2"
+gem "mongoid"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/tiddle/model_name.rb

@@ -1,11 +1,17 @@
 module Tiddle
   class ModelName
     def with_underscores(model)
-      model.model_name.to_s.underscore.upcase
+      colon_to_underscore(model).underscore.upcase
     end
 
     def with_dashes(model)
       with_underscores(model).dasherize
     end
+
+    private
+
+    def colon_to_underscore(model)
+      model.model_name.to_s.tr(':', '_')
+    end
   end
 end

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.5.0".freeze
+  VERSION = "1.7.1".freeze
 end

data/spec/rails_app_active_record/app/controllers/namespaced_users_controller.rb

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

data/spec/rails_app_active_record/app/models/namespace/namespaced_user.rb

@@ -0,0 +1,9 @@
+module Namespace
+  class NamespacedUser < ActiveRecord::Base
+    devise :database_authenticatable, :registerable,
+           :recoverable, :trackable, :validatable,
+           :token_authenticatable
+
+    has_many :authentication_tokens, as: :authenticatable
+  end
+end

data/spec/rails_app_active_record/config/application.rb

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

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

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,28 @@ 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
+
+    create_table(:namespaced_users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      t.string :nick_name
 
       t.timestamps null: false
     end

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

@@ -0,0 +1,7 @@
+class NamespacedUsersController < ApplicationController
+  before_action :authenticate_namespaced_user!
+
+  def index
+    head :ok
+  end
+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/namespace/namespaced_user.rb

@@ -0,0 +1,4 @@
+module Namespace
+  class NamespacedUser < User
+  end
+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,7 +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
   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/rails_app_mongoid/config/routes.rb

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

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

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",
@@ -130,6 +130,27 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
   end
 
+  context "when the model name is composed of a namespace" do
+    before do
+      @user = Namespace::NamespacedUser.create!(
+        email: "test@example.com",
+        password: "12345678"
+      )
+      @token = Tiddle.create_and_return_token(@user, FakeRequest.new)
+    end
+
+    it "allows to access endpoints which require authentication" do
+      get(
+        namespaced_users_path,
+        headers: {
+          "X-NAMESPACE--NAMESPACED-USER-EMAIL" => "test@example.com",
+          "X-NAMESPACE--NAMESPACED-USER-TOKEN" => @token
+        }
+      )
+      expect(response.status).to eq 200
+    end
+  end
+
   describe "using field other than email" do
     before do
       Devise.setup do |config|
@@ -152,7 +173,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 +189,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 +202,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,18 +23,14 @@ module Backend
       # Do initial migration
       path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))
 
-      # rubocop:disable Performance/RegexpMatch
       if Gem::Requirement.new(">= 6.0.0") =~ Rails.gem_version
         ActiveRecord::MigrationContext.new(
           path,
           ActiveRecord::SchemaMigration
         ).migrate
-      elsif Gem::Requirement.new(">= 5.2.0") =~ Rails.gem_version
-        ActiveRecord::MigrationContext.new(path).migrate
       else
-        ActiveRecord::Migrator.migrate(path)
+        ActiveRecord::MigrationContext.new(path).migrate
       end
-      # rubocop:enable Performance/RegexpMatch
     end
   end
 
@@ -43,12 +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.allow_remote_database_url = true
-      DatabaseCleaner[:mongoid].strategy = :truncation
     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,15 +16,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
-  spec.add_dependency "activerecord", ">= 4.2.0"
-  spec.add_development_dependency "rake", "~> 12.0"
+  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 "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.5.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -36,30 +36,16 @@ dependencies:
     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
+        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:
     - - ">="
@@ -73,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:
     - - ">="
@@ -87,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +101,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:
     - - ">="
@@ -129,7 +115,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:
     - - ">="
@@ -149,21 +135,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - config/locales/en.yml
-- gemfiles/rails4.2.gemfile
 - gemfiles/rails5.2.gemfile
 - gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
+- gemfiles/rails7.0.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -173,9 +158,11 @@ files:
 - lib/tiddle/version.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/namespaced_users_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/namespace/namespaced_user.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
@@ -185,9 +172,11 @@ files:
 - 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/namespaced_users_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/namespace/namespaced_user.rb
 - spec/rails_app_mongoid/app/models/user.rb
 - spec/rails_app_mongoid/config/application.rb
 - spec/rails_app_mongoid/config/boot.rb
@@ -199,7 +188,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: ''
@@ -214,23 +202,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Token authentication for Devise which supports multiple tokens per model
 test_files:
 - 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/namespaced_users_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/namespace/namespaced_user.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
@@ -240,9 +230,11 @@ test_files:
 - 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/namespaced_users_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/namespace/namespaced_user.rb
 - spec/rails_app_mongoid/app/models/user.rb
 - spec/rails_app_mongoid/config/application.rb
 - spec/rails_app_mongoid/config/boot.rb
@@ -254,5 +246,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,27 +0,0 @@
-language: ruby
-branches:
-  only:
-    - master
-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-services:
-  - mongodb
-rvm:
-  - "2.4.6"
-  - "2.5.5"
-  - "2.6.3"
-  - "2.7.1"
-gemfile:
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails5.2.gemfile
-  - gemfiles/rails6.0.gemfile
-env:
-  - BACKEND=mongoid
-  - BACKEND=active_record
-jobs:
-  exclude:
-  - rvm: "2.4.6"
-    gemfile: gemfiles/rails6.0.gemfile
-  - rvm: "2.7.1"
-    gemfile: gemfiles/rails4.2.gemfile

data/Appraisals

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

data/Gemfile

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

data/gemfiles/rails4.2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 4.2.0"
-gem "mongoid", "~> 5"
-gem "sqlite3", "~> 1.3.13"
-
-gemspec path: "../"

data/spec/support/warningless_get.rb

@@ -1,9 +0,0 @@
-def warningless_get(path, headers:)
-  # rubocop:disable Performance/RegexpMatch
-  if Gem::Requirement.new(">= 5") =~ Rails.gem_version
-    get path, headers: headers
-  else
-    get path, {}, headers
-  end
-  # rubocop:enable Performance/RegexpMatch
-end