activesupport 4.1.16 → 4.2.0.beta1

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

@@ -19,7 +19,7 @@
 class Object
   # Can you safely dup this object?
   #
-  # False for +nil+, +false+, +true+, symbol, and number objects;
+  # False for +nil+, +false+, +true+, symbol, number and BigDecimal(in 1.9.x) objects;
   # true otherwise.
   def duplicable?
     true
@@ -78,6 +78,9 @@ end
 
 require 'bigdecimal'
 class BigDecimal
+  # Needed to support Ruby 1.9.x, as it doesn't allow dup on BigDecimal, instead
+  # raises TypeError exception. Checking here on the runtime whether BigDecimal
+  # will allow dup or not.
   begin
     BigDecimal.new('4.56').dup
 
@@ -88,13 +91,3 @@ class BigDecimal
     # can't dup, so use superclass implementation
   end
 end
-
-class Method
-  # Methods are not duplicable:
-  #
-  #  method(:puts).duplicable? # => false
-  #  method(:puts).dup         # => TypeError: allocator undefined for Method
-  def duplicable?
-    false
-  end
-end

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

@@ -0,0 +1,12 @@
+class Object
+  unless respond_to?(:itself) # TODO: Remove this file when we drop support for Ruby < 2.2
+    # Returns the object itself. Useful when dealing with a chaining scenario, like Active Record scopes:
+    #
+    #   Event.public_send(state.presence_in([ :trashed, :drafted ]) || :itself).order(:created_at)
+    #
+    # @return Object
+    def itself
+      self
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ require 'active_support/core_ext/module/aliasing'
 # bypassed completely. This means that as_json won't be invoked and the JSON gem will simply
 # ignore any options it does not natively understand. This also means that ::JSON.{generate,dump}
 # should give exactly the same results with or without active support.
-[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass].each do |klass|
+[Object, Array, FalseClass, Float, Hash, Integer, NilClass, String, TrueClass, Enumerable].each do |klass|
   klass.class_eval do
     def to_json_with_active_support_encoder(options = nil)
       if options.is_a?(::JSON::State)

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

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class Object
   # Alias of <tt>to_s</tt>.
   def to_param
@@ -7,7 +9,6 @@ class Object
   # Converts an object into a string suitable for use as a URL query string,
   # using the given <tt>key</tt> as the param name.
   def to_query(key)
-    require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
     "#{CGI.escape(key.to_param)}=#{CGI.escape(to_param.to_s)}"
   end
 end

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

@@ -34,9 +34,22 @@ class Object
   #     body    i18n.t :body, user_name: user.name
   #   end
   #
+  # When you don't pass an explicit receiver, it executes the whole block
+  # in merging options context:
+  #
+  #   class Account < ActiveRecord::Base
+  #     with_options dependent: :destroy do
+  #       has_many :customers
+  #       has_many :products
+  #       has_many :invoices
+  #       has_many :expenses
+  #     end
+  #   end
+  #
   # <tt>with_options</tt> can also be nested since the call is forwarded to its receiver.
   # Each nesting level will merge inherited defaults in addition to their own.
-  def with_options(options)
-    yield ActiveSupport::OptionMerger.new(self, options)
+  def with_options(options, &block)
+    option_merger = ActiveSupport::OptionMerger.new(self, options)
+    block.arity.zero? ? option_merger.instance_eval(&block) : block.call(option_merger)
   end
 end

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

@@ -64,7 +64,7 @@ class String
 
   # Returns the first character. If a limit is supplied, returns a substring
   # from the beginning of the string until it reaches the limit value. If the
-  # given limit is greater than or equal to the string length, returns self.
+  # given limit is greater than or equal to the string length, returns a copy of self.
   #
   #   str = "hello"
   #   str.first    # => "h"
@@ -76,7 +76,7 @@ class String
     if limit == 0
       ''
     elsif limit >= size
-      self
+      self.dup
     else
       to(limit - 1)
     end
@@ -84,7 +84,7 @@ class String
 
   # Returns the last character of the string. If a limit is supplied, returns a substring
   # from the end of the string until it reaches the limit value (counting backwards). If
-  # the given limit is greater than or equal to the string length, returns self.
+  # the given limit is greater than or equal to the string length, returns a copy of self.
   #
   #   str = "hello"
   #   str.last    # => "o"
@@ -96,7 +96,7 @@ class String
     if limit == 0
       ''
     elsif limit >= size
-      self
+      self.dup
     else
       from(-limit)
     end

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

@@ -3,7 +3,7 @@ class String
   # the string, and then changing remaining consecutive whitespace
   # groups into one space each.
   #
-  # Note that it handles both ASCII and Unicode whitespace.
+  # Note that it handles both ASCII and Unicode whitespace like mongolian vowel separator (U+180E).
   #
   #   %{ Multi-line
   #      string }.squish                   # => "Multi-line string"
@@ -62,4 +62,28 @@ class String
 
     "#{self[0, stop]}#{omission}"
   end
+
+  # Truncates a given +text+ after a given number of words (<tt>words_count</tt>):
+  #
+  #   'Once upon a time in a world far far away'.truncate_words(4)
+  #   # => "Once upon a time..."
+  #
+  # Pass a string or regexp <tt>:separator</tt> to specify a different separator of words:
+  #
+  #   'Once<br>upon<br>a<br>time<br>in<br>a<br>world'.truncate_words(5, separator: '<br>')
+  #   # => "Once<br>upon<br>a<br>time<br>in..."
+  #
+  # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "..."):
+  #
+  #   'And they found that many people were sleeping better.'.truncate_words(5, omission: '... (continued)')
+  #   # => "And they found that many... (continued)"
+  def truncate_words(words_count, options = {})
+    sep = options[:separator] || /\s+/
+    sep = Regexp.escape(sep.to_s) unless Regexp === sep
+    if self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
+      $1 + (options[:omission] || '...')
+    else
+      dup
+    end
+  end
 end

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

@@ -31,7 +31,7 @@ class String
   def pluralize(count = nil, locale = :en)
     locale = count if count.is_a?(Symbol)
     if count == 1
-      self
+      self.dup
     else
       ActiveSupport::Inflector.pluralize(self, locale)
     end
@@ -130,6 +130,8 @@ class String
   #
   #   'ActiveRecord::CoreExtensions::String::Inflections'.demodulize # => "Inflections"
   #   'Inflections'.demodulize                                       # => "Inflections"
+  #   '::Inflections'.demodulize                                     # => "Inflections"
+  #   ''.demodulize                                                  # => ''
   #
   # See also +deconstantize+.
   def demodulize

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

@@ -1,5 +1,6 @@
 require 'erb'
 require 'active_support/core_ext/kernel/singleton_class'
+require 'active_support/deprecation'
 
 class ERB
   module Util
@@ -18,12 +19,7 @@ class ERB
     #   puts html_escape('is a > 0 & a < 10?')
     #   # => is a &gt; 0 &amp; a &lt; 10?
     def html_escape(s)
-      s = s.to_s
-      if s.html_safe?
-        s
-      else
-        s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE).html_safe
-      end
+      unwrapped_html_escape(s).html_safe
     end
 
     # Aliasing twice issues a warning "discarding old...". Remove first to avoid it.
@@ -35,6 +31,18 @@ class ERB
     singleton_class.send(:remove_method, :html_escape)
     module_function :html_escape
 
+    # HTML escapes strings but doesn't wrap them with an ActiveSupport::SafeBuffer.
+    # This method is not for public consumption! Seriously!
+    def unwrapped_html_escape(s) # :nodoc:
+      s = s.to_s
+      if s.html_safe?
+        s
+      else
+        s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
+      end
+    end
+    module_function :unwrapped_html_escape
+
     # A utility method for escaping HTML without affecting existing escaped entities.
     #
     #   html_escape_once('1 < 2 &amp; 3')
@@ -124,7 +132,7 @@ module ActiveSupport #:nodoc:
   class SafeBuffer < String
     UNSAFE_STRING_METHODS = %w(
       capitalize chomp chop delete downcase gsub lstrip next reverse rstrip
-      slice squeeze strip sub succ swapcase tr tr_s upcase prepend
+      slice squeeze strip sub succ swapcase tr tr_s upcase
     )
 
     alias_method :original_concat, :concat
@@ -142,11 +150,7 @@ module ActiveSupport #:nodoc:
       else
         if html_safe?
           new_safe_buffer = super
-
-          if new_safe_buffer
-            new_safe_buffer.instance_eval { @html_safe = true }
-          end
-
+          new_safe_buffer.instance_eval { @html_safe = true }
           new_safe_buffer
         else
           to_str[*args]
@@ -174,14 +178,19 @@ module ActiveSupport #:nodoc:
     end
 
     def concat(value)
-      if !html_safe? || value.html_safe?
-        super(value)
-      else
-        super(ERB::Util.h(value))
-      end
+      super(html_escape_interpolated_argument(value))
     end
     alias << concat
 
+    def prepend(value)
+      super(html_escape_interpolated_argument(value))
+    end
+
+    def prepend!(value)
+      ActiveSupport::Deprecation.deprecation_warning "ActiveSupport::SafeBuffer#prepend!", :prepend
+      prepend value
+    end
+
     def +(other)
       dup.concat(other)
     end
@@ -210,7 +219,7 @@ module ActiveSupport #:nodoc:
     end
 
     def encode_with(coder)
-      coder.represent_object nil, to_str
+      coder.represent_scalar nil, to_str
     end
 
     UNSAFE_STRING_METHODS.each do |unsafe_method|
@@ -231,7 +240,8 @@ module ActiveSupport #:nodoc:
     private
 
     def html_escape_interpolated_argument(arg)
-      (!html_safe? || arg.html_safe?) ? arg : ERB::Util.h(arg)
+      (!html_safe? || arg.html_safe?) ? arg :
+        arg.to_s.gsub(ERB::Util::HTML_ESCAPE_REGEXP, ERB::Util::HTML_ESCAPE)
     end
   end
 end

data/lib/active_support/core_ext/thread.rb

@@ -62,6 +62,13 @@ class Thread
     _locals.has_key?(key.to_sym)
   end
 
+  # Freezes the thread so that thread local variables cannot be set via
+  # Thread#thread_variable_set, nor can fiber local variables be set.
+  #
+  #   me = Thread.current
+  #   me.freeze
+  #   me.thread_variable_set(:oliver, "a")  #=> RuntimeError: can't modify frozen thread locals
+  #   me[:oliver] = "a"                     #=> RuntimeError: can't modify frozen thread locals
   def freeze
     _locals.freeze
     super

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

@@ -20,7 +20,7 @@ class Time
     :iso8601      => lambda { |time| time.iso8601 }
   }
 
-  # Converts to a formatted string. See DATE_FORMATS for builtin formats.
+  # Converts to a formatted string. See DATE_FORMATS for built-in formats.
   #
   # This method is aliased to <tt>to_s</tt>.
   #

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

@@ -1,5 +1,4 @@
 require 'active_support/time_with_zone'
-require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/date_and_time/zones'
 
 class Time

data/lib/active_support/dependencies.rb

@@ -180,10 +180,11 @@ module ActiveSupport #:nodoc:
         Dependencies.load_missing_constant(from_mod, const_name)
       end
 
-      # Dependencies assumes the name of the module reflects the nesting (unless
-      # it can be proven that is not the case), and the path to the file that
-      # defines the constant. Anonymous modules cannot follow these conventions
-      # and we assume therefore the user wants to refer to a top-level constant.
+      # We assume that the name of the module reflects the nesting
+      # (unless it can be proven that is not the case) and the path to the file
+      # that defines the constant. Anonymous modules cannot follow these
+      # conventions and therefore we assume that the user wants to refer to a
+      # top-level constant.
       def guess_for_anonymous(const_name)
         if Object.const_defined?(const_name)
           raise NameError.new "#{const_name} cannot be autoloaded from an anonymous class or module", const_name

data/lib/active_support/duration.rb

@@ -78,7 +78,7 @@ module ActiveSupport
         reduce(::Hash.new(0)) { |h,(l,r)| h[l] += r; h }.
         sort_by {|unit,  _ | [:years, :months, :days, :minutes, :seconds].index(unit)}.
         map     {|unit, val| "#{val} #{val == 1 ? unit.to_s.chop : unit.to_s}"}.
-        to_sentence(locale: ::I18n.default_locale)
+        to_sentence(:locale => :en)
     end
 
     def as_json(options = nil) #:nodoc:
@@ -105,8 +105,7 @@ module ActiveSupport
 
       # We define it as a workaround to Ruby 2.0.0-p353 bug.
       # For more information, check rails/rails#13055.
-      # It should be dropped once a new Ruby patch-level
-      # release after 2.0.0-p353 happens.
+      # Remove it when we drop support for 2.0.0-p353.
       def ===(other) #:nodoc:
         value === other
       end

data/lib/active_support/gem_version.rb

@@ -6,9 +6,9 @@ module ActiveSupport
 
   module VERSION
     MAJOR = 4
-    MINOR = 1
-    TINY  = 16
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/hash_with_indifferent_access.rb

@@ -55,7 +55,7 @@ module ActiveSupport
     end
 
     def initialize(constructor = {})
-      if constructor.is_a?(Hash)
+      if constructor.respond_to?(:to_hash)
         super()
         update(constructor)
       else
@@ -75,6 +75,7 @@ module ActiveSupport
       hash = hash.to_hash
       new(hash).tap do |new_hash|
         new_hash.default = hash.default
+        new_hash.default_proc = hash.default_proc if hash.default_proc
       end
     end
 
@@ -176,7 +177,14 @@ module ActiveSupport
       indices.collect { |key| self[convert_key(key)] }
     end
 
-    # Returns an exact copy of the hash.
+    # Returns a shallow copy of the hash.
+    #
+    #   hash = ActiveSupport::HashWithIndifferentAccess.new({ a: { b: 'b' } })
+    #   dup  = hash.dup
+    #   dup[:a][:c] = 'c'
+    #
+    #   hash[:a][:c] # => nil
+    #   dup[:a][:c]  # => "c"
     def dup
       self.class.new(self).tap do |new_hash|
         new_hash.default = default
@@ -238,11 +246,11 @@ module ActiveSupport
 
     # Convert to a regular hash with string keys.
     def to_hash
-      _new_hash= {}
+      _new_hash = Hash.new(default)
       each do |key, value|
-        _new_hash[convert_key(key)] = convert_value(value, for: :to_hash)
+        _new_hash[key] = convert_value(value, for: :to_hash)
       end
-      Hash.new(default).merge!(_new_hash)
+      _new_hash
     end
 
     protected

data/lib/active_support/i18n_railtie.rb

@@ -8,8 +8,6 @@ module I18n
     config.i18n.railties_load_path = []
     config.i18n.load_path = []
     config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
-    # Enforce I18n to check the available locales when setting a locale.
-    config.i18n.enforce_available_locales = true
 
     # Set the i18n configuration after initialization since a lot of
     # configuration is still usually done in application initializers.
@@ -36,11 +34,7 @@ module I18n
       # Avoid issues with setting the default_locale by disabling available locales
       # check while configuring.
       enforce_available_locales = app.config.i18n.delete(:enforce_available_locales)
-
-      if enforce_available_locales.nil?
-        enforce_available_locales = I18n.enforce_available_locales
-      end
-
+      enforce_available_locales = I18n.enforce_available_locales if enforce_available_locales.nil?
       I18n.enforce_available_locales = false
 
       app.config.i18n.each do |setting, value|

data/lib/active_support/inflector/inflections.rb

@@ -160,7 +160,7 @@ module ActiveSupport
       #   uncountable 'money', 'information'
       #   uncountable %w( money information rice )
       def uncountable(*words)
-        (@uncountables << words).flatten!
+        @uncountables += words.flatten.map(&:downcase)
       end
 
       # Specifies a humanized form of a string by a regular expression rule or