activesupport 6.0.3.7 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7574f990691aa44fe1514a080d4e87dc2fff6b280a0105226e60fe7410328d36
-  data.tar.gz: 17d7c63f6f1f2c148e32419eff2e19fa25452707e9f9d0a1c9191fb5550928de
+  metadata.gz: cb820262bad46b77be1e8cdc8a8cf1b587bea8259ca96f838e29f539cb7d5398
+  data.tar.gz: 4f0afdaa454b1e344118f965b7091520f99274c21dd0c6889ea5b7aa4f04a13d
 SHA512:
-  metadata.gz: 2256715fde45a0f3735f9c568d77ea4afdf9ab23945841ed77c6504ac5006df668020a40bd9ebda78332a8d1ae52f8202d043c5ee478546abc9e7e30b898108b
-  data.tar.gz: 489c865c8babce0410f367951d41aa93f10b8262c4769ecfc47e5a43c11320ce0df97f48e218bc1ef3dcbbf08afd747f3852cc5a8227222552e97ff25449d860
+  metadata.gz: 6126d9b0f4eda07d968f012618c46b867d57dae8fa9132201ce357715858238f04bb443c3f78b5cf8ae819e4e0a2f4485a6d6b6f098130130263c8838c47f79e
+  data.tar.gz: 2d8cf9e0702dbf20abef42494671000ee95bd7e393c4bad0f5cdfe26a9bfa6fbb3a2ebea3961f77460abf10e279eb5bd0bff91d34193d8cf986d2dbfe7ab4af7

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Rails 6.0.4 (June 15, 2021) ##
+
+*   Fixed issue in `ActiveSupport::Cache::RedisCacheStore` not passing options
+    to `read_multi` causing `fetch_multi` to not work properly.
+
+    *Rajesh Sharma*
+
+*   `with_options` copies its options hash again to avoid leaking mutations.
+
+    Fixes #39343.
+
+    *Eugene Kenny*
+
+
 ## Rails 6.0.3.7 (May 05, 2021) ##
 
 *   No changes.
@@ -34,6 +48,7 @@
 
 *   [CVE-2020-8165] Avoid Marshal.load on raw cache value in MemCacheStore
 
+
 ## Rails 6.0.3 (May 06, 2020) ##
 
 *   `Array#to_sentence` no longer returns a frozen string.
@@ -199,6 +214,12 @@
 
 ## Rails 6.0.0.rc1 (April 24, 2019) ##
 
+*   Speed improvements to `Hash.except` and `HashWithIndifferentAccess#except`.
+
+    These methods now unset the `default`/`default_proc` on the returned Hash, compatible with Ruby 3.0’s native implementation.
+
+    *Timo Schilling*
+
 *   Introduce `ActiveSupport::ActionableError`.
 
     Actionable errors let's you dispatch actions from Rails' error pages. This

data/README.rdoc

@@ -15,7 +15,7 @@ The latest version of Active Support can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activesupport
+* https://github.com/rails/rails/tree/main/activesupport
 
 
 == License

data/lib/active_support/cache.rb

@@ -312,7 +312,7 @@ module ActiveSupport
       #     :bar
       #   end
       #   cache.fetch('foo') # => "bar"
-      def fetch(name, options = nil)
+      def fetch(name, options = nil, &block)
         if block_given?
           options = merged_options(options)
           key = normalize_key(name, options)
@@ -327,9 +327,9 @@ module ActiveSupport
           end
 
           if entry
-            get_entry_value(entry, name, **options)
+            get_entry_value(entry, name, options)
           else
-            save_block_result_to_cache(name, **options) { |_name| yield _name }
+            save_block_result_to_cache(name, options, &block)
           end
         elsif options && options[:force]
           raise ArgumentError, "Missing block: Calling `Cache#fetch` with `force: true` requires a block."
@@ -448,7 +448,7 @@ module ActiveSupport
           payload[:hits] = reads.keys
           payload[:super_operation] = :fetch_multi
 
-          write_multi(writes, **options)
+          write_multi(writes, options)
 
           ordered
         end
@@ -712,7 +712,7 @@ module ActiveSupport
           entry.value
         end
 
-        def save_block_result_to_cache(name, **options)
+        def save_block_result_to_cache(name, options)
           result = instrument(:generate, name, options) do
             yield(name)
           end

data/lib/active_support/cache/file_store.rb

@@ -16,7 +16,7 @@ module ActiveSupport
       attr_reader :cache_path
 
       DIR_FORMATTER = "%03X"
-      FILENAME_MAX_SIZE = 228 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
+      FILENAME_MAX_SIZE = 226 # max filename size on file system is 255, minus room for timestamp, pid, and random characters appended by Tempfile (used by atomic write)
       FILEPATH_MAX_SIZE = 900 # max is 1024, plus some room
       GITKEEP_FILES = [".gitkeep", ".keep"].freeze
 
@@ -74,7 +74,8 @@ module ActiveSupport
       private
         def read_entry(key, **options)
           if File.exist?(key)
-            File.open(key) { |f| Marshal.load(f) }
+            entry = File.open(key) { |f| Marshal.load(f) }
+            entry if entry.is_a?(Cache::Entry)
           end
         rescue => e
           logger.error("FileStoreError (#{e}): #{e.message}") if logger

data/lib/active_support/cache/mem_cache_store.rb

@@ -7,6 +7,7 @@ rescue LoadError => e
   raise e
 end
 
+require "active_support/core_ext/marshal"
 require "active_support/core_ext/array/extract_options"
 
 module ActiveSupport

data/lib/active_support/cache/redis_cache_store.rb

@@ -347,7 +347,7 @@ module ActiveSupport
 
         def read_multi_entries(names, **options)
           if mget_capable?
-            read_multi_mget(*names)
+            read_multi_mget(*names, **options)
           else
             super
           end
@@ -394,7 +394,7 @@ module ActiveSupport
               modifiers[:nx] = unless_exist
               modifiers[:px] = (1000 * expires_in.to_f).ceil if expires_in
 
-              redis.with { |c| c.set key, serialized_entry, modifiers }
+              redis.with { |c| c.set key, serialized_entry, **modifiers }
             else
               redis.with { |c| c.set key, serialized_entry }
             end

data/lib/active_support/cache/strategy/local_cache.rb

@@ -160,7 +160,7 @@ module ActiveSupport
             cache = local_cache
             cache.mute do
               if value
-                cache.write(name, value, **options)
+                cache.write(name, value, options)
               else
                 cache.delete(name, **options)
               end

data/lib/active_support/core_ext/hash/except.rb

@@ -11,7 +11,7 @@ class Hash
   #   @person.update(params[:person].except(:admin))
   def except(*keys)
     slice(*self.keys - keys)
-  end
+  end unless method_defined?(:except)
 
   # Removes the given keys from hash and returns it.
   #   hash = { a: true, b: false, c: nil }

data/lib/active_support/core_ext/object/json.rb

@@ -45,7 +45,7 @@ module ActiveSupport
   end
 end
 
-[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass, Enumerable].reverse_each do |klass|
+[Enumerable, Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].reverse_each do |klass|
   klass.prepend(ActiveSupport::ToJsonWithActiveSupportEncoder)
 end
 

data/lib/active_support/core_ext/string/output_safety.rb

@@ -135,7 +135,7 @@ module ActiveSupport #:nodoc:
   class SafeBuffer < String
     UNSAFE_STRING_METHODS = %w(
       capitalize chomp chop delete delete_prefix delete_suffix
-      downcase lstrip next reverse rstrip slice squeeze strip
+      downcase lstrip next reverse rstrip scrub slice squeeze strip
       succ swapcase tr tr_s unicode_normalize upcase
     )
 
@@ -153,12 +153,12 @@ module ActiveSupport #:nodoc:
 
     def [](*args)
       if html_safe?
-        new_safe_buffer = super
+        new_string = super
 
-        if new_safe_buffer
-          new_safe_buffer.instance_variable_set :@html_safe, true
-        end
+        return unless new_string
 
+        new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string)
+        new_safe_buffer.instance_variable_set :@html_safe, true
         new_safe_buffer
       else
         to_str[*args]
@@ -214,7 +214,8 @@ module ActiveSupport #:nodoc:
     end
 
     def *(*)
-      new_safe_buffer = super
+      new_string = super
+      new_safe_buffer = new_string.is_a?(SafeBuffer) ? new_string : SafeBuffer.new(new_string)
       new_safe_buffer.instance_variable_set(:@html_safe, @html_safe)
       new_safe_buffer
     end

data/lib/active_support/core_ext/time/calculations.rb

@@ -47,7 +47,9 @@ class Time
       # Time.at can be called with a time or numerical value
       time_or_number = args.first
 
-      if time_or_number.is_a?(ActiveSupport::TimeWithZone) || time_or_number.is_a?(DateTime)
+      if time_or_number.is_a?(ActiveSupport::TimeWithZone)
+        at_without_coercion(time_or_number.to_r).getlocal
+      elsif time_or_number.is_a?(DateTime)
         at_without_coercion(time_or_number.to_f).getlocal
       else
         at_without_coercion(time_or_number)

data/lib/active_support/dependencies.rb

@@ -367,7 +367,12 @@ module ActiveSupport #:nodoc:
       require_or_load(path || file_name)
     rescue LoadError => load_error
       if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
-        load_error.message.replace(message % file_name)
+        load_error_message = if load_error.respond_to?(:original_message)
+          load_error.original_message
+        else
+          load_error.message
+        end
+        load_error_message.replace(message % file_name)
         load_error.copy_blame!(load_error)
       end
       raise

data/lib/active_support/deprecation/proxy_wrappers.rb

@@ -147,7 +147,7 @@ module ActiveSupport
 
       # Don't give a deprecation warning on methods that IRB may invoke
       # during tab-completion.
-      delegate :hash, :instance_methods, :name, to: :target
+      delegate :hash, :instance_methods, :name, :respond_to?, to: :target
 
       # Returns the class of the new constant.
       #

data/lib/active_support/gem_version.rb

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

data/lib/active_support/messages/metadata.rb

@@ -7,7 +7,7 @@ module ActiveSupport
     class Metadata #:nodoc:
       def initialize(message, expires_at = nil, purpose = nil)
         @message, @purpose = message, purpose
-        @expires_at = expires_at.is_a?(String) ? Time.iso8601(expires_at) : expires_at
+        @expires_at = expires_at.is_a?(String) ? parse_expires_at(expires_at) : expires_at
       end
 
       def as_json(options = {})
@@ -67,6 +67,14 @@ module ActiveSupport
         def fresh?
           @expires_at.nil? || Time.now.utc < @expires_at
         end
+
+        def parse_expires_at(expires_at)
+          if ActiveSupport.use_standard_json_time_format
+            Time.iso8601(expires_at)
+          else
+            Time.parse(expires_at)
+          end
+        end
     end
   end
 end

data/lib/active_support/number_helper/number_to_currency_converter.rb

@@ -9,15 +9,11 @@ module ActiveSupport
 
       def convert
         number = self.number.to_s.strip
-        number_f = number.to_f
         format = options[:format]
 
-        if number_f.negative?
-          number = number_f.abs
-
-          unless options[:precision] == 0 && number < 0.5
-            format = options[:negative_format]
-          end
+        if number.sub!(/^-/, "") &&
+           (options[:precision] != 0 || number.to_f > 0.5)
+          format = options[:negative_format]
         end
 
         rounded_number = NumberToRoundedConverter.convert(number, options)

data/lib/active_support/number_helper/rounding_helper.rb

@@ -26,7 +26,7 @@ module ActiveSupport
 
       private
         def round_without_significant(number)
-          number = number.round(precision)
+          number = number.round(precision, BigDecimal.mode(BigDecimal::ROUND_MODE))
           number = number.to_i if precision == 0 && number.finite?
           number = number.abs if number.zero? # prevent showing negative zeros
           number

data/lib/active_support/option_merger.rb

@@ -37,7 +37,7 @@ module ActiveSupport
         end
       else
         def invoke_method(method, arguments, options, &block)
-          arguments << options if options
+          arguments << options.dup if options
           @context.__send__(method, *arguments, &block)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 6.0.3.7
+  version: 6.0.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-06-15 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.3.7/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.3.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.4/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.7/activesupport
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.4/activesupport
+post_install_message: 
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -381,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.