tiddle 1.7.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a348d248985933eddf79f194679aa3c1ee6724006f3386a88d143efff7080b0d
-  data.tar.gz: 36f11c54b9cb1829fbbe07e200f404bb8958265582854dd71583a4f90565ef4b
+  metadata.gz: 2f2ed0612bc75fa65d51698a55ee988a5c490a4d3effb5427dd4d1a28e6245dd
+  data.tar.gz: 427329473b539b834b336fa06b1d7ec2112a1518eee77ade08b82bbd7aefb2a8
 SHA512:
-  metadata.gz: b2001e1d59b7fe3596dd7727477e3315f7bc91d4725653ace774bdce0804dd11dceded3908d8be15bf05f8bbcb30e29b90ea8e99366069e693e2eb1ed7526960
-  data.tar.gz: 34064918737c1c9d1da935488fee01b711823cedc9c5b7ccfd411b30a94390b241ca7a9f6106ecb8c9acb7a6847a475ad2f9930a431d39417a495e7a9a4df812
+  metadata.gz: 4dc7f6abcdccab03224a92f2d7086afa8efa1b20f9fda55289028ccb5530ed930d0e0ed3ca56954fc25f376edad07d3bc0483dbeb69c0675ee7d7698f9786876
+  data.tar.gz: 2c061b3ecf31c7b75481f973ea947c1d722f8bb052b22b20cab86fc45417227d35deede8b91afd585935a4371ab44dfefbc72d3d3f3f872c6a2709c54fd8b722

data/.github/workflows/ruby.yml

@@ -12,26 +12,17 @@ jobs:
       fail-fast: false
       matrix:
         gemfile:
-          - rails5.2
-          - rails6.0
           - rails6.1
           - rails7.0
+          - rails7.1
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
         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:

data/.rubocop.yml

@@ -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/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,17 @@
+### 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)
+
 ### 1.7.1
 
 Fix invalid headers generated when model is namespaced (Ariel Agne da Silveira)

data/CONTRIBUTING.md

@@ -9,3 +9,25 @@
 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.
 5. Push to your fork and submit a pull request.
+
+#### Docker for development
+
+Alternatively you can use Docker for the development setup. This requires Docker
+and Docker Compose installed.
+
+```
+make build
+make bundle
+```
+
+And in order to run the tests and linter checks:
+
+```
+make test
+```
+
+After you're done, cleanup leftover containers:
+
+```
+make cleanup
+```

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:3.3-alpine
+
+RUN apk add build-base sqlite-dev tzdata git bash
+RUN gem update --system && gem install bundler
+
+WORKDIR /library
+
+ENV BUNDLE_PATH=/vendor/bundle \
+    BUNDLE_BIN=/vendor/bundle/bin \
+    GEM_HOME=/vendor/bundle
+
+ENV PATH="${BUNDLE_BIN}:${PATH}"

data/Makefile

@@ -0,0 +1,16 @@
+.PHONY: build bundle test bash cleanup
+
+build:
+	docker-compose build
+
+bundle:
+	docker-compose run --rm library bundle install
+
+test:
+	docker-compose run --rm library bundle exec rake
+
+bash:
+	docker-compose run --rm library bash
+
+cleanup:
+	docker-compose down

data/docker-compose.yml

@@ -0,0 +1,24 @@
+version: "3.9"
+services:
+  library:
+    platform: linux/x86_64
+    build:
+      context: .
+    stdin_open: true
+    tty: true
+    volumes:
+      - ".:/library"
+      - vendor:/vendor
+    depends_on:
+      - redis
+    environment:
+      - REDIS_URL=redis://redis:6379/1
+      - BUNDLE_GEMFILE=gemfiles/rails7.1.gemfile
+  redis:
+    image: "redis:6-alpine"
+    command: redis-server
+    volumes:
+      - "redis:/data"
+volumes:
+  vendor:
+  redis:

data/gemfiles/rails6.1.gemfile

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

data/gemfiles/rails7.0.gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 7.0.2"
 gem "mongoid"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails7.1.gemfile

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

data/lib/tiddle/strategy.rb

@@ -57,15 +57,30 @@ module Devise
       end
 
       def touch_token(token)
-        token.update_attribute(:last_used_at, Time.current) if token.last_used_at < 1.hour.ago
+        return unless token.last_used_at < touch_token_interval(token).ago
+
+        token.update_attribute(:last_used_at, Time.current)
       end
 
       def unexpired?(token)
-        return true unless token.respond_to?(:expires_in)
-        return true if token.expires_in.blank? || token.expires_in.zero?
+        return true if expiration_disabled?(token)
 
         Time.current <= token.last_used_at + token.expires_in
       end
+
+      def touch_token_interval(token)
+        return 1.hour if expiration_disabled?(token) || token.expires_in >= 24.hours
+
+        return 5.minutes if token.expires_in >= 1.hour
+
+        1.minute
+      end
+
+      def expiration_disabled?(token)
+        !token.respond_to?(:expires_in) ||
+          token.expires_in.blank? ||
+          token.expires_in.zero?
+      end
     end
   end
 end

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.7.1".freeze
+  VERSION = "1.8.1".freeze
 end

data/spec/strategy_spec.rb

@@ -217,5 +217,89 @@ describe "Authentication using Tiddle strategy", type: :request do
         expect(response.status).to eq 401
       end
     end
+
+    context "with value lower than 24 hours" do
+      before do
+        @token = Tiddle.create_and_return_token(@user, FakeRequest.new, expires_in: 1.hour)
+      end
+
+      context "and token was last used a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 1.minute.ago)
+        end
+
+        it "does not update last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.not_to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+
+      context "and token was last used 5 minutes ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 5.minute.ago)
+        end
+
+        it "updates last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+    end
+
+    context "with value lower than 1 hour" do
+      before do
+        @token = Tiddle.create_and_return_token(@user, FakeRequest.new, expires_in: 30.minutes)
+      end
+
+      context "and token was last used less than a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 30.seconds.ago)
+        end
+
+        it "does not update last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.not_to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+
+      context "and token was last used a minute ago" do
+        before do
+          @user.authentication_tokens.last.update_attribute(:last_used_at, 1.minute.ago)
+        end
+
+        it "updates last_used_at field" do
+          expect do
+            get(
+              secrets_path,
+              headers: {
+                "X-USER-EMAIL" => "test@example.com",
+                "X-USER-TOKEN" => @token
+              }
+            )
+          end.to(change { @user.authentication_tokens.last.reload.last_used_at })
+        end
+      end
+    end
   end
 end

data/spec/support/backend.rb

@@ -23,14 +23,10 @@ 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,
+        ActiveRecord::SchemaMigration
+      ).migrate
     end
   end
 

data/tiddle.gemspec

@@ -16,10 +16,10 @@ 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.0.0'
 
   spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
-  spec.add_dependency "activerecord", ">= 5.2.0"
+  spec.add_dependency "activerecord", ">= 6.1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Adam Niedzielski
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - adamsunday@gmail.com
 executables: []
@@ -141,14 +141,16 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dockerfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - config/locales/en.yml
-- gemfiles/rails5.2.gemfile
-- gemfiles/rails6.0.gemfile
+- docker-compose.yml
 - gemfiles/rails6.1.gemfile
 - gemfiles/rails7.0.gemfile
+- gemfiles/rails7.1.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -194,7 +196,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,15 +204,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.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.12
+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: "../"