activesupport 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2482214e6ed5596644339c223e54fb32b612a161db854a017fa9e9de6e3448e
-  data.tar.gz: e205e4f8ee74882050bfa87fc0bbde027d4f24b3997541df6417d5419eba089a
+  metadata.gz: 1812312a643d64b718b7d411199d13a71949348238c9b5b31b6bf537cdffd472
+  data.tar.gz: c3caffc29248cb9137d707e6db92083d1669897a2d323c41735420f259fce54d
 SHA512:
-  metadata.gz: 73b2e83843fd7985dbfd90b83ca3a8dcb0659fd90cad2c4724be7cdd63c69e3e064b88c7c4fe8854382bfa643b642eea24f39bf9a4f3fc99ef8104b4bd07a162
-  data.tar.gz: fb39350e16ea2c9619a83419452e6e0450f59b4cd7fc21e0d171b38274b87d07bd6bae0390d02440f60ea3b11fbe6a6e23da8424eb50edb34629c21828ef9947
+  metadata.gz: eec80019150e86c22e14aa189f2976394e650d20a6ab60186aff930ec07453ea17301065e459781169bd1681dc29e337186c39af2fb0aea4eb70c966c8efd56b
+  data.tar.gz: 5601cb1a255c5021276817cf534279ff90ca971c25065105c070b226742d12fc64b4bd119ee9ccc198c68aa9abe9e1e9df7c33bad7ff4dc647809796514097c7

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## Rails 5.2.0.rc2 (March 20, 2018) ##
+
+*   Caching: MemCache and Redis `read_multi` and `fetch_multi` speedup.
+    Read from the local in-memory cache before consulting the backend.
+
+    *Gabriel Sobrinho*
+
+*   Return all mappings for a timezone identifier in `country_zones`.
+
+    Some timezones like `Europe/London` have multiple mappings in
+    `ActiveSupport::TimeZone::MAPPING` so return all of them instead
+    of the first one found by using `Hash#value`. e.g:
+
+        # Before
+        ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh"]
+
+        # After
+        ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh", "London"]
+
+    Fixes #31668.
+
+    *Andrew White*
+
+
 ## Rails 5.2.0.rc1 (January 30, 2018) ##
 
 *   Add support for connection pooling on RedisCacheStore.
@@ -63,7 +87,7 @@
 
     *Takumasa Ochi*
 
-*   Handle `TZInfo::AmbiguousTime` errors
+*   Handle `TZInfo::AmbiguousTime` errors.
 
     Make `ActiveSupport::TimeWithZone` match Ruby's handling of ambiguous
     times by choosing the later period, e.g.
@@ -142,7 +166,7 @@
 
     *Jeremy Daer*
 
-*   Allow `Range#include?` on TWZ ranges
+*   Allow `Range#include?` on TWZ ranges.
 
     In #11474 we prevented TWZ ranges being iterated over which matched
     Ruby's handling of Time ranges and as a consequence `include?`
@@ -155,7 +179,7 @@
 
     *Andrew White*
 
-*   Fix acronym support in `humanize`
+*   Fix acronym support in `humanize`.
 
     Acronym inflections are stored with lowercase keys in the hash but
     the match wasn't being lowercased before being looked up in the hash.
@@ -283,7 +307,7 @@
 
     *Yuji Yaginuma*
 
-*   Add key rotation support to `MessageEncryptor` and `MessageVerifier`
+*   Add key rotation support to `MessageEncryptor` and `MessageVerifier`.
 
     This change introduces a `rotate` method to both the `MessageEncryptor` and
     `MessageVerifier` classes. This method accepts the same arguments and
@@ -322,7 +346,7 @@
 
     *Anton Khamets*
 
-*   Update `String#camelize` to provide feedback when wrong option is passed
+*   Update `String#camelize` to provide feedback when wrong option is passed.
 
     `String#camelize` was returning nil without any feedback when an
     invalid option was passed as a parameter.
@@ -339,7 +363,7 @@
 
     *Ricardo Díaz*
 
-*   Fix modulo operations involving durations
+*   Fix modulo operations involving durations.
 
     Rails 5.1 introduced `ActiveSupport::Duration::Scalar` as a wrapper
     around numeric values as a way of ensuring a duration was the outcome of
@@ -361,7 +385,7 @@
 
     *Sayan Chakraborty*, *Andrew White*
 
-*   Fix division where a duration is the denominator
+*   Fix division where a duration is the denominator.
 
     PR #29163 introduced a change in behavior when a duration was the denominator
     in a calculation - this was incorrect as dividing by a duration should always
@@ -371,7 +395,7 @@
 
     *Andrew White*
 
-*   Add purpose and expiry support to `ActiveSupport::MessageVerifier` &
+*   Add purpose and expiry support to `ActiveSupport::MessageVerifier` and
    `ActiveSupport::MessageEncryptor`.
 
     For instance, to ensure a message is only usable for one intended purpose:
@@ -408,7 +432,7 @@
 
     *Assain Jaleel*
 
-*   Cache: `write_multi`
+*   Cache: `write_multi`.
 
         Rails.cache.write_multi foo: 'bar', baz: 'qux'
 
@@ -457,7 +481,7 @@
 
     *DHH*
 
-*   Fix implicit coercion calculations with scalars and durations
+*   Fix implicit coercion calculations with scalars and durations.
 
     Previously, calculations where the scalar is first would be converted to a duration
     of seconds, but this causes issues with dates being converted to times, e.g:
@@ -489,17 +513,17 @@
 
     *Willem van Bergen*
 
-*   Add support for `:offset` and `:zone` to `ActiveSupport::TimeWithZone#change`
+*   Add support for `:offset` and `:zone` to `ActiveSupport::TimeWithZone#change`.
 
     *Andrew White*
 
-*   Add support for `:offset` to `Time#change`
+*   Add support for `:offset` to `Time#change`.
 
     Fixes #28723.
 
     *Andrew White*
 
-*   Add `fetch_values` for `HashWithIndifferentAccess`
+*   Add `fetch_values` for `HashWithIndifferentAccess`.
 
     The method was originally added to `Hash` in Ruby 2.3.0.
 

data/README.rdoc

@@ -14,7 +14,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/5-2-stable/activesupport
 
 
 == License

data/lib/active_support/cache.rb

@@ -164,8 +164,8 @@ module ActiveSupport
         private
           def retrieve_pool_options(options)
             {}.tap do |pool_options|
-              pool_options[:size] = options[:pool_size] if options[:pool_size]
-              pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
+              pool_options[:size] = options.delete(:pool_size) if options[:pool_size]
+              pool_options[:timeout] = options.delete(:pool_timeout) if options[:pool_timeout]
             end
           end
 
@@ -714,11 +714,9 @@ module ActiveSupport
       # Creates a new cache entry for the specified value. Options supported are
       # +:compress+, +:compress_threshold+, and +:expires_in+.
       def initialize(value, options = {})
-        if should_compress?(value, options)
-          @value = compress(value)
-          @compressed = true
-        else
-          @value = value
+        @value = value
+        if should_compress?(options)
+          compress!
         end
 
         @version    = options[:version]
@@ -783,28 +781,31 @@ module ActiveSupport
       end
 
       private
-        def should_compress?(value, options)
-          if value && options.fetch(:compress, true)
+        def should_compress?(options)
+          if @value && options.fetch(:compress, true)
             compress_threshold = options.fetch(:compress_threshold, DEFAULT_COMPRESS_LIMIT)
-            serialized_value_size = (value.is_a?(String) ? value : Marshal.dump(value)).bytesize
+            serialized_value_size = (@value.is_a?(String) ? @value : marshaled_value).bytesize
 
-            return true if serialized_value_size >= compress_threshold
+            serialized_value_size >= compress_threshold
           end
-
-          false
         end
 
         def compressed?
           defined?(@compressed) ? @compressed : false
         end
 
-        def compress(value)
-          Zlib::Deflate.deflate(Marshal.dump(value))
+        def compress!
+          @value = Zlib::Deflate.deflate(marshaled_value)
+          @compressed = true
         end
 
         def uncompress(value)
           Marshal.load(Zlib::Inflate.inflate(value))
         end
+
+        def marshaled_value
+          @marshaled_value ||= Marshal.dump(@value)
+        end
     end
   end
 end

data/lib/active_support/cache/redis_cache_store.rb

@@ -17,6 +17,7 @@ end
 
 require "digest/sha2"
 require "active_support/core_ext/marshal"
+require "active_support/core_ext/hash/transform_values"
 
 module ActiveSupport
   module Cache
@@ -27,23 +28,7 @@ module ActiveSupport
     end
 
     ::Redis.include(ConnectionPoolLike)
-
-    class RedisDistributedWithConnectionPool < ::Redis::Distributed
-      def add_node(options)
-        pool_options = {}
-        pool_options[:size] = options[:pool_size] if options[:pool_size]
-        pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
-
-        if pool_options.empty?
-          super
-        else
-          options = { url: options } if options.is_a?(String)
-          options = @default_options.merge(options)
-          pool = ConnectionPool.new(pool_options) { ::Redis.new(options) }
-          @ring.add_node(pool)
-        end
-      end
-    end
+    ::Redis::Distributed.include(ConnectionPoolLike)
 
     # Redis cache store.
     #
@@ -94,7 +79,7 @@ module ActiveSupport
 
           def write_entry(key, entry, options)
             if options[:raw] && local_cache
-              raw_entry = Entry.new(entry.value.to_s)
+              raw_entry = Entry.new(serialize_entry(entry, raw: true))
               raw_entry.expires_at = entry.expires_at
               super(key, raw_entry, options)
             else
@@ -105,7 +90,7 @@ module ActiveSupport
           def write_multi_entries(entries, options)
             if options[:raw] && local_cache
               raw_entries = entries.map do |key, entry|
-                raw_entry = Entry.new(entry.value.to_s)
+                raw_entry = Entry.new(serialize_entry(entry, raw: true))
                 raw_entry.expires_at = entry.expires_at
               end.to_h
 
@@ -134,7 +119,7 @@ module ActiveSupport
         def build_redis(redis: nil, url: nil, **redis_options) #:nodoc:
           urls = Array(url)
 
-          if redis.respond_to?(:call)
+          if redis.is_a?(Proc)
             redis.call
           elsif redis
             redis
@@ -147,7 +132,7 @@ module ActiveSupport
 
         private
           def build_redis_distributed_client(urls:, **redis_options)
-            RedisDistributedWithConnectionPool.new([], DEFAULT_REDIS_OPTIONS.merge(redis_options)).tap do |dist|
+            ::Redis::Distributed.new([], DEFAULT_REDIS_OPTIONS.merge(redis_options)).tap do |dist|
               urls.each { |u| dist.add_node url: u }
             end
           end
@@ -174,7 +159,7 @@ module ActiveSupport
       #
       # Compression is enabled by default with a 1kB threshold, so cached
       # values larger than 1kB are automatically compressed. Disable by
-      # passing <tt>cache: false</tt> or change the threshold by passing
+      # passing <tt>compress: false</tt> or change the threshold by passing
       # <tt>compress_threshold: 4.kilobytes</tt>.
       #
       # No expiry is set on cache entries by default. Redis is expected to
@@ -197,7 +182,16 @@ module ActiveSupport
       end
 
       def redis
-        @redis ||= wrap_in_connection_pool(self.class.build_redis(**redis_options))
+        @redis ||= begin
+          pool_options = self.class.send(:retrieve_pool_options, redis_options)
+
+          if pool_options.any?
+            self.class.send(:ensure_connection_pool_added!)
+            ::ConnectionPool.new(pool_options) { self.class.build_redis(**redis_options) }
+          else
+            self.class.build_redis(**redis_options)
+          end
+        end
       end
 
       def inspect
@@ -211,7 +205,11 @@ module ActiveSupport
       # fetched values.
       def read_multi(*names)
         if mget_capable?
-          read_multi_mget(*names)
+          instrument(:read_multi, names, options) do |payload|
+            read_multi_mget(*names).tap do |results|
+              payload[:hits] = results.keys
+            end
+          end
         else
           super
         end
@@ -308,21 +306,6 @@ module ActiveSupport
       end
 
       private
-        def wrap_in_connection_pool(redis_connection)
-          if redis_connection.is_a?(::Redis)
-            pool_options = self.class.send(:retrieve_pool_options, redis_options)
-
-            if pool_options.empty?
-              redis_connection
-            else
-              self.class.send(:ensure_connection_pool_added!)
-              ConnectionPool.new(pool_options) { redis_connection }
-            end
-          else
-            redis_connection
-          end
-        end
-
         def set_redis_capabilities
           case redis
           when Redis::Distributed
@@ -342,6 +325,14 @@ module ActiveSupport
           end
         end
 
+        def read_multi_entries(names, _options)
+          if mget_capable?
+            read_multi_mget(*names)
+          else
+            super
+          end
+        end
+
         def read_multi_mget(*names)
           options = names.extract_options!
           options = merged_options(options)
@@ -366,7 +357,7 @@ module ActiveSupport
         #
         # Requires Redis 2.6.12+ for extended SET options.
         def write_entry(key, entry, unless_exist: false, raw: false, expires_in: nil, race_condition_ttl: nil, **options)
-          value = raw ? entry.value.to_s : serialize_entry(entry)
+          serialized_entry = serialize_entry(entry, raw: raw)
 
           # If race condition TTL is in use, ensure that cache entries
           # stick around a bit longer after they would have expired
@@ -381,9 +372,9 @@ module ActiveSupport
               modifiers[:nx] = unless_exist
               modifiers[:px] = (1000 * expires_in.to_f).ceil if expires_in
 
-              redis.with { |c| c.set key, value, modifiers }
+              redis.with { |c| c.set key, serialized_entry, modifiers }
             else
-              redis.with { |c| c.set key, value }
+              redis.with { |c| c.set key, serialized_entry }
             end
           end
         end
@@ -400,7 +391,7 @@ module ActiveSupport
           if entries.any?
             if mset_capable? && expires_in.nil?
               failsafe :write_multi_entries do
-                redis.with { |c| c.mapped_mset(entries) }
+                redis.with { |c| c.mapped_mset(serialize_entries(entries, raw: options[:raw])) }
               end
             else
               super
@@ -423,15 +414,25 @@ module ActiveSupport
           end
         end
 
-        def deserialize_entry(raw_value)
-          if raw_value
-            entry = Marshal.load(raw_value) rescue raw_value
+        def deserialize_entry(serialized_entry)
+          if serialized_entry
+            entry = Marshal.load(serialized_entry) rescue serialized_entry
             entry.is_a?(Entry) ? entry : Entry.new(entry)
           end
         end
 
-        def serialize_entry(entry)
-          Marshal.dump(entry)
+        def serialize_entry(entry, raw: false)
+          if raw
+            entry.value.to_s
+          else
+            Marshal.dump(entry)
+          end
+        end
+
+        def serialize_entries(entries, raw: false)
+          entries.transform_values do |entry|
+            serialize_entry entry, raw: raw
+          end
         end
 
         def failsafe(method, returning: nil)

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

@@ -54,6 +54,10 @@ module ActiveSupport
             @data[key]
           end
 
+          def read_multi_entries(keys, options)
+            Hash[keys.map { |name| [name, read_entry(name, options)] }.keep_if { |_name, value| value }]
+          end
+
           def write_entry(key, value, options)
             @data[key] = value
             true
@@ -116,6 +120,19 @@ module ActiveSupport
             end
           end
 
+          def read_multi_entries(keys, options)
+            return super unless local_cache
+
+            local_entries = local_cache.read_multi_entries(keys, options)
+            missed_keys = keys - local_entries.keys
+
+            if missed_keys.any?
+              local_entries.merge!(super(missed_keys, options))
+            else
+              local_entries
+            end
+          end
+
           def write_entry(key, entry, options)
             if options[:unless_exist]
               local_cache.delete_entry(key, options) if local_cache

data/lib/active_support/callbacks.rb

@@ -749,8 +749,8 @@ module ActiveSupport
         # * <tt>:skip_after_callbacks_if_terminated</tt> - Determines if after
         #   callbacks should be terminated by the <tt>:terminator</tt> option. By
         #   default after callbacks are executed no matter if callback chain was
-        #   terminated or not. This option makes sense only when <tt>:terminator</tt>
-        #   option is specified.
+        #   terminated or not. This option has no effect if <tt>:terminator</tt>
+        #   option is set to +nil+.
         #
         # * <tt>:scope</tt> - Indicates which methods should be executed when an
         #   object is used as a callback.

data/lib/active_support/deprecation/behaviors.rb

@@ -85,7 +85,7 @@ module ActiveSupport
       #   ActiveSupport::Deprecation.behavior = :stderr
       #   ActiveSupport::Deprecation.behavior = [:stderr, :log]
       #   ActiveSupport::Deprecation.behavior = MyCustomHandler
-      #   ActiveSupport::Deprecation.behavior = ->(message, callstack) {
+      #   ActiveSupport::Deprecation.behavior = ->(message, callstack, deprecation_horizon, gem_name) {
       #     # custom stuff
       #   }
       def behavior=(behavior)

data/lib/active_support/duration.rb

@@ -383,6 +383,14 @@ module ActiveSupport
       to_i
     end
 
+    def init_with(coder) #:nodoc:
+      initialize(coder["value"], coder["parts"])
+    end
+
+    def encode_with(coder) #:nodoc:
+      coder.map = { "value" => @value, "parts" => @parts }
+    end
+
     # Build ISO 8601 Duration string for this duration.
     # The +precision+ parameter can be used to limit seconds' precision of duration.
     def iso8601(precision: nil)

data/lib/active_support/gem_version.rb

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

data/lib/active_support/hash_with_indifferent_access.rb

@@ -311,6 +311,14 @@ module ActiveSupport
       dup.tap { |hash| hash.transform_keys!(*args, &block) }
     end
 
+    def transform_keys!
+      return enum_for(:transform_keys!) { size } unless block_given?
+      keys.each do |key|
+        self[yield(key)] = delete(key)
+      end
+      self
+    end
+
     def slice(*keys)
       keys.map! { |key| convert_key(key) }
       self.class.new(super)

data/lib/active_support/values/time_zone.rb

@@ -268,11 +268,14 @@ module ActiveSupport
           country = TZInfo::Country.get(code)
           country.zone_identifiers.map do |tz_id|
             if MAPPING.value?(tz_id)
-              self[MAPPING.key(tz_id)]
+              MAPPING.inject([]) do |memo, (key, value)|
+                memo << self[key] if value == tz_id
+                memo
+              end
             else
               create(tz_id, nil, TZInfo::Timezone.new(tz_id))
             end
-          end.sort!
+          end.flatten(1).sort!
         end
 
         def zones_map

data/lib/active_support/xml_mini.rb

@@ -83,7 +83,7 @@ module ActiveSupport
         end,
         "boolean"      => Proc.new { |boolean| %w(1 true).include?(boolean.to_s.strip) },
         "string"       => Proc.new { |string|  string.to_s },
-        "yaml"         => Proc.new { |yaml|    YAML::load(yaml) rescue yaml },
+        "yaml"         => Proc.new { |yaml|    YAML.load(yaml) rescue yaml },
         "base64Binary" => Proc.new { |bin|     ::Base64.decode64(bin) },
         "binary"       => Proc.new { |bin, entity| _parse_binary(bin, entity) },
         "file"         => Proc.new { |file, entity| _parse_file(file, entity) }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -325,8 +331,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc1/activesupport
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc1/activesupport/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.rc2/activesupport
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.rc2/activesupport/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--encoding"
@@ -345,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the