Skip to content

Commit 051eb59

Browse files
committed
Use optimized loading of configuration
1 parent 2a550f9 commit 051eb59

File tree

5 files changed

+28
-24
lines changed

5 files changed

+28
-24
lines changed

devise-jwt.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2222
spec.require_paths = ["lib"]
2323

24-
spec.add_dependency 'devise', '~> 4.0'
24+
spec.add_dependency 'devise', '>= 4.0'
2525
spec.add_dependency 'warden-jwt_auth', '~> 0.10'
2626

2727
spec.add_development_dependency "bundler", "> 1"

lib/devise/jwt/railtie.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ class Railtie < Rails::Railtie
99
initializer 'devise-jwt-middleware' do |app|
1010
app.middleware.use Warden::JWTAuth::Middleware
1111

12-
config.after_initialize do
13-
Rails.application.reload_routes!
14-
12+
config.after_routes_loaded do
1513
Warden::JWTAuth.configure do |config|
1614
defaults = DefaultsGenerator.call
1715

@@ -21,15 +19,6 @@ class Railtie < Rails::Railtie
2119
config.revocation_strategies = defaults[:revocation_strategies]
2220
end
2321
end
24-
25-
ActiveSupport::Reloader.to_prepare do
26-
Warden::JWTAuth.configure do |config|
27-
defaults = DefaultsGenerator.call
28-
29-
config.mappings = defaults[:mappings]
30-
config.revocation_strategies = defaults[:revocation_strategies]
31-
end
32-
end
3322
end
3423
end
3524
end

spec/fixtures/rails_app/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ gem 'rails'
1010
gem 'sqlite3'
1111
# Use Puma as the app server
1212
gem 'puma'
13+
14+
gem 'devise', github: 'heartcombo/devise', branch: 'main'
1315
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
1416
# gem 'jbuilder', '~> 2.5'
1517
# Use ActiveModel has_secure_password

spec/fixtures/rails_app/Gemfile.lock

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
GIT
2+
remote: https://github.com/heartcombo/devise.git
3+
revision: fec67f98f26fcd9a79072e4581b1bd40d0c7fa1d
4+
branch: main
5+
specs:
6+
devise (5.0.0.beta)
7+
bcrypt (~> 3.0)
8+
orm_adapter (~> 0.1)
9+
railties (>= 6.0.0)
10+
responders
11+
warden (~> 1.2.3)
12+
113
PATH
214
remote: ../../..
315
specs:
416
devise-jwt (0.12.1)
5-
devise (~> 4.0)
17+
devise (>= 4.0)
618
warden-jwt_auth (~> 0.10)
719

820
GEM
@@ -85,15 +97,9 @@ GEM
8597
bigdecimal (3.1.9)
8698
builder (3.3.0)
8799
concurrent-ruby (1.3.5)
88-
connection_pool (2.5.1)
100+
connection_pool (2.5.3)
89101
crass (1.0.6)
90102
date (3.4.1)
91-
devise (4.9.4)
92-
bcrypt (~> 3.0)
93-
orm_adapter (~> 0.1)
94-
railties (>= 4.1.0)
95-
responders
96-
warden (~> 1.2.3)
97103
drb (2.2.1)
98104
dry-auto_inject (1.1.0)
99105
dry-core (~> 1.1)
@@ -147,14 +153,14 @@ GEM
147153
pp (0.6.2)
148154
prettyprint
149155
prettyprint (0.2.0)
150-
psych (5.2.3)
156+
psych (5.2.5)
151157
date
152158
stringio
153159
puma (6.6.0)
154160
nio4r (~> 2.0)
155161
racc (1.8.1)
156-
rack (3.1.13)
157-
rack-session (2.1.0)
162+
rack (3.1.14)
163+
rack-session (2.1.1)
158164
base64 (>= 0.1.0)
159165
rack (>= 3.0.0)
160166
rack-test (2.2.0)
@@ -225,6 +231,7 @@ PLATFORMS
225231
ruby
226232

227233
DEPENDENCIES
234+
devise!
228235
devise-jwt!
229236
puma
230237
rails

spec/spec_helper.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,10 @@
3030

3131
RSpec.configure do |config|
3232
config.use_transactional_fixtures = true
33+
34+
# Make sure routes are loaded once before the test suite is run
35+
# Since they are lazy loaded by default on Rails 8
36+
config.before(:suite) do
37+
Rails.application.try(:reload_routes_unless_loaded)
38+
end
3339
end

0 commit comments

Comments
 (0)