activesupport 4.2.6 → 4.2.7.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182d466f939e8441e48114c049a954ddc3795f83
-  data.tar.gz: dd969f16fd37128141e89893c927d63fc1248071
+  metadata.gz: 34314963e7f66f921d4059735ec65874f4647730
+  data.tar.gz: c5558821b13b6f6e49f25c6db4a37555f7ea2d9d
 SHA512:
-  metadata.gz: 8c35bc97c010ec0758da46b173ccf793aac085f4e44fd149843be47279debf087475983d7247fe873839a6cd716d48874bee0cc6ad4d9378da9a0302c455daf0
-  data.tar.gz: 38c3b1e81798671bd982341447c389ddb17e36c026ea619dc89946931b1913b0d0ee2414248283326cb1a53e702639a7f69984eafafe8c3250caa3741f59d3b5
+  metadata.gz: 76c1e89e71f4a1f60277c3c47a7474629db7442060d5464b2f1df0d677563410a843bbf07c2ae73efb6b64fbb7b85c5cc43d719e6e86b06fc7b5e61ab587c8ad
+  data.tar.gz: d60ee0b3fc3d8f58bf6c51a17f1f3697227b56be406c3d86a1ac2e4fe5d67e43103edfe5fc73195b74a1f28bf4bbd495a1bbba95332d0cd7fffad492c128a02d

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## Rails 4.2.7.rc1 (June 30, 2016) ##
+
+*   Fixed `ActiveSupport::Logger.broadcast` so that calls to `#silence` now
+    properly delegate to all loggers. Silencing now properly suppresses logging
+    to both the log and the console.
+
+    *Kevin McPhillips*
+
+*   Backported `ActiveSupport::LoggerThreadSafeLevel`. Assigning the
+    `Rails.logger.level` is now thread safe.
+
+    *Kevin McPhillips*
+
+*   Fixed a problem with ActiveSupport::SafeBuffer.titleize calling capitalize
+    on nil.
+
+    *Brian McManus*
+
+*   Time zones: Ensure that the UTC offset reflects DST changes that occurred
+    since the app started. Removes UTC offset caching, reducing performance,
+    but this is still relatively quick and isn't in any hot paths.
+
+    *Alexey Shein*
+
+*   Prevent `Marshal.load` from looping infinitely when trying to autoload a constant
+    which resolves to a different name.
+
+    *Olek Janiszewski*
+
+
 ## Rails 4.2.6 (March 07, 2016) ##
 
 *   No changes.

data/lib/active_support/core_ext/marshal.rb

@@ -5,10 +5,13 @@ module Marshal
     def load_with_autoloading(source)
       load_without_autoloading(source)
     rescue ArgumentError, NameError => exc
-      if exc.message.match(%r|undefined class/module (.+)|)
+      if exc.message.match(%r|undefined class/module (.+?)(::)?\z|)
         # try loading the class/module
-        $1.constantize
-        # if it is a IO we need to go back to read the object
+        loaded = $1.constantize
+
+        raise unless $1 == loaded.name
+
+        # if it is an IO we need to go back to read the object
         source.rewind if source.respond_to?(:rewind)
         retry
       else

data/lib/active_support/gem_version.rb

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

data/lib/active_support/inflector/methods.rb

@@ -153,7 +153,7 @@ module ActiveSupport
     #   'TheManWithoutAPast'.titleize       # => "The Man Without A Past"
     #   'raiders_of_the_lost_ark'.titleize  # => "Raiders Of The Lost Ark"
     def titleize(word)
-      humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { $&.capitalize }
+      humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { |match| match.capitalize }
     end
 
     # Create the name of a table like Rails does for models to table names. This

data/lib/active_support/logger.rb

@@ -1,9 +1,11 @@
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/logger_silence'
+require 'active_support/logger_thread_safe_level'
 require 'logger'
 
 module ActiveSupport
   class Logger < ::Logger
+    include ActiveSupport::LoggerThreadSafeLevel
     include LoggerSilence
 
     # Broadcasts logs to multiple loggers.
@@ -38,6 +40,29 @@ module ActiveSupport
           logger.level = level
           super(level)
         end
+
+        define_method(:local_level=) do |level|
+          logger.local_level = level if logger.respond_to?(:local_level=)
+          super(level) if respond_to?(:local_level=)
+        end
+
+        define_method(:silence) do |level = Logger::ERROR, &block|
+          if logger.respond_to?(:silence) && logger.method(:silence).owner != ::Kernel
+            logger.silence(level) do
+              if respond_to?(:silence) && method(:silence).owner != ::Kernel
+                super(level, &block)
+              else
+                block.call(self)
+              end
+            end
+          else
+            if respond_to?(:silence) && method(:silence).owner != ::Kernel
+              super(level, &block)
+            else
+              block.call(self)
+            end
+          end
+        end
       end
     end
 

data/lib/active_support/logger_silence.rb

@@ -3,43 +3,25 @@ require 'thread_safe'
 
 module LoggerSilence
   extend ActiveSupport::Concern
-  
+
   included do
     cattr_accessor :silencer
-    attr_reader :local_levels
     self.silencer = true
   end
 
-
-  def after_initialize
-    @local_levels = ThreadSafe::Cache.new(:initial_capacity => 2)
-  end
-
-  def local_log_id
-    Thread.current.__id__
-  end
-
-  def level
-    local_levels[local_log_id] || super
-  end
-
   # Silences the logger for the duration of the block.
   def silence(temporary_level = Logger::ERROR)
     if silencer
       begin
-        old_local_level            = local_levels[local_log_id]
-        local_levels[local_log_id] = temporary_level
+        old_local_level            = local_level
+        self.local_level           = temporary_level
 
         yield self
       ensure
-        if old_local_level
-          local_levels[local_log_id] = old_local_level
-        else
-          local_levels.delete(local_log_id)
-        end
+        self.local_level = old_local_level
       end
     else
       yield self
     end
   end
-end
+end

data/lib/active_support/logger_thread_safe_level.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+require 'concurrent'
+
+module ActiveSupport
+  module LoggerThreadSafeLevel
+    extend ActiveSupport::Concern
+
+    def after_initialize
+      @local_levels = Concurrent::Map.new(:initial_capacity => 2)
+    end
+
+    def local_log_id
+      Thread.current.__id__
+    end
+
+    def local_level
+      @local_levels[local_log_id]
+    end
+
+    def local_level=(level)
+      if level
+        @local_levels[local_log_id] = level
+      else
+        @local_levels.delete(local_log_id)
+      end
+    end
+
+    def level
+      local_level || super
+    end
+  end
+end

data/lib/active_support/values/time_zone.rb

@@ -271,7 +271,6 @@ module ActiveSupport
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo || TimeZone.find_tzinfo(name)
-      @current_period = nil
     end
 
     # Returns the offset of this time zone from UTC in seconds.
@@ -279,8 +278,7 @@ module ActiveSupport
       if @utc_offset
         @utc_offset
       else
-        @current_period ||= tzinfo.current_period if tzinfo
-        @current_period.utc_offset if @current_period
+        tzinfo.current_period.utc_offset if tzinfo && tzinfo.current_period
       end
     end
 

data/lib/active_support/xml_mini/rexml.rb

@@ -20,11 +20,9 @@ module ActiveSupport
         data = StringIO.new(data || '')
       end
 
-      char = data.getc
-      if char.nil?
+      if data.eof?
         {}
       else
-        data.ungetc(char)
         silence_warnings { require 'rexml/document' } unless defined?(REXML::Document)
         doc = REXML::Document.new(data)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.7.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -266,6 +266,7 @@ files:
 - lib/active_support/log_subscriber/test_helper.rb
 - lib/active_support/logger.rb
 - lib/active_support/logger_silence.rb
+- lib/active_support/logger_thread_safe_level.rb
 - lib/active_support/message_encryptor.rb
 - lib/active_support/message_verifier.rb
 - lib/active_support/multibyte.rb
@@ -334,12 +335,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the