activesupport 5.0.0.beta1.1 → 5.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024273a23d7e6cc96b22a85a01b06381086fc6e4
-  data.tar.gz: 37c109760b68500ed51cdef73f9f2c4133a724ca
+  metadata.gz: feeceb08e3de4f23beb469414fac32aa949de4ca
+  data.tar.gz: ed224db38f3a6524c78cd4833484eb93d4a4cc4f
 SHA512:
-  metadata.gz: 1780db97c7a6fb5717de6f6de150f554029e8c0b98d7edd7713e104b0653202dff412762234c9a5417aec82fa8c38732ef4ef94309148655b6691d12dd284d76
-  data.tar.gz: 1b9086c031e6092441900dc315d93292159cfb7a6f3aafb8201363ca4b75fddcbd184fd1550fda107f8159830ad321374e221e6d6627421d2e0e47c2940c3057
+  metadata.gz: 2714c0f5258a1d8678f750cf4ec835f033db1a999652e439f958b5077d1b10bbec05323366393b2b7db06bcc049f01a4111e2a7aa8a82f7dd236523254bb586d
+  data.tar.gz: 5dca3370c49f9d30af666064201f536cec39a49c2864fb3ccbaf56a1ab9c42fe0de7e6baca81b669873ed41471367a83271d338ccb8ace0f29aae812a051a4b4

data/CHANGELOG.md

@@ -1,7 +1,41 @@
-## Rails 5.0.0.beta1 (December 18, 2015) ##
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+*   Change number_to_currency behavior for checking negativity.
+
+    Used `to_f.negative` instead of using `to_f.phase` for checking negativity
+    of a number in number_to_currency helper.
+    This change works same for all cases except when number is "-0.0".
+
+        -0.0.to_f.negative? => false
+        -0.0.to_f.phase? => 3.14
+
+    This change reverts changes from https://github.com/rails/rails/pull/6512.
+    But it should be acceptable as we could not find any currency which
+    supports negative zeros.
+
+    *Prathamesh Sonpatki*, *Rafael Mendonça França*
+
+*   Match `HashWithIndifferentAccess#default`'s behaviour with `Hash#default`.
+
+    *David Cornu*
+
+*   Adds `:exception_object` key to `ActiveSupport::Notifications::Instrumenter`
+    payload when an exception is raised.
+
+    Adds new key/value pair to payload when an exception is raised:
+    e.g. `:exception_object => #<RuntimeError: FAIL>`.
+
+    *Ryan T. Hosford*
+
+*   Support extended grapheme clusters and UAX 29.
+
+    *Adam Roben*
+
+*   Add petabyte and exabyte numeric conversion.
 
-*   No changes.
+    *Akshay Vishnoi*
 
+## Rails 5.0.0.beta1 (December 18, 2015) ##
 
 *   Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread.
     This makes it easy to declare per-thread globals that are encapsulated. Note: This is a sharp edge. A wild proliferation
@@ -10,44 +44,44 @@
     Here's an example of a simple event tracking system where the object being tracked needs not pass a creator that it
     doesn't need itself along:
 
-    module Current
-      thread_mattr_accessor :account
-      thread_mattr_accessor :user
-      
-      def self.reset() self.account = self.user = nil end
-    end
-
-    class ApplicationController < ActiveController::Base
-      before_action :set_current
-      after_action { Current.reset }
-    
-      private
-        def set_current
-          Current.account = Account.find(params[:account_id])
-          Current.user    = Current.account.users.find(params[:user_id])
+        module Current
+          thread_mattr_accessor :account
+          thread_mattr_accessor :user
+
+          def self.reset() self.account = self.user = nil end
         end
-    end
 
-    class MessagesController < ApplicationController
-      def create
-        @message = Message.create!(message_params)
-      end
-    end
-
-    class Message < ApplicationRecord
-      has_many :events
-      after_create :track_created
-    
-      private
-        def track_created
-          events.create! origin: self, action: :create
+        class ApplicationController < ActionController::Base
+          before_action :set_current
+          after_action { Current.reset }
+
+          private
+            def set_current
+              Current.account = Account.find(params[:account_id])
+              Current.user    = Current.account.users.find(params[:user_id])
+            end
+        end
+
+        class MessagesController < ApplicationController
+          def create
+            @message = Message.create!(message_params)
+          end
         end
-    end
 
-    class Event < ApplicationRecord
-      belongs_to :creator, class_name: 'User'
-      before_validation { self.creator ||= Current.user }
-    end
+        class Message < ApplicationRecord
+          has_many :events
+          after_create :track_created
+
+          private
+            def track_created
+              events.create! origin: self, action: :create
+            end
+        end
+
+        class Event < ApplicationRecord
+          belongs_to :creator, class_name: 'User'
+          before_validation { self.creator ||= Current.user }
+        end
 
     *DHH*
 
@@ -61,9 +95,9 @@
 
     *Yuichiro Kaneko*
 
-*   `ActiveSupport::Cache::Store#namespaced_key`, 
-    `ActiveSupport::Cache::MemCachedStore#escape_key`, and 
-    `ActiveSupport::Cache::FileStore#key_file_path` 
+*   `ActiveSupport::Cache::Store#namespaced_key`,
+    `ActiveSupport::Cache::MemCachedStore#escape_key`, and
+    `ActiveSupport::Cache::FileStore#key_file_path`
     are deprecated and replaced with `normalize_key` that now calls `super`.
 
     `ActiveSupport::Cache::LocaleCache#set_cache_value` is deprecated and replaced with `write_cache_value`.
@@ -122,7 +156,7 @@
 
     *Konstantinos Rousis*
 
-*   Handle invalid UTF-8 strings when HTML escaping
+*   Handle invalid UTF-8 strings when HTML escaping.
 
     Use `ActiveSupport::Multibyte::Unicode.tidy_bytes` to handle invalid UTF-8
     strings in `ERB::Util.unwrapped_html_escape` and `ERB::Util.html_escape_once`.
@@ -163,7 +197,7 @@
 
 *   Short-circuit `blank?` on date and time values since they are never blank.
 
-    Fixes #21657
+    Fixes #21657.
 
     *Andrew White*
 
@@ -201,7 +235,7 @@
 *   ActiveSupport::HashWithIndifferentAccess `select` and `reject` will now return
     enumerator if called without block.
 
-    Fixes #20095
+    Fixes #20095.
 
     *Bernard Potocki*
 
@@ -215,11 +249,11 @@
 
     *Simon Eskildsen*
 
-*   Fix setting `default_proc` on `HashWithIndifferentAccess#dup`
+*   Fix setting `default_proc` on `HashWithIndifferentAccess#dup`.
 
     *Simon Eskildsen*
 
-*   Fix a range of values for parameters of the Time#change
+*   Fix a range of values for parameters of the Time#change.
 
     *Nikolay Kondratyev*
 
@@ -231,7 +265,7 @@
     *Kevin Deisz*
 
 *   Add a bang version to `ActiveSupport::OrderedOptions` get methods which will raise
-    an `KeyError` if the value is `.blank?`
+    an `KeyError` if the value is `.blank?`.
 
     Before:
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2015 David Heinemeier Hansson
+Copyright (c) 2005-2016 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/active_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2015 David Heinemeier Hansson
+# Copyright (c) 2005-2016 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/active_support/cache.rb

@@ -255,10 +255,11 @@ module ActiveSupport
       #     end
       #   end
       #
-      #   # val_1 => "new value 1"
-      #   # val_2 => "original value"
-      #   # sleep 10 # First thread extend the life of cache by another 10 seconds
-      #   # cache.fetch('foo') => "new value 1"
+      #   cache.fetch('foo') # => "original value"
+      #   sleep 10 # First thread extended the life of cache by another 10 seconds
+      #   cache.fetch('foo') # => "new value 1"
+      #   val_1 # => "new value 1"
+      #   val_2 # => "original value"
       #
       # Other options will be handled by the specific cache store implementation.
       # Internally, #fetch calls #read_entry, and calls #write_entry on a cache
@@ -278,18 +279,18 @@ module ActiveSupport
           options = merged_options(options)
           key = normalize_key(name, options)
 
+          entry = nil
           instrument(:read, name, options) do |payload|
             cached_entry = read_entry(key, options) unless options[:force]
-            payload[:super_operation] = :fetch if payload
             entry = handle_expired_entry(cached_entry, key, options)
+            payload[:super_operation] = :fetch if payload
+            payload[:hit] = !!entry if payload
+          end
 
-            if entry
-              payload[:hit] = true if payload
-              get_entry_value(entry, name, options)
-            else
-              payload[:hit] = false if payload
-              save_block_result_to_cache(name, options) { |_name| yield _name }
-            end
+          if entry
+            get_entry_value(entry, name, options)
+          else
+            save_block_result_to_cache(name, options) { |_name| yield _name }
           end
         else
           read(name, options)

data/lib/active_support/cache/file_store.rb

@@ -17,6 +17,7 @@ module ActiveSupport
       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)
       FILEPATH_MAX_SIZE = 900 # max is 1024, plus some room
       EXCLUDED_DIRS = ['.', '..'].freeze
+      GITKEEP_FILES = ['.gitkeep', '.keep'].freeze
 
       def initialize(cache_path, options = nil)
         super(options)
@@ -24,10 +25,10 @@ module ActiveSupport
       end
 
       # Deletes all items from the cache. In this case it deletes all the entries in the specified
-      # file store directory except for .gitkeep. Be careful which directory is specified in your
+      # file store directory except for .keep or .gitkeep. Be careful which directory is specified in your
       # config file when using +FileStore+ because everything in that directory will be deleted.
       def clear(options = nil)
-        root_dirs = Dir.entries(cache_path).reject {|f| (EXCLUDED_DIRS + [".gitkeep"]).include?(f)}
+        root_dirs = exclude_from(cache_path, EXCLUDED_DIRS + GITKEEP_FILES)
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       rescue Errno::ENOENT
       end
@@ -154,7 +155,7 @@ module ActiveSupport
         # Delete empty directories in the cache.
         def delete_empty_directories(dir)
           return if File.realpath(dir) == File.realpath(cache_path)
-          if Dir.entries(dir).reject {|f| EXCLUDED_DIRS.include?(f)}.empty?
+          if exclude_from(dir, EXCLUDED_DIRS).empty?
             Dir.delete(dir) rescue nil
             delete_empty_directories(File.dirname(dir))
           end
@@ -193,6 +194,11 @@ module ActiveSupport
             end
           end
         end
+
+        # Exclude entries from source directory
+        def exclude_from(source, excludes)
+          Dir.entries(source).reject { |f| excludes.include?(f) }
+        end
     end
   end
 end

data/lib/active_support/concurrency/share_lock.rb

@@ -48,17 +48,11 @@ module ActiveSupport
       def start_exclusive(purpose: nil, compatible: [], no_wait: false)
         synchronize do
           unless @exclusive_thread == Thread.current
-            if busy?(purpose)
+            if busy_for_exclusive?(purpose)
               return false if no_wait
 
-              loose_shares = @sharing.delete(Thread.current)
-              @waiting[Thread.current] = compatible if loose_shares
-
-              begin
-                @cv.wait_while { busy?(purpose) }
-              ensure
-                @waiting.delete Thread.current
-                @sharing[Thread.current] = loose_shares if loose_shares
+              yield_shares(purpose, compatible) do
+                @cv.wait_while { busy_for_exclusive?(purpose) }
               end
             end
             @exclusive_thread = Thread.current
@@ -71,22 +65,26 @@ module ActiveSupport
 
       # Relinquish the exclusive lock. Must only be called by the thread
       # that called start_exclusive (and currently holds the lock).
-      def stop_exclusive
+      def stop_exclusive(compatible: [])
         synchronize do
           raise "invalid unlock" if @exclusive_thread != Thread.current
 
           @exclusive_depth -= 1
           if @exclusive_depth == 0
             @exclusive_thread = nil
-            @cv.broadcast
+
+            yield_shares(nil, compatible) do
+              @cv.broadcast
+              @cv.wait_while { @exclusive_thread || eligible_waiters?(compatible) }
+            end
           end
         end
       end
 
-      def start_sharing
+      def start_sharing(purpose: :share)
         synchronize do
-          if @exclusive_thread && @exclusive_thread != Thread.current
-            @cv.wait_while { @exclusive_thread }
+          if @sharing[Thread.current] == 0 && @exclusive_thread != Thread.current && busy_for_sharing?(purpose)
+            @cv.wait_while { busy_for_sharing?(purpose) }
           end
           @sharing[Thread.current] += 1
         end
@@ -109,12 +107,12 @@ module ActiveSupport
       # the block.
       #
       # See +start_exclusive+ for other options.
-      def exclusive(purpose: nil, compatible: [], no_wait: false)
+      def exclusive(purpose: nil, compatible: [], after_compatible: [], no_wait: false)
         if start_exclusive(purpose: purpose, compatible: compatible, no_wait: no_wait)
           begin
             yield
           ensure
-            stop_exclusive
+            stop_exclusive(compatible: after_compatible)
           end
         end
       end
@@ -132,11 +130,31 @@ module ActiveSupport
       private
 
       # Must be called within synchronize
-      def busy?(purpose)
-        (@exclusive_thread && @exclusive_thread != Thread.current) ||
-          @waiting.any? { |k, v| k != Thread.current && !v.include?(purpose) } ||
+      def busy_for_exclusive?(purpose)
+        busy_for_sharing?(purpose) ||
           @sharing.size > (@sharing[Thread.current] > 0 ? 1 : 0)
       end
+
+      def busy_for_sharing?(purpose)
+        (@exclusive_thread && @exclusive_thread != Thread.current) ||
+          @waiting.any? { |t, (_, c)| t != Thread.current && !c.include?(purpose) }
+      end
+
+      def eligible_waiters?(compatible)
+        @waiting.any? { |t, (p, _)| compatible.include?(p) && @waiting.all? { |t2, (_, c2)| t == t2 || c2.include?(p) } }
+      end
+
+      def yield_shares(purpose, compatible)
+        loose_shares = @sharing.delete(Thread.current)
+        @waiting[Thread.current] = [purpose, compatible] if loose_shares
+
+        begin
+          yield
+        ensure
+          @waiting.delete Thread.current
+          @sharing[Thread.current] = loose_shares if loose_shares
+        end
+      end
     end
   end
 end

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

@@ -138,6 +138,8 @@ end
 
 module ActiveSupport
   class XMLConverter # :nodoc:
+    # Raised if the XML contains attributes with type="yaml" or
+    # type="symbol". Read Hash#from_xml for more details.
     class DisallowedType < StandardError
       def initialize(type)
         super "Disallowed type attribute: #{type.inspect}"

data/lib/active_support/core_ext/module/attribute_accessors.rb

@@ -49,7 +49,7 @@ class Module
   #     include HairColors
   #   end
   #
-  #   Person.hair_colors # => [:brown, :black, :blonde, :red]
+  #   Person.new.hair_colors # => [:brown, :black, :blonde, :red]
   def mattr_reader(*syms)
     options = syms.extract_options!
     syms.each do |sym|
@@ -105,7 +105,7 @@ class Module
   #
   # Also, you can pass a block to set up the attribute with a default value.
   #
-  #   class HairColors
+  #   module HairColors
   #     mattr_writer :hair_colors do
   #       [:brown, :black, :blonde, :red]
   #     end
@@ -150,8 +150,8 @@ class Module
   #     include HairColors
   #   end
   #
-  #   Person.hair_colors = [:brown, :black, :blonde, :red]
-  #   Person.hair_colors     # => [:brown, :black, :blonde, :red]
+  #   HairColors.hair_colors = [:brown, :black, :blonde, :red]
+  #   HairColors.hair_colors # => [:brown, :black, :blonde, :red]
   #   Person.new.hair_colors # => [:brown, :black, :blonde, :red]
   #
   # If a subclass changes the value then that would also change the value for
@@ -161,8 +161,8 @@ class Module
   #   class Male < Person
   #   end
   #
-  #   Male.hair_colors << :blue
-  #   Person.hair_colors # => [:brown, :black, :blonde, :red, :blue]
+  #   Male.new.hair_colors << :blue
+  #   Person.new.hair_colors # => [:brown, :black, :blonde, :red, :blue]
   #
   # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>.
   # To opt out of the instance reader method, pass <tt>instance_reader: false</tt>.

data/lib/active_support/core_ext/module/deprecation.rb

@@ -13,8 +13,8 @@ class Module
   #
   #   class MyLib::Deprecator
   #     def deprecation_warning(deprecated_method_name, message, caller_backtrace = nil)
-  #        message = "#{deprecated_method_name} is deprecated and will be removed from MyLibrary | #{message}"
-  #        Kernel.warn message
+  #       message = "#{deprecated_method_name} is deprecated and will be removed from MyLibrary | #{message}"
+  #       Kernel.warn message
   #     end
   #   end
   def deprecate(*method_names)

data/lib/active_support/core_ext/numeric/conversions.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/big_decimal/conversions'
 require 'active_support/number_helper'
+require 'active_support/core_ext/module/deprecation'
 
 module ActiveSupport::NumericWithFormat
 
@@ -75,6 +76,8 @@ module ActiveSupport::NumericWithFormat
   #  1234567.to_s(:human_size)                               # => 1.18 MB
   #  1234567890.to_s(:human_size)                            # => 1.15 GB
   #  1234567890123.to_s(:human_size)                         # => 1.12 TB
+  #  1234567890123456.to_s(:human_size)                      # => 1.1 PB
+  #  1234567890123456789.to_s(:human_size)                   # => 1.07 EB
   #  1234567.to_s(:human_size, precision: 2)                 # => 1.2 MB
   #  483989.to_s(:human_size, precision: 2)                  # => 470 KB
   #  1234567.to_s(:human_size, precision: 2, separator: ',') # => 1,2 MB
@@ -117,7 +120,11 @@ module ActiveSupport::NumericWithFormat
     when :human_size
       return ActiveSupport::NumberHelper.number_to_human_size(self, options)
     else
-      super
+      if is_a?(Float) || format.is_a?(Symbol)
+        super()
+      else
+        super
+      end
     end
   end
 

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

@@ -5,7 +5,6 @@ class ERB
   module Util
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
     JSON_ESCAPE = { '&' => '\u0026', '>' => '\u003e', '<' => '\u003c', "\u2028" => '\u2028', "\u2029" => '\u2029' }
-    HTML_ESCAPE_REGEXP = /[&"'><]/
     HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+)|(#[xX][\dA-Fa-f]+));)/
     JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
 
@@ -37,7 +36,7 @@ class ERB
       if s.html_safe?
         s
       else
-        ActiveSupport::Multibyte::Unicode.tidy_bytes(s).gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
+        CGI.escapeHTML(ActiveSupport::Multibyte::Unicode.tidy_bytes(s))
       end
     end
     module_function :unwrapped_html_escape
@@ -142,6 +141,7 @@ module ActiveSupport #:nodoc:
     alias_method :original_concat, :concat
     private :original_concat
 
+    # Raised when <tt>ActiveSupport::SafeBuffer#safe_concat</tt> is called on unsafe buffers.
     class SafeConcatError < StandardError
       def initialize
         super 'Could not concatenate to the buffer because it is not html safe.'
@@ -243,8 +243,7 @@ module ActiveSupport #:nodoc:
     private
 
     def html_escape_interpolated_argument(arg)
-      (!html_safe? || arg.html_safe?) ? arg :
-        arg.to_s.gsub(ERB::Util::HTML_ESCAPE_REGEXP, ERB::Util::HTML_ESCAPE)
+      (!html_safe? || arg.html_safe?) ? arg : CGI.escapeHTML(arg.to_s)
     end
   end
 end

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

@@ -40,7 +40,23 @@ class Time
       Thread.current[:time_zone] = find_zone!(time_zone)
     end
 
-    # Allows override of <tt>Time.zone</tt> locally inside supplied block; resets <tt>Time.zone</tt> to existing value when done.
+    # Allows override of <tt>Time.zone</tt> locally inside supplied block;
+    # resets <tt>Time.zone</tt> to existing value when done.
+    #
+    #   class ApplicationController < ActionController::Base
+    #     around_action :set_time_zone
+    #
+    #     private
+    #
+    #     def set_time_zone
+    #       Time.use_zone(current_user.timezone) { yield }
+    #     end
+    #   end
+    #
+    #  NOTE: This won't affect any <tt>ActiveSupport::TimeWithZone</tt>
+    #  objects that have already been created, e.g. any model timestamp
+    #  attributes that have been read before the block will remain in
+    #  the application's default timezone.
     def use_zone(time_zone)
       new_zone = find_zone!(time_zone)
       begin

data/lib/active_support/dependencies/interlock.rb

@@ -8,13 +8,13 @@ module ActiveSupport #:nodoc:
       end
 
       def loading
-        @lock.exclusive(purpose: :load, compatible: [:load]) do
+        @lock.exclusive(purpose: :load, compatible: [:load], after_compatible: [:load]) do
           yield
         end
       end
 
       def unloading
-        @lock.exclusive(purpose: :unload, compatible: [:load, :unload]) do
+        @lock.exclusive(purpose: :unload, compatible: [:load, :unload], after_compatible: [:load, :unload]) do
           yield
         end
       end
@@ -24,7 +24,7 @@ module ActiveSupport #:nodoc:
       # concurrent activity, return immediately (without executing the
       # block) instead of waiting.
       def attempt_unloading
-        @lock.exclusive(purpose: :unload, compatible: [:load, :unload], no_wait: true) do
+        @lock.exclusive(purpose: :unload, compatible: [:load, :unload], after_compatible: [:load, :unload], no_wait: true) do
           yield
         end
       end

data/lib/active_support/deprecation.rb

@@ -32,7 +32,7 @@ module ActiveSupport
     # and the second is a library name
     #
     #   ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
-    def initialize(deprecation_horizon = '5.0', gem_name = 'Rails')
+    def initialize(deprecation_horizon = '5.1', gem_name = 'Rails')
       self.gem_name = gem_name
       self.deprecation_horizon = deprecation_horizon
       # By default, warnings are not silenced and debugging is off.

data/lib/active_support/deprecation/behaviors.rb

@@ -1,6 +1,8 @@
 require "active_support/notifications"
 
 module ActiveSupport
+  # Raised when <tt>ActiveSupport::Deprecation::Behavior#behavior</tt> is set with <tt>:raise</tt>.
+  # You would set <tt>:raise</tt>, as a behaviour to raise errors and proactively report exceptions from deprecations.
   class DeprecationException < StandardError
   end
 

data/lib/active_support/deprecation/method_wrappers.rb

@@ -21,15 +21,15 @@ module ActiveSupport
       #   # => [:aaa, :bbb, :ccc]
       #
       #   Fred.aaa
-      #   # DEPRECATION WARNING: aaa is deprecated and will be removed from Rails 5.0. (called from irb_binding at (irb):10)
+      #   # DEPRECATION WARNING: aaa is deprecated and will be removed from Rails 5.1. (called from irb_binding at (irb):10)
       #   # => nil
       #
       #   Fred.bbb
-      #   # DEPRECATION WARNING: bbb is deprecated and will be removed from Rails 5.0 (use zzz instead). (called from irb_binding at (irb):11)
+      #   # DEPRECATION WARNING: bbb is deprecated and will be removed from Rails 5.1 (use zzz instead). (called from irb_binding at (irb):11)
       #   # => nil
       #
       #   Fred.ccc
-      #   # DEPRECATION WARNING: ccc is deprecated and will be removed from Rails 5.0 (use Bar#ccc instead). (called from irb_binding at (irb):12)
+      #   # DEPRECATION WARNING: ccc is deprecated and will be removed from Rails 5.1 (use Bar#ccc instead). (called from irb_binding at (irb):12)
       #   # => nil
       #
       # Passing in a custom deprecator:

data/lib/active_support/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveSupport
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta1.1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/hash_with_indifferent_access.rb

@@ -68,12 +68,10 @@ module ActiveSupport
       end
     end
 
-    def default(key = nil)
-      if key.is_a?(Symbol) && include?(key = key.to_s)
-        self[key]
-      else
-        super
-      end
+    def default(*args)
+      key = args.first
+      args[0] = key.to_s if key.is_a?(Symbol)
+      super(*args)
     end
 
     def self.new_from_hash_copying_default(hash)
@@ -159,6 +157,20 @@ module ActiveSupport
     alias_method :has_key?, :key?
     alias_method :member?, :key?
 
+
+    # Same as <tt>Hash#[]</tt> where the key passed as argument can be
+    # either a string or a symbol:
+    #
+    #   counters = ActiveSupport::HashWithIndifferentAccess.new
+    #   counters[:foo] = 1
+    #
+    #   counters['foo'] # => 1
+    #   counters[:foo]  # => 1
+    #   counters[:zoo]  # => nil
+    def [](key)
+      super(convert_key(key))
+    end
+
     # Same as <tt>Hash#fetch</tt> where the key passed as argument can be
     # either a string or a symbol:
     #

data/lib/active_support/inflector/methods.rb

@@ -173,7 +173,7 @@ module ActiveSupport
     #
     # Singular names are not handled correctly:
     #
-    #   classify('calculus')     # => "Calculu"
+    #   classify('calculus')     # => "Calculus"
     def classify(table_name)
       # strip out any leading schema name
       camelize(singularize(table_name.to_s.sub(/.*\./, ''.freeze)))

data/lib/active_support/locale/en.yml

@@ -106,6 +106,8 @@ en:
           mb: "MB"
           gb: "GB"
           tb: "TB"
+          pb: "PB"
+          eb: "EB"
       # Used in NumberHelper.number_to_human()
       decimal_units:
         format: "%n %u"

data/lib/active_support/logger.rb

@@ -5,18 +5,27 @@ module ActiveSupport
   class Logger < ::Logger
     include LoggerSilence
 
-    attr_accessor :broadcast_messages
+    # Returns true if the logger destination matches one of the sources
+    #
+    #   logger = Logger.new(STDOUT)
+    #   ActiveSupport::Logger.logger_outputs_to?(logger, STDOUT)
+    #   # => true
+    def self.logger_outputs_to?(logger, *sources)
+      logdev = logger.instance_variable_get("@logdev")
+      logger_source = logdev.dev if logdev.respond_to?(:dev)
+      sources.any? { |source| source == logger_source }
+    end
 
     # Broadcasts logs to multiple loggers.
     def self.broadcast(logger) # :nodoc:
       Module.new do
         define_method(:add) do |*args, &block|
-          logger.add(*args, &block) if broadcast_messages
+          logger.add(*args, &block)
           super(*args, &block)
         end
 
         define_method(:<<) do |x|
-          logger << x if broadcast_messages
+          logger << x
           super(x)
         end
 
@@ -45,7 +54,20 @@ module ActiveSupport
     def initialize(*args)
       super
       @formatter = SimpleFormatter.new
-      @broadcast_messages = true
+      after_initialize if respond_to? :after_initialize
+    end
+
+    def add(severity, message = nil, progname = nil, &block)
+      return true if @logdev.nil? || (severity || UNKNOWN) < level
+      super
+    end
+
+    Logger::Severity.constants.each do |severity|
+      class_eval(<<-EOT, __FILE__, __LINE__ + 1)
+        def #{severity.downcase}?                # def debug?
+          Logger::#{severity} >= level           #   DEBUG >= level
+        end                                      # end
+      EOT
     end
 
     # Simple formatter which only displays the message.

data/lib/active_support/logger_silence.rb

@@ -1,25 +1,45 @@
 require 'active_support/concern'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'concurrent'
 
 module LoggerSilence
   extend ActiveSupport::Concern
 
   included do
     cattr_accessor :silencer
+    attr_reader :local_levels
     self.silencer = true
   end
 
+  def after_initialize
+    @local_levels = Concurrent::Map.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_logger_level, self.level = level, temporary_level
+        old_local_level            = local_levels[local_log_id]
+        local_levels[local_log_id] = temporary_level
+
         yield self
       ensure
-        self.level = old_logger_level
+        if old_local_level
+          local_levels[local_log_id] = old_local_level
+        else
+          local_levels.delete(local_log_id)
+        end
       end
     else
       yield self
     end
   end
-end
+end

data/lib/active_support/multibyte/unicode.rb

@@ -87,19 +87,44 @@ module ActiveSupport
           pos += 1
           previous = codepoints[pos-1]
           current = codepoints[pos]
-          if (
-              # CR X LF
-              ( previous == database.boundary[:cr] and current == database.boundary[:lf] ) or
-              # L X (L|V|LV|LVT)
-              ( database.boundary[:l] === previous and in_char_class?(current, [:l,:v,:lv,:lvt]) ) or
-              # (LV|V) X (V|T)
-              ( in_char_class?(previous, [:lv,:v]) and in_char_class?(current, [:v,:t]) ) or
-              # (LVT|T) X (T)
-              ( in_char_class?(previous, [:lvt,:t]) and database.boundary[:t] === current ) or
-              # X Extend
-              (database.boundary[:extend] === current)
-            )
-          else
+
+          should_break =
+            # GB3. CR X LF
+            if previous == database.boundary[:cr] and current == database.boundary[:lf]
+              false
+            # GB4. (Control|CR|LF) ÷
+            elsif previous and in_char_class?(previous, [:control,:cr,:lf])
+              true
+            # GB5. ÷ (Control|CR|LF)
+            elsif in_char_class?(current, [:control,:cr,:lf])
+              true
+            # GB6. L X (L|V|LV|LVT)
+            elsif database.boundary[:l] === previous and in_char_class?(current, [:l,:v,:lv,:lvt])
+              false
+            # GB7. (LV|V) X (V|T)
+            elsif in_char_class?(previous, [:lv,:v]) and in_char_class?(current, [:v,:t])
+              false
+            # GB8. (LVT|T) X (T)
+            elsif in_char_class?(previous, [:lvt,:t]) and database.boundary[:t] === current
+              false
+            # GB8a. Regional_Indicator X Regional_Indicator
+            elsif database.boundary[:regional_indicator] === previous and database.boundary[:regional_indicator] === current
+              false
+            # GB9. X Extend
+            elsif database.boundary[:extend] === current
+              false
+            # GB9a. X SpacingMark
+            elsif database.boundary[:spacingmark] === current
+              false
+            # GB9b. Prepend X
+            elsif database.boundary[:prepend] === previous
+              false
+            # GB10. Any ÷ Any
+            else
+              true
+            end
+
+          if should_break
             unpacked << codepoints[marker..pos-1]
             marker = pos
           end

data/lib/active_support/notifications/instrumenter.rb

@@ -21,6 +21,7 @@ module ActiveSupport
           yield payload
         rescue Exception => e
           payload[:exception] = [e.class.name, e.message]
+          payload[:exception_object] = e
           raise e
         ensure
           finish_with_state listeners_state, name, payload

data/lib/active_support/number_helper.rb

@@ -47,6 +47,14 @@ module ActiveSupport
     # Formats a +number+ into a currency string (e.g., $13.65). You
     # can customize the format in the +options+ hash.
     #
+    # The currency unit and number formatting of the current locale will be used
+    # unless otherwise specified in the provided options. No currency conversion
+    # is performed. If the user is given a way to change their locale, they will
+    # also be able to change the relative value of the currency displayed with
+    # this helper. If your application will ever support multiple locales, you
+    # may want to specify a constant <tt>:locale</tt> option or consider
+    # using a library capable of currency conversion.
+    #
     # ==== Options
     #
     # * <tt>:locale</tt> - Sets the locale to be used for formatting
@@ -235,6 +243,8 @@ module ActiveSupport
     #   number_to_human_size(1234567)                                # => 1.18 MB
     #   number_to_human_size(1234567890)                             # => 1.15 GB
     #   number_to_human_size(1234567890123)                          # => 1.12 TB
+    #   number_to_human_size(1234567890123456)                       # => 1.1 PB
+    #   number_to_human_size(1234567890123456789)                    # => 1.07 EB
     #   number_to_human_size(1234567, precision: 2)                  # => 1.2 MB
     #   number_to_human_size(483989, precision: 2)                   # => 470 KB
     #   number_to_human_size(1234567, precision: 2, separator: ',')  # => 1,2 MB

data/lib/active_support/number_helper/number_to_currency_converter.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/numeric/inquiry'
+
 module ActiveSupport
   module NumberHelper
     class NumberToCurrencyConverter < NumberConverter # :nodoc:
@@ -7,7 +9,7 @@ module ActiveSupport
         number = self.number.to_s.strip
         format = options[:format]
 
-        if is_negative?(number)
+        if number.to_f.negative?
           format = options[:negative_format]
           number = absolute_value(number)
         end
@@ -18,10 +20,6 @@ module ActiveSupport
 
       private
 
-        def is_negative?(number)
-          number.to_f.phase != 0
-        end
-
         def absolute_value(number)
           number.respond_to?(:abs) ? number.abs : number.sub(/\A-/, '')
         end

data/lib/active_support/number_helper/number_to_human_size_converter.rb

@@ -1,7 +1,7 @@
 module ActiveSupport
   module NumberHelper
     class NumberToHumanSizeConverter < NumberConverter #:nodoc:
-      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb]
+      STORAGE_UNITS = [:byte, :kb, :mb, :gb, :tb, :pb, :eb]
 
       self.namespace      = :human
       self.validate_float = true

data/lib/active_support/ordered_hash.rb

@@ -5,7 +5,7 @@ YAML.add_builtin_type("omap") do |type, val|
 end
 
 module ActiveSupport
-  # <tt>ActiveSupport::OrderedHash</tt> implements a hash that preserves
+  # DEPRECATED: <tt>ActiveSupport::OrderedHash</tt> implements a hash that preserves
   # insertion order.
   #
   #   oh = ActiveSupport::OrderedHash.new

data/lib/active_support/test_case.rb

@@ -9,7 +9,6 @@ require 'active_support/testing/isolation'
 require 'active_support/testing/constant_lookup'
 require 'active_support/testing/time_helpers'
 require 'active_support/testing/file_fixtures'
-require 'active_support/testing/composite_filter'
 require 'active_support/core_ext/kernel/reporting'
 
 module ActiveSupport
@@ -39,15 +38,6 @@ module ActiveSupport
       def test_order
         ActiveSupport.test_order ||= :random
       end
-
-      def run(reporter, options = {})
-        if options[:patterns] && options[:patterns].any? { |p| p =~ /:\d+/ }
-          options[:filter] = \
-            Testing::CompositeFilter.new(self, options[:filter], options[:patterns])
-        end
-
-        super
-      end
     end
 
     alias_method :method_name, :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1.1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -312,7 +312,6 @@ files:
 - lib/active_support/test_case.rb
 - lib/active_support/testing/assertions.rb
 - lib/active_support/testing/autorun.rb
-- lib/active_support/testing/composite_filter.rb
 - lib/active_support/testing/constant_lookup.rb
 - lib/active_support/testing/declarative.rb
 - lib/active_support/testing/deprecation.rb
@@ -357,9 +356,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.
 test_files: []
+has_rdoc: 

data/lib/active_support/testing/composite_filter.rb

@@ -1,54 +0,0 @@
-require 'method_source'
-
-module ActiveSupport
-  module Testing
-    class CompositeFilter # :nodoc:
-      def initialize(runnable, filter, patterns)
-        @runnable = runnable
-        @filters = [ derive_regexp(filter), *derive_line_filters(patterns) ].compact
-      end
-
-      def ===(method)
-        @filters.any? { |filter| filter === method }
-      end
-
-      private
-        def derive_regexp(filter)
-          filter =~ %r%/(.*)/% ? Regexp.new($1) : filter
-        end
-
-        def derive_line_filters(patterns)
-          patterns.map do |file_and_line|
-            file, line = file_and_line.split(':')
-            Filter.new(@runnable, file, line) if file
-          end
-        end
-
-        class Filter # :nodoc:
-          def initialize(runnable, file, line)
-            @runnable, @file = runnable, File.expand_path(file)
-            @line = line.to_i if line
-          end
-
-          def ===(method)
-            return unless @runnable.method_defined?(method)
-
-            if @line
-              test_file, test_range = definition_for(@runnable.instance_method(method))
-              test_file == @file && test_range.include?(@line)
-            else
-              @runnable.instance_method(method).source_location.first == @file
-            end
-          end
-
-          private
-            def definition_for(method)
-              file, start_line = method.source_location
-              end_line = method.source.count("\n") + start_line - 1
-
-              return file, start_line..end_line
-            end
-        end
-    end
-  end
-end