activesupport 7.0.2 → 7.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da227e95099973079d2282889ff40058c260d0366cef712e1d5190bd7ac4d38
-  data.tar.gz: 1f8b5198b25668a2baa1d77168e27b821c6afccaa6117cadc5c50dba1b852f2d
+  metadata.gz: 6e70dc41bc4e591f21025665c88110be5fb573df096ff18a32c8eb03537cd912
+  data.tar.gz: 44a03ceb522ac0a8bcaa495d885c67275eb900009273bd112b1002a713839e8c
 SHA512:
-  metadata.gz: 901dcaca03cc045ac9b284468f5a875d6db1aaa610f3aaaaf473199e766baae9bfccfd8372c6ce2ba6c496383338928ff584ad494b59dc901f530ceadd22df22
-  data.tar.gz: fe4f98525e6453eb9e8e858092e11458fb4f35cd0883dde01826ebb96cf0d926c1fae323ad16ba153bc19ca13e2dfbd658bec49f31af75a50768b9f0a4eb248b
+  metadata.gz: f3892232fa94ad774164911956d1dde53e1e3a14fa5d9cffcb7df472f0e1a410c3570edc6d16ce4e84842896cccce6fae31ec6215d0b5afb899e5829348eb804
+  data.tar.gz: 417107f4d3fa176ccaea68b6e7384a4ed06a622821a2d08f78fd8051b76c5df78ada4007e7f2f58a843718c5d16083ad8fe710cd0cf0440c4f622dacd8143e8f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 7.0.2.1 (February 11, 2022) ##
+
+*   No changes.
+
+
 ## Rails 7.0.2 (February 08, 2022) ##
 
 *   Fix `ActiveSupport::EncryptedConfiguration` to be compatible with Psych 4

data/lib/active_support/execution_wrapper.rb

@@ -64,18 +64,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 = IsolatedExecutionState.delete(active_key)
+        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
@@ -105,27 +108,20 @@ module ActiveSupport
       end
     end
 
-    class << self # :nodoc:
-      attr_accessor :active
-    end
-
     def self.error_reporter
       @error_reporter ||= ActiveSupport::ErrorReporter.new
     end
 
-    def self.inherited(other) # :nodoc:
-      super
-      other.active = Concurrent::Hash.new
+    def self.active_key # :nodoc:
+      @active_key ||= :"active_execution_wrapper_#{object_id}"
     end
 
-    self.active = Concurrent::Hash.new
-
     def self.active? # :nodoc:
-      @active[IsolatedExecutionState.unique_id]
+      IsolatedExecutionState.key?(active_key)
     end
 
     def run! # :nodoc:
-      self.class.active[IsolatedExecutionState.unique_id] = true
+      IsolatedExecutionState[self.class.active_key] = self
       run
     end
 
@@ -140,7 +136,7 @@ module ActiveSupport
     def complete!
       complete
     ensure
-      self.class.active.delete(IsolatedExecutionState.unique_id)
+      IsolatedExecutionState.delete(self.class.active_key)
     end
 
     def complete # :nodoc:

data/lib/active_support/gem_version.rb

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

data/lib/active_support/isolated_execution_state.rb

@@ -37,6 +37,14 @@ module ActiveSupport
         current[key] = value
       end
 
+      def key?(key)
+        state.key?(key)
+      end
+
+      def delete(key)
+        state.delete(key)
+      end
+
       def clear
         current.clear
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -359,12 +359,12 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.2/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.2/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.2.1/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.2.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.2/activesupport
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.2.1/activesupport
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -381,8 +381,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.