activesupport 5.2.4.4 → 6.1.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activesupport might be problematic. Click here for more details.

Files changed (187) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +353 -435
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +4 -3
  5. data/lib/active_support.rb +14 -1
  6. data/lib/active_support/actionable_error.rb +48 -0
  7. data/lib/active_support/array_inquirer.rb +4 -2
  8. data/lib/active_support/backtrace_cleaner.rb +29 -3
  9. data/lib/active_support/benchmarkable.rb +1 -1
  10. data/lib/active_support/cache.rb +142 -78
  11. data/lib/active_support/cache/file_store.rb +33 -33
  12. data/lib/active_support/cache/mem_cache_store.rb +32 -20
  13. data/lib/active_support/cache/memory_store.rb +59 -33
  14. data/lib/active_support/cache/null_store.rb +8 -3
  15. data/lib/active_support/cache/redis_cache_store.rb +70 -43
  16. data/lib/active_support/cache/strategy/local_cache.rb +41 -26
  17. data/lib/active_support/callbacks.rb +81 -64
  18. data/lib/active_support/concern.rb +70 -3
  19. data/lib/active_support/concurrency/load_interlock_aware_monitor.rb +18 -0
  20. data/lib/active_support/concurrency/share_lock.rb +0 -1
  21. data/lib/active_support/configurable.rb +10 -14
  22. data/lib/active_support/configuration_file.rb +46 -0
  23. data/lib/active_support/core_ext.rb +1 -1
  24. data/lib/active_support/core_ext/array.rb +1 -1
  25. data/lib/active_support/core_ext/array/access.rb +18 -6
  26. data/lib/active_support/core_ext/array/conversions.rb +5 -5
  27. data/lib/active_support/core_ext/array/extract.rb +21 -0
  28. data/lib/active_support/core_ext/benchmark.rb +2 -2
  29. data/lib/active_support/core_ext/class/attribute.rb +32 -47
  30. data/lib/active_support/core_ext/class/subclasses.rb +17 -38
  31. data/lib/active_support/core_ext/date/calculations.rb +6 -5
  32. data/lib/active_support/core_ext/date/conversions.rb +2 -1
  33. data/lib/active_support/core_ext/date_and_time/calculations.rb +37 -47
  34. data/lib/active_support/core_ext/date_and_time/compatibility.rb +15 -0
  35. data/lib/active_support/core_ext/date_and_time/zones.rb +0 -1
  36. data/lib/active_support/core_ext/date_time/calculations.rb +1 -1
  37. data/lib/active_support/core_ext/date_time/conversions.rb +0 -1
  38. data/lib/active_support/core_ext/enumerable.rb +171 -75
  39. data/lib/active_support/core_ext/hash.rb +1 -2
  40. data/lib/active_support/core_ext/hash/conversions.rb +3 -3
  41. data/lib/active_support/core_ext/hash/deep_transform_values.rb +46 -0
  42. data/lib/active_support/core_ext/hash/except.rb +2 -2
  43. data/lib/active_support/core_ext/hash/keys.rb +1 -30
  44. data/lib/active_support/core_ext/hash/slice.rb +6 -27
  45. data/lib/active_support/core_ext/integer/multiple.rb +1 -1
  46. data/lib/active_support/core_ext/kernel.rb +0 -1
  47. data/lib/active_support/core_ext/load_error.rb +1 -1
  48. data/lib/active_support/core_ext/marshal.rb +2 -0
  49. data/lib/active_support/core_ext/module.rb +0 -1
  50. data/lib/active_support/core_ext/module/attr_internal.rb +2 -2
  51. data/lib/active_support/core_ext/module/attribute_accessors.rb +30 -39
  52. data/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb +17 -19
  53. data/lib/active_support/core_ext/module/concerning.rb +8 -2
  54. data/lib/active_support/core_ext/module/delegation.rb +76 -33
  55. data/lib/active_support/core_ext/module/introspection.rb +16 -15
  56. data/lib/active_support/core_ext/module/redefine_method.rb +8 -17
  57. data/lib/active_support/core_ext/name_error.rb +29 -2
  58. data/lib/active_support/core_ext/numeric.rb +0 -1
  59. data/lib/active_support/core_ext/numeric/conversions.rb +129 -129
  60. data/lib/active_support/core_ext/object/blank.rb +1 -2
  61. data/lib/active_support/core_ext/object/deep_dup.rb +1 -1
  62. data/lib/active_support/core_ext/object/duplicable.rb +7 -114
  63. data/lib/active_support/core_ext/object/json.rb +14 -2
  64. data/lib/active_support/core_ext/object/try.rb +17 -7
  65. data/lib/active_support/core_ext/object/with_options.rb +1 -1
  66. data/lib/active_support/core_ext/range/compare_range.rb +34 -13
  67. data/lib/active_support/core_ext/range/conversions.rb +31 -29
  68. data/lib/active_support/core_ext/range/each.rb +0 -1
  69. data/lib/active_support/core_ext/range/include_time_with_zone.rb +8 -3
  70. data/lib/active_support/core_ext/regexp.rb +8 -5
  71. data/lib/active_support/core_ext/securerandom.rb +23 -3
  72. data/lib/active_support/core_ext/string/access.rb +5 -16
  73. data/lib/active_support/core_ext/string/conversions.rb +1 -0
  74. data/lib/active_support/core_ext/string/filters.rb +42 -1
  75. data/lib/active_support/core_ext/string/inflections.rb +45 -6
  76. data/lib/active_support/core_ext/string/inquiry.rb +1 -0
  77. data/lib/active_support/core_ext/string/multibyte.rb +6 -5
  78. data/lib/active_support/core_ext/string/output_safety.rb +70 -13
  79. data/lib/active_support/core_ext/string/starts_ends_with.rb +2 -2
  80. data/lib/active_support/core_ext/string/strip.rb +3 -1
  81. data/lib/active_support/core_ext/symbol.rb +3 -0
  82. data/lib/active_support/core_ext/symbol/starts_ends_with.rb +14 -0
  83. data/lib/active_support/core_ext/time/calculations.rb +50 -3
  84. data/lib/active_support/core_ext/time/conversions.rb +2 -0
  85. data/lib/active_support/core_ext/uri.rb +6 -1
  86. data/lib/active_support/current_attributes.rb +15 -2
  87. data/lib/active_support/current_attributes/test_helper.rb +13 -0
  88. data/lib/active_support/dependencies.rb +109 -34
  89. data/lib/active_support/dependencies/zeitwerk_integration.rb +117 -0
  90. data/lib/active_support/deprecation.rb +6 -1
  91. data/lib/active_support/deprecation/behaviors.rb +16 -3
  92. data/lib/active_support/deprecation/disallowed.rb +56 -0
  93. data/lib/active_support/deprecation/instance_delegator.rb +0 -1
  94. data/lib/active_support/deprecation/method_wrappers.rb +18 -23
  95. data/lib/active_support/deprecation/proxy_wrappers.rb +29 -6
  96. data/lib/active_support/deprecation/reporting.rb +50 -7
  97. data/lib/active_support/descendants_tracker.rb +59 -9
  98. data/lib/active_support/duration.rb +90 -38
  99. data/lib/active_support/duration/iso8601_parser.rb +2 -4
  100. data/lib/active_support/duration/iso8601_serializer.rb +18 -14
  101. data/lib/active_support/encrypted_configuration.rb +0 -4
  102. data/lib/active_support/encrypted_file.rb +22 -4
  103. data/lib/active_support/environment_inquirer.rb +20 -0
  104. data/lib/active_support/evented_file_update_checker.rb +82 -117
  105. data/lib/active_support/execution_wrapper.rb +1 -0
  106. data/lib/active_support/file_update_checker.rb +0 -1
  107. data/lib/active_support/fork_tracker.rb +62 -0
  108. data/lib/active_support/gem_version.rb +4 -4
  109. data/lib/active_support/hash_with_indifferent_access.rb +64 -41
  110. data/lib/active_support/i18n.rb +1 -0
  111. data/lib/active_support/i18n_railtie.rb +15 -8
  112. data/lib/active_support/inflector/inflections.rb +2 -7
  113. data/lib/active_support/inflector/methods.rb +49 -58
  114. data/lib/active_support/inflector/transliterate.rb +47 -18
  115. data/lib/active_support/json/decoding.rb +25 -26
  116. data/lib/active_support/json/encoding.rb +11 -3
  117. data/lib/active_support/key_generator.rb +1 -33
  118. data/lib/active_support/lazy_load_hooks.rb +5 -2
  119. data/lib/active_support/locale/en.rb +33 -0
  120. data/lib/active_support/locale/en.yml +7 -3
  121. data/lib/active_support/log_subscriber.rb +39 -9
  122. data/lib/active_support/logger.rb +2 -17
  123. data/lib/active_support/logger_silence.rb +11 -19
  124. data/lib/active_support/logger_thread_safe_level.rb +50 -6
  125. data/lib/active_support/message_encryptor.rb +8 -13
  126. data/lib/active_support/message_verifier.rb +10 -10
  127. data/lib/active_support/messages/metadata.rb +11 -2
  128. data/lib/active_support/messages/rotation_configuration.rb +2 -1
  129. data/lib/active_support/messages/rotator.rb +10 -9
  130. data/lib/active_support/multibyte/chars.rb +10 -68
  131. data/lib/active_support/multibyte/unicode.rb +15 -327
  132. data/lib/active_support/notifications.rb +72 -8
  133. data/lib/active_support/notifications/fanout.rb +116 -16
  134. data/lib/active_support/notifications/instrumenter.rb +71 -9
  135. data/lib/active_support/number_helper.rb +38 -12
  136. data/lib/active_support/number_helper/number_converter.rb +5 -6
  137. data/lib/active_support/number_helper/number_to_currency_converter.rb +4 -9
  138. data/lib/active_support/number_helper/number_to_delimited_converter.rb +3 -2
  139. data/lib/active_support/number_helper/number_to_human_converter.rb +4 -3
  140. data/lib/active_support/number_helper/number_to_human_size_converter.rb +4 -3
  141. data/lib/active_support/number_helper/number_to_percentage_converter.rb +3 -1
  142. data/lib/active_support/number_helper/number_to_phone_converter.rb +2 -1
  143. data/lib/active_support/number_helper/number_to_rounded_converter.rb +8 -7
  144. data/lib/active_support/number_helper/rounding_helper.rb +12 -28
  145. data/lib/active_support/option_merger.rb +22 -3
  146. data/lib/active_support/ordered_hash.rb +1 -1
  147. data/lib/active_support/ordered_options.rb +13 -3
  148. data/lib/active_support/parameter_filter.rb +133 -0
  149. data/lib/active_support/per_thread_registry.rb +1 -1
  150. data/lib/active_support/rails.rb +1 -10
  151. data/lib/active_support/railtie.rb +23 -1
  152. data/lib/active_support/reloader.rb +4 -5
  153. data/lib/active_support/rescuable.rb +4 -4
  154. data/lib/active_support/secure_compare_rotator.rb +51 -0
  155. data/lib/active_support/security_utils.rb +19 -12
  156. data/lib/active_support/string_inquirer.rb +4 -3
  157. data/lib/active_support/subscriber.rb +72 -28
  158. data/lib/active_support/tagged_logging.rb +42 -8
  159. data/lib/active_support/test_case.rb +91 -0
  160. data/lib/active_support/testing/assertions.rb +30 -9
  161. data/lib/active_support/testing/deprecation.rb +0 -1
  162. data/lib/active_support/testing/file_fixtures.rb +2 -0
  163. data/lib/active_support/testing/isolation.rb +2 -2
  164. data/lib/active_support/testing/method_call_assertions.rb +28 -1
  165. data/lib/active_support/testing/parallelization.rb +51 -0
  166. data/lib/active_support/testing/parallelization/server.rb +78 -0
  167. data/lib/active_support/testing/parallelization/worker.rb +100 -0
  168. data/lib/active_support/testing/stream.rb +1 -2
  169. data/lib/active_support/testing/time_helpers.rb +47 -12
  170. data/lib/active_support/time_with_zone.rb +81 -47
  171. data/lib/active_support/values/time_zone.rb +32 -17
  172. data/lib/active_support/xml_mini.rb +2 -10
  173. data/lib/active_support/xml_mini/jdom.rb +2 -3
  174. data/lib/active_support/xml_mini/libxml.rb +2 -2
  175. data/lib/active_support/xml_mini/libxmlsax.rb +4 -4
  176. data/lib/active_support/xml_mini/nokogiri.rb +2 -2
  177. data/lib/active_support/xml_mini/nokogirisax.rb +3 -3
  178. data/lib/active_support/xml_mini/rexml.rb +10 -3
  179. metadata +58 -32
  180. data/lib/active_support/core_ext/array/prepend_and_append.rb +0 -9
  181. data/lib/active_support/core_ext/hash/compact.rb +0 -29
  182. data/lib/active_support/core_ext/hash/transform_values.rb +0 -32
  183. data/lib/active_support/core_ext/kernel/agnostics.rb +0 -13
  184. data/lib/active_support/core_ext/module/reachable.rb +0 -11
  185. data/lib/active_support/core_ext/numeric/inquiry.rb +0 -28
  186. data/lib/active_support/core_ext/range/include_range.rb +0 -3
  187. data/lib/active_support/values/unicode_tables.dat +0 -0
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  class String
4
- alias_method :starts_with?, :start_with?
5
- alias_method :ends_with?, :end_with?
4
+ alias :starts_with? :start_with?
5
+ alias :ends_with? :end_with?
6
6
  end
@@ -20,6 +20,8 @@ class String
20
20
  # Technically, it looks for the least indented non-empty line
21
21
  # in the whole string, and removes that amount of leading whitespace.
22
22
  def strip_heredoc
23
- gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, "".freeze)
23
+ gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, "").tap do |stripped|
24
+ stripped.freeze if frozen?
25
+ end
24
26
  end
25
27
  end
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "active_support/core_ext/symbol/starts_ends_with"
@@ -0,0 +1,14 @@
1
+ # frozen_string_literal: true
2
+
3
+ class Symbol
4
+ def start_with?(*prefixes)
5
+ to_s.start_with?(*prefixes)
6
+ end unless method_defined?(:start_with?)
7
+
8
+ def end_with?(*suffixes)
9
+ to_s.end_with?(*suffixes)
10
+ end unless method_defined?(:end_with?)
11
+
12
+ alias :starts_with? :start_with?
13
+ alias :ends_with? :end_with?
14
+ end
@@ -6,6 +6,7 @@ require "active_support/time_with_zone"
6
6
  require "active_support/core_ext/time/zones"
7
7
  require "active_support/core_ext/date_and_time/calculations"
8
8
  require "active_support/core_ext/date/calculations"
9
+ require "active_support/core_ext/module/remove_method"
9
10
 
10
11
  class Time
11
12
  include DateAndTime::Calculations
@@ -47,7 +48,9 @@ class Time
47
48
  # Time.at can be called with a time or numerical value
48
49
  time_or_number = args.first
49
50
 
50
- if time_or_number.is_a?(ActiveSupport::TimeWithZone) || time_or_number.is_a?(DateTime)
51
+ if time_or_number.is_a?(ActiveSupport::TimeWithZone)
52
+ at_without_coercion(time_or_number.to_r).getlocal
53
+ elsif time_or_number.is_a?(DateTime)
51
54
  at_without_coercion(time_or_number.to_f).getlocal
52
55
  else
53
56
  at_without_coercion(time_or_number)
@@ -105,6 +108,21 @@ class Time
105
108
  subsec
106
109
  end
107
110
 
111
+ unless Time.method_defined?(:floor)
112
+ def floor(precision = 0)
113
+ change(nsec: 0) + subsec.floor(precision)
114
+ end
115
+ end
116
+
117
+ # Restricted Ruby version due to a bug in `Time#ceil`
118
+ # See https://bugs.ruby-lang.org/issues/17025 for more details
119
+ if RUBY_VERSION <= "2.8"
120
+ remove_possible_method :ceil
121
+ def ceil(precision = 0)
122
+ change(nsec: 0) + subsec.ceil(precision)
123
+ end
124
+ end
125
+
108
126
  # Returns a new Time where one or more of the elements have been changed according
109
127
  # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
110
128
  # <tt>:sec</tt>, <tt>:usec</tt>, <tt>:nsec</tt>) reset cascadingly, so if only
@@ -170,8 +188,7 @@ class Time
170
188
  options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
171
189
  end
172
190
 
173
- d = to_date.advance(options)
174
- d = d.gregorian if d.julian?
191
+ d = to_date.gregorian.advance(options)
175
192
  time_advanced_by_date = change(year: d.year, month: d.month, day: d.day)
176
193
  seconds_to_advance = \
177
194
  options.fetch(:seconds, 0) +
@@ -312,4 +329,34 @@ class Time
312
329
  end
313
330
  alias_method :eql_without_coercion, :eql?
314
331
  alias_method :eql?, :eql_with_coercion
332
+
333
+ # Returns a new time the specified number of days ago.
334
+ def prev_day(days = 1)
335
+ advance(days: -days)
336
+ end
337
+
338
+ # Returns a new time the specified number of days in the future.
339
+ def next_day(days = 1)
340
+ advance(days: days)
341
+ end
342
+
343
+ # Returns a new time the specified number of months ago.
344
+ def prev_month(months = 1)
345
+ advance(months: -months)
346
+ end
347
+
348
+ # Returns a new time the specified number of months in the future.
349
+ def next_month(months = 1)
350
+ advance(months: months)
351
+ end
352
+
353
+ # Returns a new time the specified number of years ago.
354
+ def prev_year(years = 1)
355
+ advance(years: -years)
356
+ end
357
+
358
+ # Returns a new time the specified number of years in the future.
359
+ def next_year(years = 1)
360
+ advance(years: years)
361
+ end
315
362
  end
@@ -1,11 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require "time"
3
4
  require "active_support/inflector/methods"
4
5
  require "active_support/values/time_zone"
5
6
 
6
7
  class Time
7
8
  DATE_FORMATS = {
8
9
  db: "%Y-%m-%d %H:%M:%S",
10
+ inspect: "%Y-%m-%d %H:%M:%S.%9N %z",
9
11
  number: "%Y%m%d%H%M%S",
10
12
  nsec: "%Y%m%d%H%M%S%9N",
11
13
  usec: "%Y%m%d%H%M%S%6N",
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require "uri"
4
+
4
5
  if RUBY_VERSION < "2.6.0"
5
6
  require "active_support/core_ext/module/redefine_method"
6
7
  URI::Parser.class_eval do
@@ -18,7 +19,11 @@ end
18
19
  module URI
19
20
  class << self
20
21
  def parser
21
- @parser ||= URI::Parser.new
22
+ ActiveSupport::Deprecation.warn(<<-MSG.squish)
23
+ URI.parser is deprecated and will be removed in Rails 6.2.
24
+ Use `URI::DEFAULT_PARSER` instead.
25
+ MSG
26
+ URI::DEFAULT_PARSER
22
27
  end
23
28
  end
24
29
  end
@@ -1,5 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require "active_support/callbacks"
4
+ require "active_support/core_ext/enumerable"
5
+
3
6
  module ActiveSupport
4
7
  # Abstract super class that provides a thread-isolated attributes singleton, which resets automatically
5
8
  # before and after each request. This allows you to keep all the per-request attributes easily
@@ -89,7 +92,7 @@ module ActiveSupport
89
92
  class << self
90
93
  # Returns singleton instance for this class in this thread. If none exists, one is created.
91
94
  def instance
92
- current_instances[name] ||= new
95
+ current_instances[current_instances_key] ||= new
93
96
  end
94
97
 
95
98
  # Declares one or more attributes that will be given both class and instance accessor methods.
@@ -117,10 +120,16 @@ module ActiveSupport
117
120
  end
118
121
  end
119
122
 
123
+ # Calls this block before #reset is called on the instance. Used for resetting external collaborators that depend on current values.
124
+ def before_reset(&block)
125
+ set_callback :reset, :before, &block
126
+ end
127
+
120
128
  # Calls this block after #reset is called on the instance. Used for resetting external collaborators, like Time.zone.
121
129
  def resets(&block)
122
130
  set_callback :reset, :after, &block
123
131
  end
132
+ alias_method :after_reset, :resets
124
133
 
125
134
  delegate :set, :reset, to: :instance
126
135
 
@@ -142,6 +151,10 @@ module ActiveSupport
142
151
  Thread.current[:current_attributes_instances] ||= {}
143
152
  end
144
153
 
154
+ def current_instances_key
155
+ @current_instances_key ||= name.to_sym
156
+ end
157
+
145
158
  def method_missing(name, *args, &block)
146
159
  # Caches the method definition as a singleton method of the receiver.
147
160
  #
@@ -189,7 +202,7 @@ module ActiveSupport
189
202
  end
190
203
 
191
204
  def compute_attributes(keys)
192
- keys.collect { |key| [ key, public_send(key) ] }.to_h
205
+ keys.index_with { |key| public_send(key) }
193
206
  end
194
207
  end
195
208
  end
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ module ActiveSupport::CurrentAttributes::TestHelper # :nodoc:
4
+ def before_setup
5
+ ActiveSupport::CurrentAttributes.reset_all
6
+ super
7
+ end
8
+
9
+ def after_teardown
10
+ super
11
+ ActiveSupport::CurrentAttributes.reset_all
12
+ end
13
+ end
@@ -12,7 +12,6 @@ require "active_support/core_ext/object/blank"
12
12
  require "active_support/core_ext/kernel/reporting"
13
13
  require "active_support/core_ext/load_error"
14
14
  require "active_support/core_ext/name_error"
15
- require "active_support/core_ext/string/starts_ends_with"
16
15
  require "active_support/dependencies/interlock"
17
16
  require "active_support/inflector"
18
17
 
@@ -20,6 +19,9 @@ module ActiveSupport #:nodoc:
20
19
  module Dependencies #:nodoc:
21
20
  extend self
22
21
 
22
+ UNBOUND_METHOD_MODULE_NAME = Module.instance_method(:name)
23
+ private_constant :UNBOUND_METHOD_MODULE_NAME
24
+
23
25
  mattr_accessor :interlock, default: Interlock.new
24
26
 
25
27
  # :doc:
@@ -70,6 +72,11 @@ module ActiveSupport #:nodoc:
70
72
  # only once. All directories in this set must also be present in +autoload_paths+.
71
73
  mattr_accessor :autoload_once_paths, default: []
72
74
 
75
+ # This is a private set that collects all eager load paths during bootstrap.
76
+ # Useful for Zeitwerk integration. Its public interface is the config.* path
77
+ # accessors of each engine.
78
+ mattr_accessor :_eager_load_paths, default: Set.new
79
+
73
80
  # An array of qualified constant names that have been loaded. Adding a name
74
81
  # to this array will cause it to be unloaded the next time Dependencies are
75
82
  # cleared.
@@ -79,6 +86,12 @@ module ActiveSupport #:nodoc:
79
86
  # to allow arbitrary constants to be marked for unloading.
80
87
  mattr_accessor :explicitly_unloadable_constants, default: []
81
88
 
89
+ # The logger used when tracing autoloads.
90
+ mattr_accessor :logger
91
+
92
+ # If true, trace autoloads with +logger.debug+.
93
+ mattr_accessor :verbose, default: false
94
+
82
95
  # The WatchStack keeps a stack of the modules being watched as files are
83
96
  # loaded. If a file in the process of being loaded (parent.rb) triggers the
84
97
  # load of another file (child.rb) the stack will ensure that child.rb
@@ -140,7 +153,7 @@ module ActiveSupport #:nodoc:
140
153
 
141
154
  # Normalize the list of new constants, and add them to the list we will return
142
155
  new_constants.each do |suffix|
143
- constants << ([namespace, suffix] - ["Object"]).join("::".freeze)
156
+ constants << ([namespace, suffix] - ["Object"]).join("::")
144
157
  end
145
158
  end
146
159
  constants
@@ -190,6 +203,11 @@ module ActiveSupport #:nodoc:
190
203
  end
191
204
  end
192
205
 
206
+ def self.include_into(base)
207
+ base.include(self)
208
+ append_features(base)
209
+ end
210
+
193
211
  def const_missing(const_name)
194
212
  from_mod = anonymous? ? guess_for_anonymous(const_name) : self
195
213
  Dependencies.load_missing_constant(from_mod, const_name)
@@ -219,6 +237,21 @@ module ActiveSupport #:nodoc:
219
237
  base.class_eval do
220
238
  define_method(:load, Kernel.instance_method(:load))
221
239
  private :load
240
+
241
+ define_method(:require, Kernel.instance_method(:require))
242
+ private :require
243
+ end
244
+ end
245
+
246
+ def self.include_into(base)
247
+ base.include(self)
248
+
249
+ if base.instance_method(:load).owner == base
250
+ base.remove_method(:load)
251
+ end
252
+
253
+ if base.instance_method(:require).owner == base
254
+ base.remove_method(:require)
222
255
  end
223
256
  end
224
257
 
@@ -228,15 +261,24 @@ module ActiveSupport #:nodoc:
228
261
 
229
262
  # :doc:
230
263
 
231
- # Interprets a file using <tt>mechanism</tt> and marks its defined
232
- # constants as autoloaded. <tt>file_name</tt> can be either a string or
264
+ # <b>Warning:</b> This method is obsolete in +:zeitwerk+ mode. In
265
+ # +:zeitwerk+ mode semantics match Ruby's and you do not need to be
266
+ # defensive with load order. Just refer to classes and modules normally.
267
+ # If the constant name is dynamic, camelize if needed, and constantize.
268
+ #
269
+ # In +:classic+ mode, interprets a file using +mechanism+ and marks its
270
+ # defined constants as autoloaded. +file_name+ can be either a string or
233
271
  # respond to <tt>to_path</tt>.
234
272
  #
235
- # Use this method in code that absolutely needs a certain constant to be
236
- # defined at that point. A typical use case is to make constant name
237
- # resolution deterministic for constants with the same relative name in
238
- # different namespaces whose evaluation would depend on load order
239
- # otherwise.
273
+ # In +:classic+ mode, use this method in code that absolutely needs a
274
+ # certain constant to be defined at that point. A typical use case is to
275
+ # make constant name resolution deterministic for constants with the same
276
+ # relative name in different namespaces whose evaluation would depend on
277
+ # load order otherwise.
278
+ #
279
+ # Engines that do not control the mode in which their parent application
280
+ # runs should call +require_dependency+ where needed in case the runtime
281
+ # mode is +:classic+.
240
282
  def require_dependency(file_name, message = "No such file to load -- %s.rb")
241
283
  file_name = file_name.to_path if file_name.respond_to?(:to_path)
242
284
  unless file_name.is_a?(String)
@@ -279,7 +321,6 @@ module ActiveSupport #:nodoc:
279
321
  end
280
322
 
281
323
  private
282
-
283
324
  def load(file, wrap = false)
284
325
  result = false
285
326
  load_dependency(file) { result = super }
@@ -315,9 +356,9 @@ module ActiveSupport #:nodoc:
315
356
  end
316
357
 
317
358
  def hook!
318
- Object.class_eval { include Loadable }
319
- Module.class_eval { include ModuleConstMissing }
320
- Exception.class_eval { include Blamable }
359
+ Loadable.include_into(Object)
360
+ ModuleConstMissing.include_into(Module)
361
+ Exception.include(Blamable)
321
362
  end
322
363
 
323
364
  def unhook!
@@ -334,7 +375,12 @@ module ActiveSupport #:nodoc:
334
375
  require_or_load(path || file_name)
335
376
  rescue LoadError => load_error
336
377
  if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
337
- load_error.message.replace(message % file_name)
378
+ load_error_message = if load_error.respond_to?(:original_message)
379
+ load_error.original_message
380
+ else
381
+ load_error.message
382
+ end
383
+ load_error_message.replace(message % file_name)
338
384
  load_error.copy_blame!(load_error)
339
385
  end
340
386
  raise
@@ -349,7 +395,7 @@ module ActiveSupport #:nodoc:
349
395
  end
350
396
 
351
397
  def require_or_load(file_name, const_path = nil)
352
- file_name = $` if file_name =~ /\.rb\z/
398
+ file_name = file_name.chomp(".rb")
353
399
  expanded = File.expand_path(file_name)
354
400
  return if loaded.include?(expanded)
355
401
 
@@ -399,7 +445,7 @@ module ActiveSupport #:nodoc:
399
445
  # constant paths which would cause Dependencies to attempt to load this
400
446
  # file.
401
447
  def loadable_constants_for_path(path, bases = autoload_paths)
402
- path = $` if path =~ /\.rb\z/
448
+ path = path.chomp(".rb")
403
449
  expanded_path = File.expand_path(path)
404
450
  paths = []
405
451
 
@@ -408,7 +454,7 @@ module ActiveSupport #:nodoc:
408
454
  next unless expanded_path.start_with?(expanded_root)
409
455
 
410
456
  root_size = expanded_root.size
411
- next if expanded_path[root_size] != ?/.freeze
457
+ next if expanded_path[root_size] != ?/
412
458
 
413
459
  nesting = expanded_path[(root_size + 1)..-1]
414
460
  paths << nesting.camelize unless nesting.blank?
@@ -420,7 +466,7 @@ module ActiveSupport #:nodoc:
420
466
 
421
467
  # Search for a file in autoload_paths matching the provided suffix.
422
468
  def search_for_file(path_suffix)
423
- path_suffix = path_suffix.sub(/(\.rb)?$/, ".rb".freeze)
469
+ path_suffix += ".rb" unless path_suffix.end_with?(".rb")
424
470
 
425
471
  autoload_paths.each do |root|
426
472
  path = File.join(root, path_suffix)
@@ -440,9 +486,9 @@ module ActiveSupport #:nodoc:
440
486
  end
441
487
 
442
488
  def load_once_path?(path)
443
- # to_s works around a ruby issue where String#starts_with?(Pathname)
489
+ # to_s works around a ruby issue where String#start_with?(Pathname)
444
490
  # will raise a TypeError: no implicit conversion of Pathname into String
445
- autoload_once_paths.any? { |base| path.starts_with? base.to_s }
491
+ autoload_once_paths.any? { |base| path.start_with?(base.to_s) }
446
492
  end
447
493
 
448
494
  # Attempt to autoload the provided module name by searching for a directory
@@ -454,6 +500,7 @@ module ActiveSupport #:nodoc:
454
500
  return nil unless base_path = autoloadable_module?(path_suffix)
455
501
  mod = Module.new
456
502
  into.const_set const_name, mod
503
+ log("constant #{qualified_name} autoloaded (module autovivified from #{File.join(base_path, path_suffix)})")
457
504
  autoloaded_constants << qualified_name unless autoload_once_paths.include?(base_path)
458
505
  autoloaded_constants.uniq!
459
506
  mod
@@ -491,30 +538,36 @@ module ActiveSupport #:nodoc:
491
538
  # it is not possible to load the constant into from_mod, try its parent
492
539
  # module using +const_missing+.
493
540
  def load_missing_constant(from_mod, const_name)
494
- unless qualified_const_defined?(from_mod.name) && Inflector.constantize(from_mod.name).equal?(from_mod)
541
+ from_mod_name = real_mod_name(from_mod)
542
+ unless qualified_const_defined?(from_mod_name) && Inflector.constantize(from_mod_name).equal?(from_mod)
495
543
  raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
496
544
  end
497
545
 
498
- qualified_name = qualified_name_for from_mod, const_name
546
+ qualified_name = qualified_name_for(from_mod, const_name)
499
547
  path_suffix = qualified_name.underscore
500
548
 
501
549
  file_path = search_for_file(path_suffix)
502
550
 
503
551
  if file_path
504
552
  expanded = File.expand_path(file_path)
505
- expanded.sub!(/\.rb\z/, "".freeze)
553
+ expanded.delete_suffix!(".rb")
506
554
 
507
555
  if loading.include?(expanded)
508
556
  raise "Circular dependency detected while autoloading constant #{qualified_name}"
509
557
  else
510
558
  require_or_load(expanded, qualified_name)
511
- raise LoadError, "Unable to autoload constant #{qualified_name}, expected #{file_path} to define it" unless from_mod.const_defined?(const_name, false)
512
- return from_mod.const_get(const_name)
559
+
560
+ if from_mod.const_defined?(const_name, false)
561
+ log("constant #{qualified_name} autoloaded from #{expanded}.rb")
562
+ return from_mod.const_get(const_name)
563
+ else
564
+ raise LoadError, "Unable to autoload constant #{qualified_name}, expected #{file_path} to define it"
565
+ end
513
566
  end
514
567
  elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix)
515
568
  return mod
516
- elsif (parent = from_mod.parent) && parent != from_mod &&
517
- ! from_mod.parents.any? { |p| p.const_defined?(const_name, false) }
569
+ elsif (parent = from_mod.module_parent) && parent != from_mod &&
570
+ ! from_mod.module_parents.any? { |p| p.const_defined?(const_name, false) }
518
571
  # If our parents do not have a constant named +const_name+ then we are free
519
572
  # to attempt to load upwards. If they do have such a constant, then this
520
573
  # const_missing must be due to from_mod::const_name, which should not
@@ -545,8 +598,8 @@ module ActiveSupport #:nodoc:
545
598
  end
546
599
  end
547
600
 
548
- name_error = NameError.new("uninitialized constant #{qualified_name}", const_name)
549
- name_error.set_backtrace(caller.reject { |l| l.starts_with? __FILE__ })
601
+ name_error = uninitialized_constant(qualified_name, const_name, receiver: from_mod)
602
+ name_error.set_backtrace(caller.reject { |l| l.start_with? __FILE__ })
550
603
  raise name_error
551
604
  end
552
605
 
@@ -558,6 +611,7 @@ module ActiveSupport #:nodoc:
558
611
  # as the environment will be in an inconsistent state, e.g. other constants
559
612
  # may have already been unloaded and not accessible.
560
613
  def remove_unloadable_constants!
614
+ log("removing unloadable constants")
561
615
  autoloaded_constants.each { |const| remove_constant const }
562
616
  autoloaded_constants.clear
563
617
  Reference.clear!
@@ -621,7 +675,7 @@ module ActiveSupport #:nodoc:
621
675
 
622
676
  # Determine if the given constant has been automatically loaded.
623
677
  def autoloaded?(desc)
624
- return false if desc.is_a?(Module) && desc.anonymous?
678
+ return false if desc.is_a?(Module) && real_mod_name(desc).nil?
625
679
  name = to_constant_name desc
626
680
  return false unless qualified_const_defined?(name)
627
681
  autoloaded_constants.include?(name)
@@ -674,10 +728,10 @@ module ActiveSupport #:nodoc:
674
728
  # A module, class, symbol, or string may be provided.
675
729
  def to_constant_name(desc) #:nodoc:
676
730
  case desc
677
- when String then desc.sub(/^::/, "")
731
+ when String then desc.delete_prefix("::")
678
732
  when Symbol then desc.to_s
679
733
  when Module
680
- desc.name ||
734
+ real_mod_name(desc) ||
681
735
  raise(ArgumentError, "Anonymous modules have no name to be referenced by")
682
736
  else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
683
737
  end
@@ -685,7 +739,7 @@ module ActiveSupport #:nodoc:
685
739
 
686
740
  def remove_constant(const) #:nodoc:
687
741
  # Normalize ::Foo, ::Object::Foo, Object::Foo, Object::Object::Foo, etc. as Foo.
688
- normalized = const.to_s.sub(/\A::/, "")
742
+ normalized = const.to_s.delete_prefix("::")
689
743
  normalized.sub!(/\A(Object::)+/, "")
690
744
 
691
745
  constants = normalized.split("::")
@@ -695,7 +749,7 @@ module ActiveSupport #:nodoc:
695
749
  file_path = search_for_file(const.underscore)
696
750
  if file_path
697
751
  expanded = File.expand_path(file_path)
698
- expanded.sub!(/\.rb\z/, "")
752
+ expanded.delete_suffix!(".rb")
699
753
  loaded.delete(expanded)
700
754
  end
701
755
 
@@ -747,6 +801,27 @@ module ActiveSupport #:nodoc:
747
801
  # The constant is no longer reachable, just skip it.
748
802
  end
749
803
  end
804
+
805
+ def log(message)
806
+ logger.debug("autoloading: #{message}") if logger && verbose
807
+ end
808
+
809
+ private
810
+ if RUBY_VERSION < "2.6"
811
+ def uninitialized_constant(qualified_name, const_name, receiver:)
812
+ NameError.new("uninitialized constant #{qualified_name}", const_name)
813
+ end
814
+ else
815
+ def uninitialized_constant(qualified_name, const_name, receiver:)
816
+ NameError.new("uninitialized constant #{qualified_name}", const_name, receiver: receiver)
817
+ end
818
+ end
819
+
820
+ # Returns the original name of a class or module even if `name` has been
821
+ # overridden.
822
+ def real_mod_name(mod)
823
+ UNBOUND_METHOD_MODULE_NAME.bind(mod).call
824
+ end
750
825
  end
751
826
  end
752
827