activesupport 4.2.11.3 → 5.0.0.beta1

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

@@ -55,7 +55,8 @@ class Hash
   #
   #     XML_TYPE_NAMES = {
   #       "Symbol"     => "symbol",
-  #       "Integer"    => "integer",
+  #       "Fixnum"     => "integer",
+  #       "Bignum"     => "integer",
   #       "BigDecimal" => "decimal",
   #       "Float"      => "float",
   #       "TrueClass"  => "boolean",
@@ -105,7 +106,25 @@ class Hash
     #   # => {"hash"=>{"foo"=>1, "bar"=>2}}
     #
     # +DisallowedType+ is raised if the XML contains attributes with <tt>type="yaml"</tt> or
-    # <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to parse this XML.
+    # <tt>type="symbol"</tt>. Use <tt>Hash.from_trusted_xml</tt> to
+    # parse this XML.
+    #
+    # Custom +disallowed_types+ can also be passed in the form of an
+    # array.
+    #
+    #   xml = <<-XML
+    #     <?xml version="1.0" encoding="UTF-8"?>
+    #       <hash>
+    #         <foo type="integer">1</foo>
+    #         <bar type="string">"David"</bar>
+    #       </hash>
+    #   XML
+    #
+    #   hash = Hash.from_xml(xml, ['integer'])
+    #   # => ActiveSupport::XMLConverter::DisallowedType: Disallowed type attribute: "integer"
+    #
+    # Note that passing custom disallowed types will override the default types,
+    # which are Symbol and YAML.
     def from_xml(xml, disallowed_types = nil)
       ActiveSupport::XMLConverter.new(xml, disallowed_types).to_h
     end

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

@@ -4,7 +4,7 @@ class Hash
   #   h1 = { a: true, b: { c: [1, 2, 3] } }
   #   h2 = { a: false, b: { x: [3, 4, 5] } }
   #
-  #   h1.deep_merge(h2) #=> { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
   #
   # Like with Hash#merge in the standard library, a block can be provided
   # to merge values:

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

@@ -1,8 +1,9 @@
 class Hash
-  # Returns a hash that includes everything but the given keys.
-  #   hash = { a: true, b: false, c: nil}
-  #   hash.except(:c) # => { a: true, b: false}
-  #   hash # => { a: true, b: false, c: nil}
+  # Returns a hash that includes everything except given keys.
+  #   hash = { a: true, b: false, c: nil }
+  #   hash.except(:c)     # => { a: true, b: false }
+  #   hash.except(:a, :b) # => { c: nil }
+  #   hash                # => { a: true, b: false, c: nil }
   #
   # This is useful for limiting a set of parameters to everything but a few known toggles:
   #   @person.update(params[:person].except(:admin))
@@ -10,10 +11,10 @@ class Hash
     dup.except!(*keys)
   end
 
-  # Replaces the hash without the given keys.
-  #   hash = { a: true, b: false, c: nil}
-  #   hash.except!(:c) # => { a: true, b: false}
-  #   hash # => { a: true, b: false }
+  # Removes the given keys from hash and returns it.
+  #   hash = { a: true, b: false, c: nil }
+  #   hash.except!(:c) # => { a: true, b: false }
+  #   hash             # => { a: true, b: false }
   def except!(*keys)
     keys.each { |key| delete(key) }
     self

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

@@ -6,7 +6,7 @@ class Hash
   #
   #   { a: 1 }.with_indifferent_access['a'] # => 1
   def with_indifferent_access
-    ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(self)
+    ActiveSupport::HashWithIndifferentAccess.new(self)
   end
 
   # Called when object is nested under an object that receives

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

@@ -1,12 +1,16 @@
 class Hash
-  # Returns a new hash with all keys converted using the block operation.
+  # Returns a new hash with all keys converted using the +block+ operation.
   #
   #  hash = { name: 'Rob', age: '28' }
   #
-  #  hash.transform_keys{ |key| key.to_s.upcase }
-  #  # => {"NAME"=>"Rob", "AGE"=>"28"}
+  #  hash.transform_keys { |key| key.to_s.upcase } # => {"NAME"=>"Rob", "AGE"=>"28"}
+  #
+  # If you do not provide a +block+, it will return an Enumerator
+  # for chaining with other methods:
+  #
+  #  hash.transform_keys.with_index { |k, i| [k, i].join } # => {"name0"=>"Rob", "age1"=>"28"}
   def transform_keys
-    return enum_for(:transform_keys) unless block_given?
+    return enum_for(:transform_keys) { size } unless block_given?
     result = self.class.new
     each_key do |key|
       result[yield(key)] = self[key]
@@ -14,10 +18,10 @@ class Hash
     result
   end
 
-  # Destructively convert all keys using the block operations.
-  # Same as transform_keys but modifies +self+.
+  # Destructively converts all keys using the +block+ operations.
+  # Same as +transform_keys+ but modifies +self+.
   def transform_keys!
-    return enum_for(:transform_keys!) unless block_given?
+    return enum_for(:transform_keys!) { size } unless block_given?
     keys.each do |key|
       self[yield(key)] = delete(key)
     end
@@ -31,13 +35,13 @@ class Hash
   #   hash.stringify_keys
   #   # => {"name"=>"Rob", "age"=>"28"}
   def stringify_keys
-    transform_keys{ |key| key.to_s }
+    transform_keys(&:to_s)
   end
 
-  # Destructively convert all keys to strings. Same as
+  # Destructively converts all keys to strings. Same as
   # +stringify_keys+, but modifies +self+.
   def stringify_keys!
-    transform_keys!{ |key| key.to_s }
+    transform_keys!(&:to_s)
   end
 
   # Returns a new hash with all keys converted to symbols, as long as
@@ -52,15 +56,15 @@ class Hash
   end
   alias_method :to_options,  :symbolize_keys
 
-  # Destructively convert all keys to symbols, as long as they respond
+  # Destructively converts all keys to symbols, as long as they respond
   # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
   def symbolize_keys!
     transform_keys!{ |key| key.to_sym rescue key }
   end
   alias_method :to_options!, :symbolize_keys!
 
-  # Validate all keys in a hash match <tt>*valid_keys</tt>, raising
-  # ArgumentError on a mismatch.
+  # Validates all keys in a hash match <tt>*valid_keys</tt>, raising
+  # +ArgumentError+ on a mismatch.
   #
   # Note that keys are treated differently than HashWithIndifferentAccess,
   # meaning that string and symbol keys will not match.
@@ -89,7 +93,7 @@ class Hash
     _deep_transform_keys_in_object(self, &block)
   end
 
-  # Destructively convert all keys by using the block operation.
+  # Destructively converts all keys by using the block operation.
   # This includes the keys from the root hash and from all
   # nested hashes and arrays.
   def deep_transform_keys!(&block)
@@ -105,14 +109,14 @@ class Hash
   #   hash.deep_stringify_keys
   #   # => {"person"=>{"name"=>"Rob", "age"=>"28"}}
   def deep_stringify_keys
-    deep_transform_keys{ |key| key.to_s }
+    deep_transform_keys(&:to_s)
   end
 
-  # Destructively convert all keys to strings.
+  # Destructively converts all keys to strings.
   # This includes the keys from the root hash and from all
   # nested hashes and arrays.
   def deep_stringify_keys!
-    deep_transform_keys!{ |key| key.to_s }
+    deep_transform_keys!(&:to_s)
   end
 
   # Returns a new hash with all keys converted to symbols, as long as
@@ -127,7 +131,7 @@ class Hash
     deep_transform_keys{ |key| key.to_sym rescue key }
   end
 
-  # Destructively convert all keys to symbols, as long as they respond
+  # Destructively converts all keys to symbols, as long as they respond
   # to +to_sym+. This includes the keys from the root hash and from all
   # nested hashes and arrays.
   def deep_symbolize_keys!

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

@@ -1,5 +1,5 @@
 class Hash
-  # Slice a hash to include only the given keys. Returns a hash containing 
+  # Slices a hash to include only the given keys. Returns a hash containing 
   # the given keys.
   # 
   #   { a: 1, b: 2, c: 3, d: 4 }.slice(:a, :b)

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

@@ -2,22 +2,28 @@ class Hash
   # Returns a new hash with the results of running +block+ once for every value.
   # The keys are unchanged.
   #
-  #   { a: 1, b: 2, c: 3 }.transform_values { |x| x * 2 }
-  #   # => { a: 2, b: 4, c: 6 }
+  #   { a: 1, b: 2, c: 3 }.transform_values { |x| x * 2 } # => { a: 2, b: 4, c: 6 }
+  #
+  # If you do not provide a +block+, it will return an Enumerator
+  # for chaining with other methods:
+  #
+  #   { a: 1, b: 2 }.transform_values.with_index { |v, i| [v, i].join.to_i } # => { a: 10, b: 21 }
   def transform_values
-    return enum_for(:transform_values) unless block_given?
+    return enum_for(:transform_values) { size } unless block_given?
+    return {} if empty?
     result = self.class.new
     each do |key, value|
       result[key] = yield(value)
     end
     result
-  end unless method_defined? :transform_values
+  end
 
-  # Destructive +transform_values+
+  # Destructively converts all values using the +block+ operations.
+  # Same as +transform_values+ but modifies +self+.
   def transform_values!
-    return enum_for(:transform_values!) unless block_given?
+    return enum_for(:transform_values!) { size } unless block_given?
     each do |key, value|
       self[key] = yield(value)
     end
-  end unless method_defined? :transform_values!
+  end
 end

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

@@ -23,7 +23,7 @@ class Integer
   alias :month :months
 
   def years
-    ActiveSupport::Duration.new(self * 365.25.days, [[:years, self]])
+    ActiveSupport::Duration.new(self * 365.25.days.to_i, [[:years, self]])
   end
   alias :year :years
 end

data/lib/active_support/core_ext/kernel.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/kernel/agnostics'
 require 'active_support/core_ext/kernel/concern'
-require 'active_support/core_ext/kernel/debugger' if RUBY_VERSION < '2.0.0'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/singleton_class'

data/lib/active_support/core_ext/kernel/debugger.rb

@@ -1,10 +1,3 @@
-module Kernel
-  unless respond_to?(:debugger)
-    # Starts a debugging session if the +debugger+ gem has been loaded (call rails server --debugger to do load it).
-    def debugger
-      message = "\n***** Debugger requested, but was not available (ensure the debugger gem is listed in Gemfile/installed as gem): Start server with --debugger to enable *****\n"
-      defined?(Rails.logger) ? Rails.logger.info(message) : $stderr.puts(message)
-    end
-    alias breakpoint debugger unless respond_to?(:breakpoint)
-  end
-end
+require 'active_support/deprecation'
+
+ActiveSupport::Deprecation.warn("This file is deprecated and will be removed in Rails 5.1 with no replacement.")

data/lib/active_support/core_ext/kernel/reporting.rb

@@ -1,7 +1,3 @@
-require 'rbconfig'
-require 'tempfile'
-require 'active_support/deprecation'
-
 module Kernel
   # Sets $VERBOSE to nil for the duration of the block and back to its original
   # value afterwards.
@@ -30,34 +26,6 @@ module Kernel
     $VERBOSE = old_verbose
   end
 
-  # For compatibility
-  def silence_stderr #:nodoc:
-    ActiveSupport::Deprecation.warn(
-      "`#silence_stderr` is deprecated and will be removed in the next release."
-    ) #not thread-safe
-    silence_stream(STDERR) { yield }
-  end
-
-  # Deprecated : this method is not thread safe
-  # Silences any stream for the duration of the block.
-  #
-  #   silence_stream(STDOUT) do
-  #     puts 'This will never be seen'
-  #   end
-  #
-  #   puts 'But this will'
-  #
-  # This method is not thread-safe.
-  def silence_stream(stream)
-    old_stream = stream.dup
-    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-    stream.sync = true
-    yield
-  ensure
-    stream.reopen(old_stream)
-    old_stream.close
-  end
-
   # Blocks and ignores any exception passed as argument if raised within the block.
   #
   #   suppress(ZeroDivisionError) do
@@ -70,56 +38,4 @@ module Kernel
     yield
   rescue *exception_classes
   end
-
-  # Captures the given stream and returns it:
-  #
-  #   stream = capture(:stdout) { puts 'notice' }
-  #   stream # => "notice\n"
-  #
-  #   stream = capture(:stderr) { warn 'error' }
-  #   stream # => "error\n"
-  #
-  # even for subprocesses:
-  #
-  #   stream = capture(:stdout) { system('echo notice') }
-  #   stream # => "notice\n"
-  #
-  #   stream = capture(:stderr) { system('echo error 1>&2') }
-  #   stream # => "error\n"
-  def capture(stream)
-    ActiveSupport::Deprecation.warn(
-      "`#capture(stream)` is deprecated and will be removed in the next release."
-    ) #not thread-safe
-    stream = stream.to_s
-    captured_stream = Tempfile.new(stream)
-    stream_io = eval("$#{stream}")
-    origin_stream = stream_io.dup
-    stream_io.reopen(captured_stream)
-
-    yield
-
-    stream_io.rewind
-    return captured_stream.read
-  ensure
-    captured_stream.close
-    captured_stream.unlink
-    stream_io.reopen(origin_stream)
-  end
-  alias :silence :capture
-
-  # Silences both STDOUT and STDERR, even for subprocesses.
-  #
-  #   quietly { system 'bundle install' }
-  #
-  # This method is not thread-safe.
-  def quietly
-    ActiveSupport::Deprecation.warn(
-      "`#quietly` is deprecated and will be removed in the next release."
-    ) #not thread-safe
-    silence_stream(STDOUT) do
-      silence_stream(STDERR) do
-        yield
-      end
-    end
-  end
 end

data/lib/active_support/core_ext/load_error.rb

@@ -1,3 +1,5 @@
+require 'active_support/deprecation/proxy_wrappers'
+
 class LoadError
   REGEXPS = [
     /^no such file to load -- (.+)$/i,
@@ -21,8 +23,8 @@ class LoadError
   # Returns true if the given path name (except perhaps for the ".rb"
   # extension) is the missing file which caused the exception to be raised.
   def is_missing?(location)
-    location.sub(/\.rb$/, '') == path.sub(/\.rb$/, '')
+    location.sub(/\.rb$/, ''.freeze) == path.sub(/\.rb$/, ''.freeze)
   end
 end
 
-MissingSourceFile = LoadError
+MissingSourceFile = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('MissingSourceFile', 'LoadError')

data/lib/active_support/core_ext/marshal.rb

@@ -1,16 +1,11 @@
-require 'active_support/core_ext/module/aliasing'
-
-module Marshal
-  class << self
-    def load_with_autoloading(source, proc = nil)
-      load_without_autoloading(source, proc)
+module ActiveSupport
+  module MarshalWithAutoloading # :nodoc:
+    def load(source)
+      super(source)
     rescue ArgumentError, NameError => exc
-      if exc.message.match(%r|undefined class/module (.+?)(::)?\z|)
+      if exc.message.match(%r|undefined class/module (.+)|)
         # try loading the class/module
-        loaded = $1.constantize
-
-        raise unless $1 == loaded.name
-
+        $1.constantize
         # if it is an IO we need to go back to read the object
         source.rewind if source.respond_to?(:rewind)
         retry
@@ -18,7 +13,7 @@ module Marshal
         raise exc
       end
     end
-
-    alias_method_chain :load, :autoloading
   end
 end
+
+Marshal.singleton_class.prepend(ActiveSupport::MarshalWithAutoloading)

data/lib/active_support/core_ext/module.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/anonymous'
 require 'active_support/core_ext/module/reachable'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/concerning'
 require 'active_support/core_ext/module/delegation'

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

@@ -1,4 +1,7 @@
 class Module
+  # NOTE: This method is deprecated. Please use <tt>Module#prepend</tt> that
+  # comes with Ruby 2.0 or newer instead.
+  #
   # Encapsulates the common pattern of:
   #
   #   alias_method :foo_without_feature, :foo
@@ -21,6 +24,8 @@ class Module
   #
   # so you can safely chain foo, foo?, foo! and/or foo= with the same feature.
   def alias_method_chain(target, feature)
+    ActiveSupport::Deprecation.warn("alias_method_chain is deprecated. Please, use Module#prepend instead. From module, you can access the original method using super.")
+
     # Strip out punctuation on predicates, bang or writer methods since
     # e.g. target?_without_feature is not a valid method name.
     aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
@@ -43,7 +48,7 @@ class Module
   end
 
   # Allows you to make aliases for attributes, which includes
-  # getter, setter, and query methods.
+  # getter, setter, and a predicate.
   #
   #   class Content < ActiveRecord::Base
   #     # has a title attribute