Skip to content

Commit 8361254

Browse files
committed
Drop support for Rails 5.1
1 parent 600d215 commit 8361254

File tree

6 files changed

+16
-46
lines changed

6 files changed

+16
-46
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,22 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
ruby: ["ruby-3.0", "ruby-3.1", "ruby-3.2", "ruby-3.3", "ruby-3.4", "ruby-4.0", "jruby-9.4"]
19-
gemfile: ["rails-5.1", "rails-5.2", "rails-6.0", "rails-6.1", "rails-7.0", "rails-7.1", "rails-7.2", "rails-8.0", "rails-8.1"]
19+
gemfile: ["rails-5.2", "rails-6.0", "rails-6.1", "rails-7.0", "rails-7.1", "rails-7.2", "rails-8.0", "rails-8.1"]
2020
exclude:
2121
- ruby: "ruby-4.0"
2222
gemfile: "rails-5.2"
23-
- ruby: "ruby-4.0"
24-
gemfile: "rails-5.1"
2523
- ruby: "ruby-3.4"
2624
gemfile: "rails-5.2"
27-
- ruby: "ruby-3.4"
28-
gemfile: "rails-5.1"
2925
- ruby: "ruby-3.3"
3026
gemfile: "rails-5.2"
31-
- ruby: "ruby-3.3"
32-
gemfile: "rails-5.1"
3327
- ruby: "ruby-3.2"
3428
gemfile: "rails-5.2"
35-
- ruby: "ruby-3.2"
36-
gemfile: "rails-5.1"
3729
- ruby: "ruby-3.1"
3830
gemfile: "rails-8.1"
3931
- ruby: "ruby-3.1"
4032
gemfile: "rails-8.0"
4133
- ruby: "ruby-3.1"
4234
gemfile: "rails-5.2"
43-
- ruby: "ruby-3.1"
44-
gemfile: "rails-5.1"
4535
- ruby: "ruby-3.0"
4636
gemfile: "rails-8.1"
4737
- ruby: "ruby-3.0"
@@ -50,8 +40,6 @@ jobs:
5040
gemfile: "rails-7.2"
5141
- ruby: "ruby-3.0"
5242
gemfile: "rails-5.2"
53-
- ruby: "ruby-3.0"
54-
gemfile: "rails-5.1"
5543
- ruby: "jruby-9.4"
5644
gemfile: "rails-8.1"
5745
- ruby: "jruby-9.4"
@@ -62,8 +50,6 @@ jobs:
6250
gemfile: "rails-7.1"
6351
- ruby: "jruby-9.4"
6452
gemfile: "rails-5.2"
65-
- ruby: "jruby-9.4"
66-
gemfile: "rails-5.1"
6753
env:
6854
BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
6955

lib/rodauth/rails.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,8 @@ def authenticate(name = nil, &condition)
6767
end
6868
end
6969

70-
if ::Rails.gem_version >= Gem::Version.new("5.2")
71-
def secret_key_base
72-
::Rails.application.secret_key_base
73-
end
74-
else
75-
def secret_key_base
76-
::Rails.application.secrets.secret_key_base
77-
end
70+
def secret_key_base
71+
::Rails.application.secret_key_base
7872
end
7973

8074
def configure

rodauth-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
1616
spec.files = Dir["README.md", "LICENSE.txt", "lib/**/*", "*.gemspec"]
1717
spec.require_paths = ["lib"]
1818

19-
spec.add_dependency "railties", ">= 5.1"
19+
spec.add_dependency "railties", ">= 5.2"
2020
spec.add_dependency "rodauth", "~> 2.36"
2121
spec.add_dependency "roda", "~> 3.76"
2222
spec.add_dependency "rodauth-model", "~> 0.2"

test/rails_app/db/migrate/20200411171322_create_rodauth.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ def change
5252
t.references :account, foreign_key: true, null: false
5353
t.datetime :at, null: false, default: -> { "CURRENT_TIMESTAMP" }
5454
t.text :message, null: false
55-
if ActiveRecord.version >= Gem::Version.new("5.2")
56-
t.json :metadata
57-
else
58-
t.text :metadata
59-
end
55+
t.json :metadata
6056
t.index [:account_id, :at]
6157
t.index :at
6258
end

test/rodauth_test.rb

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,16 @@ class RodauthTest < UnitTest
4141
assert_equal "secret", Rodauth::Rails.secret_key_base
4242
end
4343

44-
if Rails.gem_version >= Gem::Version.new("5.2")
45-
Rails.application.credentials.secret_key_base = "credential"
46-
reset_secret_key_base do
47-
assert_equal "credential", Rodauth::Rails.secret_key_base
48-
end
49-
50-
ENV["SECRET_KEY_BASE"] = "environment"
51-
reset_secret_key_base do
52-
assert_equal "environment", Rodauth::Rails.secret_key_base
53-
end
54-
ENV.delete("SECRET_KEY_BASE")
44+
Rails.application.credentials.secret_key_base = "credential"
45+
reset_secret_key_base do
46+
assert_equal "credential", Rodauth::Rails.secret_key_base
5547
end
48+
49+
ENV["SECRET_KEY_BASE"] = "environment"
50+
reset_secret_key_base do
51+
assert_equal "environment", Rodauth::Rails.secret_key_base
52+
end
53+
ENV.delete("SECRET_KEY_BASE")
5654
ensure
5755
Rails.env = "test"
5856
end

test/test_helper.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,17 @@ def setup
1919
super
2020
if ActiveRecord.version >= Gem::Version.new("7.2")
2121
ActiveRecord::Base.connection_pool.migration_context.up
22-
elsif ActiveRecord.version >= Gem::Version.new("5.2")
23-
ActiveRecord::Base.connection.migration_context.up
2422
else
25-
ActiveRecord::Migrator.up(Rails.application.paths["db/migrate"].to_a)
23+
ActiveRecord::Base.connection.migration_context.up
2624
end
2725
end
2826

2927
def teardown
3028
super
3129
if ActiveRecord.version >= Gem::Version.new("7.2")
3230
ActiveRecord::Base.connection_pool.migration_context.up
33-
elsif ActiveRecord.version >= Gem::Version.new("5.2")
34-
ActiveRecord::Base.connection.migration_context.down
3531
else
36-
ActiveRecord::Migrator.down(Rails.application.paths["db/migrate"].to_a)
32+
ActiveRecord::Base.connection.migration_context.down
3733
end
3834
ActiveRecord::Base.clear_cache! # clear schema cache
3935
ActionMailer::Base.deliveries.clear

0 commit comments

Comments
 (0)