Merge pull request #4 from trusted/security/sync-and-devise-5-compat

Mat-Bit · web-flow · commit 947151d4e856 · 2026-03-26T10:25:13.000-03:00
fix(security): sync with upstream 1.8.1 + relax devise constraint for 5.x
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -12,26 +12,16 @@ 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:
diff --git a/.rubocop.yml b/.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/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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### 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)
diff --git a/Dockerfile b/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
diff --git a/docker-compose.yml b/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/rails7.1.gemfile
   redis:
     image: "redis:6-alpine"
     command: redis-server
diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile
diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile
diff --git a/gemfiles/rails7.0.gemfile b/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: "../"
diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 7.1.3"
 gem "mongoid"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/lib/tiddle/version.rb b/lib/tiddle/version.rb
@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.8.0".freeze
+  VERSION = "1.8.1".freeze
 end
diff --git a/spec/support/backend.rb b/spec/support/backend.rb
@@ -23,14 +23,10 @@ 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
+      ActiveRecord::MigrationContext.new(
+        path,
+        ActiveRecord::SchemaMigration
+      ).migrate
     end
   end
 
diff --git a/tiddle.gemspec b/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 "devise", ">= 4.0.0.rc1", "< 6"
+  spec.add_dependency "activerecord", ">= 6.1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ruby:3.1-alpine`
	`1`	`+FROM ruby:3.3-alpine`
`2`	`2`
`3`	`3`	`RUN apk add build-base sqlite-dev tzdata git bash`
`4`	`4`	`RUN gem update --system && gem install bundler`