activesupport 6.1.4.4 → 6.1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec1e3cca9d61111ff604b7639f716d337c41fafa59d810e0e29af9274460bd4
-  data.tar.gz: 509ae88f48b93a55ded50a1fe567ee6516e63596c895c3d19e50e3862e235b0a
+  metadata.gz: af4b908f92c68b0ee6b303428d2aa509e9bf031d9d2e8d0c75c4f0bdcc7fc366
+  data.tar.gz: 453cd96c0546d5384809db032dc49ccd3d917fc52653e8e190ee8ec44140e64d
 SHA512:
-  metadata.gz: 262264f05e68b7d5d7faf62decb52a5aa7548e194ef490c245316bc4e911236d0bc50e46b66bda0a95c3e33a15976922f183dbb73630237a7d6f83bdcf07f0fe
-  data.tar.gz: b6f62d421506b1d29bb79ecde59e5de474a034f73cfd256cce30290873633e2bed6cb8f4fa0a19fe24c471f78896f4a3afa62f277fa21f23ba684afc9d7b4139
+  metadata.gz: 87ec46f4b0c16e172ef410729c2dbd5cdd2c68b629d71895839eef933ba7aac619d4b908ebc38d333121493fa30bb0671b81c100aa8cf9fc69db800efeb463b0
+  data.tar.gz: 9c3a62e1ccbc24009ad3c863784b40ead6b2e433b340fe6231dbdea4ac94fb13674513f13345adfbfbb3fe0304599821f0cd632c7052b0b3779d95d5fff2f507

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.1.4.6 (February 11, 2022) ##
+
+*   Fix Reloader method signature to work with the new Executor signature
+
+
+## Rails 6.1.4.5 (February 11, 2022) ##
+
+*   No changes.
+
+
 ## Rails 6.1.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 = 1
     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.1.4.4
+  version: 6.1.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
@@ -357,11 +357,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.4/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.4.4/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.4.6/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.4.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.4/activesupport
-post_install_message: 
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.4.6/activesupport
+post_install_message:
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -378,8 +378,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.