tiddle 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceda852fb296447c9da00e1f7cafabbfe6eefa599f457bcf1885aa937ba549db
-  data.tar.gz: 4d0133d03bd53b4e75595a26ebb6ca115cb9ab6858f3a557eb38fb70dddf01c1
+  metadata.gz: d20d30a11350b4ee5ffe3a9c6ba9640afa90c13ddf87dac2c9bf6d4160339627
+  data.tar.gz: fcd8811ba7c94de4accbf4a7920e6903f780707d5af858c7e9a153691ec53351
 SHA512:
-  metadata.gz: 97f53dad24042c517c85445a98e26206995d0242e7d80f42bfd1a49dd6cc40e8f55cfcfbfb9e704aed8992b3872897f8b39b5bb8d4b145e758536bc2ce1d7712
-  data.tar.gz: ebdda46f4045e4aeb26ea535b233b3b75b6c434b7a2062fdc5f2342b0e529189c0f413c9d7d1e94693774efb4d95617b2f2b0082af038f1dd9ddcf8d483e28e4
+  metadata.gz: baf2289d634255233c6efe5c2988789a63ca05bdf1c278be92d500e50a5009e6875b29ef15c7e1cbb9bd03f131349bcf11757938f166a329389fa3cc720a7399
+  data.tar.gz: b972e36c75bb0b1c3bc5f21ef9977d5d9f93e595dfaef6905bd59f458079b9b4f7fb6e5068e35fd6b1aaa6e4e63740c62609db68c89bb87a0353bddf1c702721

data/.github/workflows/ruby.yml

@@ -16,7 +16,6 @@ jobs:
           - rails6.0
           - rails6.1
         ruby:
-          - 2.5
           - 2.6
           - 2.7
           - 3.0

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   Include:
     - 'lib/**/*.rb'
     - 'spec/**/*.rb'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 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
@@ -8,7 +14,6 @@ Remove Rails 4.2 support
 
 Remove Ruby 2.4 support
 
-
 ### 1.5.0
 
 Add Rails 6 support

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.6.0".freeze
+  VERSION = "1.7.0".freeze
 end

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

@@ -55,6 +55,7 @@ class CreateTables < ActiveRecord::Migration[4.2]
       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/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,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
   spec.add_dependency "activerecord", ">= 5.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="