Skip to content

Commit a559477

Browse files
committed
Lean on require_relative
Remove `require "active_record"`
1 parent 71ad641 commit a559477

File tree

2 files changed

+28
-36
lines changed

2 files changed

+28
-36
lines changed

authlogic.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# frozen_string_literal: true
22

33
require "English"
4-
$LOAD_PATH.push File.expand_path("lib", __dir__)
5-
require "authlogic/version"
4+
5+
require_relative "lib/authlogic/version"
66

77
::Gem::Specification.new do |s|
88
s.name = "authlogic"

lib/authlogic.rb

+26-34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# frozen_string_literal: true
22

3+
require_relative "authlogic/errors"
4+
require_relative "authlogic/i18n"
5+
require_relative "authlogic/random"
6+
require_relative "authlogic/config"
7+
8+
require_relative "authlogic/controller_adapters/abstract_adapter"
9+
require_relative "authlogic/cookie_credentials"
10+
11+
require_relative "authlogic/crypto_providers"
12+
13+
require_relative "authlogic/acts_as_authentic/email"
14+
require_relative "authlogic/acts_as_authentic/logged_in_status"
15+
require_relative "authlogic/acts_as_authentic/login"
16+
require_relative "authlogic/acts_as_authentic/magic_columns"
17+
require_relative "authlogic/acts_as_authentic/password"
18+
require_relative "authlogic/acts_as_authentic/perishable_token"
19+
require_relative "authlogic/acts_as_authentic/persistence_token"
20+
require_relative "authlogic/acts_as_authentic/session_maintenance"
21+
require_relative "authlogic/acts_as_authentic/single_access_token"
22+
require_relative "authlogic/acts_as_authentic/base"
23+
24+
require_relative "authlogic/session/magic_column/assigns_last_request_at"
25+
require_relative "authlogic/session/base"
26+
327
# Authlogic uses ActiveSupport's core extensions like `strip_heredoc` and
428
# `squish`. ActiveRecord does not `require` these exensions, so we must.
529
#
@@ -8,37 +32,5 @@
832
# decision if it becomes a problem.
933
require "active_support/all"
1034

11-
require "active_record"
12-
13-
path = File.dirname(__FILE__) + "/authlogic/"
14-
15-
[
16-
"errors",
17-
"i18n",
18-
"random",
19-
"config",
20-
21-
"controller_adapters/abstract_adapter",
22-
"cookie_credentials",
23-
24-
"crypto_providers",
25-
26-
"acts_as_authentic/email",
27-
"acts_as_authentic/logged_in_status",
28-
"acts_as_authentic/login",
29-
"acts_as_authentic/magic_columns",
30-
"acts_as_authentic/password",
31-
"acts_as_authentic/perishable_token",
32-
"acts_as_authentic/persistence_token",
33-
"acts_as_authentic/session_maintenance",
34-
"acts_as_authentic/single_access_token",
35-
"acts_as_authentic/base",
36-
37-
"session/magic_column/assigns_last_request_at",
38-
"session/base"
39-
].each do |library|
40-
require path + library
41-
end
42-
43-
require path + "controller_adapters/rails_adapter" if defined?(Rails)
44-
require path + "controller_adapters/sinatra_adapter" if defined?(Sinatra)
35+
require_relative "authlogic/controller_adapters/rails_adapter" if defined?(Rails)
36+
require_relative "authlogic/controller_adapters/sinatra_adapter" if defined?(Sinatra)

0 commit comments

Comments
 (0)