tiddle 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30c0de8dba83157b465e1455956272549e210830cc8fe296aec744b0d046ca1c
-  data.tar.gz: 53652aefc5c51511b5f43df0c598ae6754e596e78a4be02aa01fa7e3dd40b95b
+  metadata.gz: 733cfe571ca455e2268dc7c37fd02f5e385512360741dde7e0ec13cdd742b1d9
+  data.tar.gz: 6c13743e957f03ef2b808312e3803992a2043d882360b53b981a7212deeffd6c
 SHA512:
-  metadata.gz: 1ac88d0e37967ad77c5f6b7ffa96646910c90be6cc8fc2d6adead616e73673b8601b2664a0851eec3fbc0eaa2e968a7b5cce7b5ffb89187ca4c77bb12ae6d875
-  data.tar.gz: 55ceda21948c6ca6c872b863e22da925d00014625075a77e195f877f154b00ce31fe0a4e63c18a7e0c43b015a023617b4a33c6d4c23da95bee6f6652cc371a88
+  metadata.gz: 25a2bc2f0ce66488b7131470870b6af13095c2c4494ef04705bb09d7d725d1d2e927ac486d59515ce7e4edc9ae564bd530bf6eff7908ba47f73e076882f31808
+  data.tar.gz: f5845920961f94b7fd44d8e24b84f62fa70dd559b87f69502f6ba884bfa3a5b7154379cda71c5ceeb4f8415095ccee86a26ede52bfc42925ed68609e516c068f

data/.github/workflows/ruby.yml

@@ -12,26 +12,16 @@ jobs:
       fail-fast: false
       matrix:
         gemfile:
-          - rails5.2
-          - rails6.0
-          - rails6.1
-          - rails7.0
+          - rails7.2
+          - rails8.0
+          - rails8.1
         ruby:
-          - "2.7"
-          - "3.0"
-          - "3.1"
+          - "3.3"
+          - "3.4"
+          - "4.0"
         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:
@@ -39,14 +29,14 @@ jobs:
       BACKEND: ${{ matrix.backend }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
     - 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
+      uses: supercharge/mongodb-github-action@1.10.0
       if: ${{ matrix.backend == 'mongoid' }}
     - name: Run tests
       run: |

data/.gitignore

@@ -6,6 +6,8 @@
 /doc/
 /pkg/
 /spec/reports/
+/spec/rails_app_active_record/tmp/
+/spec/rails_app_mongoid/tmp/
 /tmp/
 *.bundle
 *.so

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.3
   Include:
     - 'lib/**/*.rb'
     - 'spec/**/*.rb'
@@ -8,6 +8,7 @@ AllCops:
     - 'spec/spec_helper.rb'
     - 'vendor/bundle/**/*'
   SuggestExtensions: false
+  NewCops: enable
 Style/StringLiterals:
   Enabled: false
 Style/Documentation:
@@ -25,64 +26,3 @@ Metrics/BlockLength:
     - 'spec/**/*'
 Metrics/MethodLength:
   Max: 15
-
-Gemspec/DeprecatedAttributeAssignment:
-  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,23 @@
+### 1.9.0
+
+Minimum supported ruby version is now 3.3 (André Piske)
+
+Minimum supported Rails version is now 7.2 (André Piske)
+
+Relax devise dependency to >= 4, < 6, thus supporting devise 5 (André Piske)
+
+Support Devise config.authentication_keys in hash format (Arek W)
+
+### 1.8.1
+
+Remove Rails 5.2 and 6.0 support
+
+Remove Ruby 2.7 support
+
+Add Rails 7.1 support
+
+Add Ruby 3.2 and 3.3 support
+
 ### 1.8.0
 
 Support different touch interval based on expiration time (Daniel André da Silva)

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1-alpine
+FROM ruby:3.3-alpine
 
 RUN apk add build-base sqlite-dev tzdata git bash
 RUN gem update --system && gem install bundler

data/docker-compose.yml

@@ -1,6 +1,7 @@
 version: "3.9"
 services:
   library:
+    platform: linux/x86_64
     build:
       context: .
     stdin_open: true
@@ -12,7 +13,7 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis:6379/1
-      - BUNDLE_GEMFILE=gemfiles/rails7.0.gemfile
+      - BUNDLE_GEMFILE=gemfiles/rails8.1.gemfile
   redis:
     image: "redis:6-alpine"
     command: redis-server

data/gemfiles/rails7.2.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rubocop", "~> 1.88"
+gem "rails", "~> 7.2"
+gem "mongoid", "~> 9"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails8.0.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rubocop", "~> 1.88"
+gem "rails", "~> 8.0.0"
+gem "mongoid", "~> 9"
+gem "sqlite3"
+
+gemspec path: "../"

data/gemfiles/rails8.1.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rubocop", "~> 1.88"
+gem "rails", "~> 8.1.0"
+gem "mongoid", "~> 9"
+gem "sqlite3"
+
+gemspec path: "../"

data/lib/tiddle/strategy.rb

@@ -53,7 +53,11 @@ module Devise
       end
 
       def authentication_keys
-        mapping.to.authentication_keys
+        if mapping.to.authentication_keys.is_a?(Hash)
+          mapping.to.authentication_keys.keys
+        else
+          mapping.to.authentication_keys
+        end
       end
 
       def touch_token(token)

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.8.0".freeze
+  VERSION = "1.9.0".freeze
 end

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

@@ -1,4 +1,4 @@
-class CreateTables < ActiveRecord::Migration[4.2]
+class CreateTables < ActiveRecord::Migration::Current
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def change

data/spec/strategy_spec.rb

@@ -181,6 +181,35 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
   end
 
+  describe "when authentication_keys is a hash" do
+    before do
+      Devise.setup do |config|
+        config.authentication_keys = { email: true }
+      end
+
+      @user = User.create!(
+        email: "test@example.com",
+        password: "12345678"
+      )
+      @token = Tiddle.create_and_return_token(@user, FakeRequest.new)
+    end
+
+    after do
+      Devise.setup do |config|
+        config.authentication_keys = [:email]
+      end
+    end
+
+    it "allows to access endpoints which require authentication with valid \
+      nick name and token" do
+      get(
+        secrets_path,
+        headers: { "X-USER-EMAIL" => "test@example.com", "X-USER-TOKEN" => @token }
+      )
+      expect(response.status).to eq 200
+    end
+  end
+
   context "when token has expires_in set up" do
     before do
       @user = User.create!(email: "test@example.com", password: "12345678")

data/spec/support/backend.rb

@@ -23,14 +23,7 @@ module Backend
       # 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
+      ActiveRecord::MigrationContext.new(path).migrate
     end
   end
 

data/tiddle.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.3.0'
 
-  spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
-  spec.add_dependency "activerecord", ">= 5.2.0"
-  spec.add_development_dependency "rake"
+  spec.add_dependency "devise", ">= 4.7", "< 6"
+  spec.add_dependency "activerecord", ">= 7.2.0"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "rubocop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Adam Niedzielski
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -16,48 +16,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: '4.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: '4.7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - adamsunday@gmail.com
 executables: []
@@ -148,10 +148,9 @@ files:
 - Rakefile
 - config/locales/en.yml
 - docker-compose.yml
-- gemfiles/rails5.2.gemfile
-- gemfiles/rails6.0.gemfile
-- gemfiles/rails6.1.gemfile
-- gemfiles/rails7.0.gemfile
+- gemfiles/rails7.2.gemfile
+- gemfiles/rails8.0.gemfile
+- gemfiles/rails8.1.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -197,7 +196,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,15 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Token authentication for Devise which supports multiple tokens per model
 test_files:

data/gemfiles/rails5.2.gemfile

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

data/gemfiles/rails6.0.gemfile

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

data/gemfiles/rails6.1.gemfile

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

data/gemfiles/rails7.0.gemfile

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