activesupport 6.0.4.4 → 6.0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2de2af4e62fead21ec1c148e0906fa931ce67c72deccfe0ae40c41c159ec1ab
-  data.tar.gz: 94cc128d9b8f6ecd684c8a83b00d4d5f2eef2b9e7bf889df0080ef4c4e038e16
+  metadata.gz: b3d3ba8fd5de1391ada73bcfd16f9a658358c5a9b199011a4b1fb1a2cc2766e3
+  data.tar.gz: 32b840f700c1c9d592bb74579d1c9e36ccbd4957a96b82fa0b4eebf37c574227
 SHA512:
-  metadata.gz: cdb73e85d96d60f649010319f9fbb0f8dc0ae4b7f504f54586b31d603228e2aa22b72ffc3ee70beecf3dcb83b56128714849c86c8b2b06dbade903c70256c174
-  data.tar.gz: 1c94435789eea8aa38a79bee7a9fcf26759d29c3aedc232636361392eefa2da0112d0a684ae245462be6a1b9c141f6367f7d190285b888109bfd971e2a22646f
+  metadata.gz: 485e5d92c3155de2036d9e9f6364c0cdb02787a2ef82bcb059098f95456d5dadac08de5cc0bdb98e66f4110e0fb5676bbf0f163d4ca5daeeadeb49cec987d9da
+  data.tar.gz: 035d33a067ad18da1472f07c54e4d73195880d3051aeaf513baa65ef6ac776e937e0b4966c6e6f3b406747a1037356be2365e76d62a223e5a7d06616a2ab8208

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.0.4.6 (February 11, 2022) ##
+
+*   Fix Reloader method signature to work with the new Executor signature
+
+
+## Rails 6.0.4.5 (February 11, 2022) ##
+
+*   No changes.
+
+
 ## Rails 6.0.4.4 (December 15, 2021) ##
 
 *   No changes.

data/lib/active_support/execution_wrapper.rb

@@ -63,18 +63,21 @@ module ActiveSupport
     # after the work has been performed.
     #
     # Where possible, prefer +wrap+.
-    def self.run!
-      if active?
-        Null
+    def self.run!(reset: false)
+      if reset
+        lost_instance = active.delete(Thread.current)
+        lost_instance&.complete!
       else
-        new.tap do |instance|
-          success = nil
-          begin
-            instance.run!
-            success = true
-          ensure
-            instance.complete! unless success
-          end
+        return Null if active?
+      end
+
+      new.tap do |instance|
+        success = nil
+        begin
+          instance.run!
+          success = true
+        ensure
+          instance.complete! unless success
         end
       end
     end
@@ -103,11 +106,11 @@ module ActiveSupport
     self.active = Concurrent::Hash.new
 
     def self.active? # :nodoc:
-      @active[Thread.current]
+      @active.key?(Thread.current)
     end
 
     def run! # :nodoc:
-      self.class.active[Thread.current] = true
+      self.class.active[Thread.current] = self
       run_callbacks(:run)
     end
 

data/lib/active_support/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveSupport
     MAJOR = 6
     MINOR = 0
     TINY  = 4
-    PRE   = "4"
+    PRE   = "6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/reloader.rb

@@ -58,7 +58,7 @@ module ActiveSupport
       prepare!
     end
 
-    def self.run! # :nodoc:
+    def self.run!(reset: false) # :nodoc:
       if check!
         super
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 6.0.4.4
+  version: 6.0.4.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -359,11 +359,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.4.4/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.4.4/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.4.6/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.4.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.4/activesupport
-post_install_message: 
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.6/activesupport
+post_install_message:
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -380,8 +380,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.