activesupport 4.2.0.beta3 → 4.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703dda1615155dd91e7e7ba42a186ba291b81ca9
-  data.tar.gz: 5b082d317e6770ddcc2922eccbbb4e503f5a245e
+  metadata.gz: 977535bf869ab9b1cd7302daad1d884ba844fd04
+  data.tar.gz: 6ab3b58355d80563255e185ca657dc5667a741ec
 SHA512:
-  metadata.gz: eefb467f487c7130ee6bef6defada1eadaece7854d2b5030f46bdef1b2ff8c2cd4b5163620d208838db40fc7337dfddfa2bf3716275ffd0669c513ff4287fe8d
-  data.tar.gz: 881695a1fb2a41a60825c1994f0385a323af0d13b510e266f128f162ee59e1d382b9691bc896b419e83118b3158357918d54f492e1d105f4c171e293f43b58dd
+  metadata.gz: 059eb20ff7658055d192c7bbe278284ff5108a2af3f1cdbccce1ba191836e0ab5c1f4f24d6ea621eb9ede68c0f523760e6f93546c9fd3df937feaaef28712c4f
+  data.tar.gz: 5d6e3f0f0a07e827e67f48e4b9805d3f22f5bee08241205c6962d2a3e7d9c6d7524887e1e6052cbdfdd3c67b247afcae0b81504a10bf25b52b06dfca1f0714cf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+*   TimeWithZone#strftime now delegates every directive to Time#strftime except for '%Z',
+    it also now correctly handles escaped '%' characters placed just before time zone related directives.
+
+    *Pablo Herrero*
+
+*   Corrected Inflector#underscore handling of multiple successive acroynms.
+
+    *James Le Cuirot*
+
 *   Delegation now works with ruby reserved words passed to `:to` option.
 
     Fixes #16956.
@@ -19,8 +28,8 @@
 
     *Joost Lubach*
 
-*   Time#change can now change nanoseconds (:nsec) as a higher-precision
-    alternative to microseconds (:usec).
+*   `Time#change` can now change nanoseconds (`:nsec`) as a higher-precision
+    alternative to microseconds (`:usec`).
 
     *Agis Anastasooulos*
 
@@ -35,14 +44,14 @@
 
     *Akira Matsuda*, *Godfrey Chan*
 
-*   Fixed a bug in Inflector#underscore where acroynms in nested constant names
+*   Fixed a bug in `Inflector#underscore` where acroynms in nested constant names
     are incorrectly parsed as camelCase.
 
     Fixes #8015.
 
     *Fred Wu*, *Matthew Draper*
 
-*   Make Time#change throw an exception if the :usec option is out of range and
+*   Make `Time#change` throw an exception if the `:usec` option is out of range and
     the time has an offset other than UTC or local.
 
     *Agis Anastasopoulos*
@@ -59,15 +68,15 @@
 
     *Guo Xiang Tan*
 
-*   Added instance_eval version to Object#try, so you can do this:
+*   Added instance_eval version to Object#try and Object#try!, so you can do this:
 
-      person.try { name.first }
+        person.try { name.first }
 
     instead of:
 
-      person.try { |person| person.name.first }
+        person.try { |person| person.name.first }
 
-    *DHH*
+    *DHH*, *Ari Pollak*
 
 *   Fix the `ActiveSupport::Duration#instance_of?` method to return the right
     value with the class itself since it was previously delegated to the
@@ -75,12 +84,12 @@
 
     *Robin Dupret*
 
-*   Fix rounding errors with #travel_to by resetting the usec on any passed time to zero, so we only travel
+*   Fix rounding errors with `#travel_to` by resetting the usec on any passed time to zero, so we only travel
     with per-second precision, not anything deeper than that.
 
     *DHH*
 
-*   Fix DateTime comparison with DateTime::Infinity object.
+*   Fix DateTime comparison with `DateTime::Infinity` object.
 
     *Rafael Mendonça França*
 
@@ -318,8 +327,8 @@
     *Pavel Pravosud*
 
 *   `HashWithIndifferentAccess` better respects `#to_hash` on objects it
-    recieves. In particular, `.new`, `#update`, `#merge`, `#replace` all accept
-    objects which respond to `#to_hash`, even if those objects are not Hashes
+    receives. In particular, `.new`, `#update`, `#merge`, and `#replace` accept
+    objects which respond to `#to_hash`, even if those objects are not hashes
     directly.
 
     *Peter Jaros*

data/lib/active_support/callbacks.rb

@@ -78,18 +78,21 @@ module ActiveSupport
     #     save
     #   end
     def run_callbacks(kind, &block)
-      cbs = send("_#{kind}_callbacks")
-      if cbs.empty?
-        yield if block_given?
+      send "_run_#{kind}_callbacks", &block
+    end
+
+    private
+
+    def _run_callbacks(callbacks, &block)
+      if callbacks.empty?
+        block.call if block
       else
-        runner = cbs.compile
+        runner = callbacks.compile
         e = Filters::Environment.new(self, false, nil, block)
         runner.call(e).value
       end
     end
 
-    private
-
     # A hook invoked every time a before callback is halted.
     # This can be overridden in AS::Callback implementors in order
     # to provide better debugging/logging.
@@ -556,7 +559,7 @@ module ActiveSupport
       # This is used internally to append, prepend and skip callbacks to the
       # CallbackChain.
       def __update_callbacks(name) #:nodoc:
-        ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target|
+        ([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse_each do |target|
           chain = target.get_callbacks name
           yield target, chain.dup
         end
@@ -716,12 +719,21 @@ module ActiveSupport
       #     define_callbacks :save, scope: [:name]
       #
       #   would call <tt>Audit#save</tt>.
+      #
+      # NOTE: +method_name+ passed to `define_model_callbacks` must not end with
+      # `!`, `?` or `=`.
       def define_callbacks(*names)
         options = names.extract_options!
 
         names.each do |name|
           class_attribute "_#{name}_callbacks"
           set_callbacks name, CallbackChain.new(name, options)
+
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def _run_#{name}_callbacks(&block)
+              _run_callbacks(_#{name}_callbacks, &block)
+            end
+          RUBY
         end
       end
 

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

@@ -20,7 +20,11 @@ class Array
   #   %w( a b c d ).to(-2) # => ["a", "b", "c"]
   #   %w( a b c ).to(-10)  # => []
   def to(position)
-    self[0..position]
+    if position >= 0
+      first position + 1
+    else
+      self[0..position]
+    end
   end
 
   # Equal to <tt>self[1]</tt>.

data/lib/active_support/core_ext/file/atomic.rb

@@ -40,7 +40,7 @@ class File
       chown(old_stat.uid, old_stat.gid, file_name)
       # This operation will affect filesystem ACL's
       chmod(old_stat.mode, file_name)
-    rescue Errno::EPERM
+    rescue Errno::EPERM, Errno::EACCES
       # Changing file ownership failed, moving on.
     end
   end

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

@@ -32,7 +32,7 @@ module Kernel
   # For compatibility
   def silence_stderr #:nodoc:
     ActiveSupport::Deprecation.warn(
-      "#silence_stderr is deprecated and will be removed in the next release"
+      "`#silence_stderr` is deprecated and will be removed in the next release."
     ) #not thread-safe
     silence_stream(STDERR) { yield }
   end
@@ -87,7 +87,7 @@ module Kernel
   #   stream # => "error\n"
   def capture(stream)
     ActiveSupport::Deprecation.warn(
-      "#capture(stream) is deprecated and will be removed in the next release"
+      "`#capture(stream)` is deprecated and will be removed in the next release."
     ) #not thread-safe
     stream = stream.to_s
     captured_stream = Tempfile.new(stream)
@@ -113,7 +113,7 @@ module Kernel
   # This method is not thread-safe.
   def quietly
     ActiveSupport::Deprecation.warn(
-      "#quietly is deprecated and will be removed in the next release"
+      "`#quietly` is deprecated and will be removed in the next release."
     ) #not thread-safe
     silence_stream(STDOUT) do
       silence_stream(STDERR) do

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

@@ -19,9 +19,9 @@ class Module
   #   alias_method :foo_without_feature?, :foo?
   #   alias_method :foo?, :foo_with_feature?
   #
-  # so you can safely chain foo, foo?, and foo! with the same feature.
+  # so you can safely chain foo, foo?, foo! and/or foo= with the same feature.
   def alias_method_chain(target, feature)
-    # Strip out punctuation on predicates or bang methods since
+    # 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
     yield(aliased_target, punctuation) if block_given?

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

@@ -9,7 +9,23 @@ class Object
   #
   # instead of
   #
-  #   @person ? @person.name : nil
+  #   @person.name if @person
+  #
+  # +try+ calls can be chained:
+  #
+  #   @person.try(:spouse).try(:name)
+  #
+  # instead of
+  #
+  #   @person.spouse.name if @person && @person.spouse
+  #
+  # +try+ will also return +nil+ if the receiver does not respond to the method:
+  #
+  #   @person.try(:non_existing_method) #=> nil
+  #
+  # instead of
+  #
+  #   @person.non_existing_method if @person.respond_to?(:non_existing_method) #=> nil
   #
   # +try+ returns +nil+ when called on +nil+ regardless of whether it responds
   # to the method:
@@ -24,7 +40,7 @@ class Object
   #
   # The number of arguments in the signature must match. If the object responds
   # to the method the call is attempted and +ArgumentError+ is still raised
-  # otherwise.
+  # in case of argument mismatch.
   #
   # If +try+ is called without arguments it yields the receiver to a given
   # block unless it is +nil+:
@@ -38,28 +54,25 @@ class Object
   #
   #   @person.try { upcase.truncate(50) }
   #
-  # Please also note that +try+ is defined on +Object+, therefore it won't work
+  # Please also note that +try+ is defined on +Object+. Therefore, it won't work
   # with instances of classes that do not have +Object+ among their ancestors,
   # like direct subclasses of +BasicObject+. For example, using +try+ with
   # +SimpleDelegator+ will delegate +try+ to the target instead of calling it on
-  # delegator itself.
+  # the delegator itself.
   def try(*a, &b)
+    try!(*a, &b) if a.empty? || respond_to?(a.first)
+  end
+
+  # Same as #try, but will raise a NoMethodError exception if the receiver is not +nil+ and
+  # does not implement the tried method.
+  
+  def try!(*a, &b)
     if a.empty? && block_given?
       if b.arity.zero?
         instance_eval(&b)
       else
         yield self
       end
-    else
-      public_send(*a, &b) if respond_to?(a.first)
-    end
-  end
-
-  # Same as #try, but will raise a NoMethodError exception if the receiving is not nil and
-  # does not implement the tried method.
-  def try!(*a, &b)
-    if a.empty? && block_given?
-      yield self
     else
       public_send(*a, &b)
     end
@@ -68,12 +81,12 @@ end
 
 class NilClass
   # Calling +try+ on +nil+ always returns +nil+.
-  # It becomes specially helpful when navigating through associations that may return +nil+.
+  # It becomes especially helpful when navigating through associations that may return +nil+.
   #
   #   nil.try(:name) # => nil
   #
   # Without +try+
-  #   @person && !@person.children.blank? && @person.children.first.name
+  #   @person && @person.children.any? && @person.children.first.name
   #
   # With +try+
   #   @person.try(:children).try(:first).try(:name)

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

@@ -47,7 +47,21 @@ class Object
   #   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.
+  #
+  # NOTE: Each nesting level will merge inherited defaults in addition to their own.
+  #
+  #   class Post < ActiveRecord::Base
+  #     with_options if: :persisted?, length: { minimum: 50 } do
+  #       validates :content, if: -> { content.present? }
+  #     end
+  #   end
+  #
+  # The code is equivalent to:
+  #
+  #   validates :content, length: { minimum: 50 }, if: -> { content.present? }
+  #
+  # Hence the inherited default for `if` key is ignored.
+  #
   def with_options(options, &block)
     option_merger = ActiveSupport::OptionMerger.new(self, options)
     block.arity.zero? ? option_merger.instance_eval(&block) : block.call(option_merger)

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

@@ -150,7 +150,7 @@ module ActiveSupport #:nodoc:
       else
         if html_safe?
           new_safe_buffer = super
-          new_safe_buffer.instance_eval { @html_safe = true }
+          new_safe_buffer.instance_variable_set :@html_safe, true
           new_safe_buffer
         else
           to_str[*args]

data/lib/active_support/dependencies.rb

@@ -30,6 +30,10 @@ module ActiveSupport #:nodoc:
     mattr_accessor :loaded
     self.loaded = Set.new
 
+    # Stack of files being loaded.
+    mattr_accessor :loading
+    self.loading = []
+
     # Should we load files or require them?
     mattr_accessor :mechanism
     self.mechanism = ENV['NO_RELOAD'] ? :require : :load
@@ -317,6 +321,7 @@ module ActiveSupport #:nodoc:
     def clear
       log_call
       loaded.clear
+      loading.clear
       remove_unloadable_constants!
     end
 
@@ -329,6 +334,7 @@ module ActiveSupport #:nodoc:
       # Record that we've seen this file *before* loading it to avoid an
       # infinite loop with mutual dependencies.
       loaded << expanded
+      loading << expanded
 
       begin
         if load?
@@ -351,6 +357,8 @@ module ActiveSupport #:nodoc:
       rescue Exception
         loaded.delete expanded
         raise
+      ensure
+        loading.pop
       end
 
       # Record history *after* loading so first load gets warnings.
@@ -475,7 +483,7 @@ module ActiveSupport #:nodoc:
         expanded = File.expand_path(file_path)
         expanded.sub!(/\.rb\z/, '')
 
-        if loaded.include?(expanded)
+        if loading.include?(expanded)
           raise "Circular dependency detected while autoloading constant #{qualified_name}"
         else
           require_or_load(expanded, qualified_name)

data/lib/active_support/duration.rb

@@ -63,6 +63,10 @@ module ActiveSupport
       Duration === other && other.value.eql?(value)
     end
 
+    def hash
+      @value.hash
+    end
+
     def self.===(other) #:nodoc:
       other.is_a?(Duration)
     rescue ::NoMethodError

data/lib/active_support/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveSupport
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/hash_with_indifferent_access.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/reverse_merge'
 
 module ActiveSupport
   # Implements a hash where keys <tt>:foo</tt> and <tt>"foo"</tt> are considered

data/lib/active_support/inflector/inflections.rb

@@ -154,7 +154,7 @@ module ActiveSupport
         end
       end
 
-      # Add uncountable words that shouldn't be attempted inflected.
+      # Specifies words that are uncountable and should not be inflected.
       #
       #   uncountable 'money'
       #   uncountable 'money', 'information'

data/lib/active_support/inflector/methods.rb

@@ -90,8 +90,8 @@ module ActiveSupport
     #   'SSLError'.underscore.camelize # => "SslError"
     def underscore(camel_cased_word)
       return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
-      word = camel_cased_word.to_s.gsub('::', '/')
-      word.gsub!(/(?:([A-Za-z\d])|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+      word = camel_cased_word.to_s.gsub(/::/, '/')
+      word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1 && '_'}#{$2.downcase}" }
       word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
       word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
       word.tr!("-", "_")

data/lib/active_support/json/decoding.rb

@@ -12,7 +12,7 @@ module ActiveSupport
     
     class << self
       # Parses a JSON string (JavaScript Object Notation) into a hash.
-      # See www.json.org for more info.
+      # See http://www.json.org for more info.
       #
       #   ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}")
       #   => {"team" => "rails", "players" => "36"}

data/lib/active_support/json/encoding.rb

@@ -13,7 +13,7 @@ module ActiveSupport
 
   module JSON
     # Dumps objects in JSON (JavaScript Object Notation).
-    # See www.json.org for more info.
+    # See http://www.json.org for more info.
     #
     #   ActiveSupport::JSON.encode({ team: 'rails', players: '36' })
     #   # => "{\"team\":\"rails\",\"players\":\"36\"}"
@@ -131,7 +131,7 @@ module ActiveSupport
             "The JSON encoder in Rails 4.1 no longer supports encoding BigDecimals as JSON numbers. Instead, " \
             "the new encoder will always encode them as strings.\n\n" \
             "You are seeing this error because you are trying to check the value of the related configuration, " \
-            "'active_support.encode_big_decimal_as_string'. If your application depends on this option, you should " \
+            "`active_support.encode_big_decimal_as_string`. If your application depends on this option, you should " \
             "add the 'activesupport-json_encoder' gem to your Gemfile. For now, this option will always be true. " \
             "In the future, it will be removed from Rails, so you should stop checking its value."
 

data/lib/active_support/message_verifier.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require 'active_support/core_ext/object/blank'
+require 'active_support/security_utils'
 
 module ActiveSupport
   # +MessageVerifier+ makes it easy to generate and verify messages which are
@@ -37,7 +38,7 @@ module ActiveSupport
       raise InvalidSignature if signed_message.blank?
 
       data, digest = signed_message.split("--")
-      if data.present? && digest.present? && secure_compare(digest, generate_digest(data))
+      if data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data))
         begin
           @serializer.load(::Base64.strict_decode64(data))
         rescue ArgumentError => argument_error
@@ -55,17 +56,6 @@ module ActiveSupport
     end
 
     private
-      # constant-time comparison algorithm to prevent timing attacks
-      def secure_compare(a, b)
-        return false unless a.bytesize == b.bytesize
-
-        l = a.unpack "C#{a.bytesize}"
-
-        res = 0
-        b.each_byte { |byte| res |= byte ^ l.shift }
-        res == 0
-      end
-
       def generate_digest(data)
         require 'openssl' unless defined?(OpenSSL)
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@digest).new, @secret, data)

data/lib/active_support/number_helper.rb

@@ -272,12 +272,12 @@ module ActiveSupport
     #   string containing an i18n scope where to find this hash. It
     #   might have the following keys:
     #   * *integers*: <tt>:unit</tt>, <tt>:ten</tt>,
-    #     *<tt>:hundred</tt>, <tt>:thousand</tt>, <tt>:million</tt>,
-    #     *<tt>:billion</tt>, <tt>:trillion</tt>,
-    #     *<tt>:quadrillion</tt>
+    #     <tt>:hundred</tt>, <tt>:thousand</tt>, <tt>:million</tt>,
+    #     <tt>:billion</tt>, <tt>:trillion</tt>,
+    #     <tt>:quadrillion</tt>
     #   * *fractionals*: <tt>:deci</tt>, <tt>:centi</tt>,
-    #     *<tt>:mili</tt>, <tt>:micro</tt>, <tt>:nano</tt>,
-    #     *<tt>:pico</tt>, <tt>:femto</tt>
+    #     <tt>:mili</tt>, <tt>:micro</tt>, <tt>:nano</tt>,
+    #     <tt>:pico</tt>, <tt>:femto</tt>
     # * <tt>:format</tt> - Sets the format of the output string
     #   (defaults to "%n %u"). The field types are:
     #   * %u - The quantifier (ex.: 'thousand')

data/lib/active_support/number_helper/number_to_currency_converter.rb

@@ -13,7 +13,7 @@ module ActiveSupport
         end
 
         rounded_number = NumberToRoundedConverter.convert(number, options)
-        format.gsub('%n', rounded_number).gsub('%u', options[:unit])
+        format.gsub(/%n/, rounded_number).gsub(/%u/, options[:unit])
       end
 
       private

data/lib/active_support/number_helper/number_to_percentage_converter.rb

@@ -5,7 +5,7 @@ module ActiveSupport
 
       def convert
         rounded_number = NumberToRoundedConverter.convert(number, options)
-        options[:format].gsub('%n', rounded_number)
+        options[:format].gsub(/%n/, rounded_number)
       end
     end
   end

data/lib/active_support/security_utils.rb

@@ -0,0 +1,20 @@
+module ActiveSupport
+  module SecurityUtils
+    # Constant time string comparison.
+    #
+    # The values compared should be of fixed length, such as strings
+    # that have already been processed by HMAC. This should not be used
+    # on variable length plaintext strings because it could leak length info
+    # via timing attacks.
+    def secure_compare(a, b)
+      return false unless a.bytesize == b.bytesize
+
+      l = a.unpack "C#{a.bytesize}"
+
+      res = 0
+      b.each_byte { |byte| res |= byte ^ l.shift }
+      res == 0
+    end
+    module_function :secure_compare
+  end
+end

data/lib/active_support/test_case.rb

@@ -25,7 +25,7 @@ module ActiveSupport
 
         if test_order.nil?
           ActiveSupport::Deprecation.warn "You did not specify a value for the " \
-            "configuration option 'active_support.test_order'. In Rails 5.0, " \
+            "configuration option `active_support.test_order`. In Rails 5, " \
             "the default value of this option will change from `:sorted` to " \
             "`:random`.\n" \
             "To disable this warning and keep the current behavior, you can add " \

data/lib/active_support/testing/time_helpers.rb

@@ -90,7 +90,7 @@ module ActiveSupport
       #     Time.current # => Wed, 24 Nov 2004 01:04:44 EST -05:00
       #   end
       #   Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
-      def travel_to(date_or_time, &block)
+      def travel_to(date_or_time)
         if date_or_time.is_a?(Date) && !date_or_time.is_a?(DateTime)
           now = date_or_time.midnight.to_time
         else
@@ -102,7 +102,7 @@ module ActiveSupport
 
         if block_given?
           begin
-            block.call
+            yield
           ensure
             travel_back
           end

data/lib/active_support/time_with_zone.rb

@@ -75,8 +75,8 @@ module ActiveSupport
 
     # Returns a <tt>Time.local()</tt> instance of the simultaneous time in your
     # system's <tt>ENV['TZ']</tt> zone.
-    def localtime
-      utc.respond_to?(:getlocal) ? utc.getlocal : utc.to_time.getlocal
+    def localtime(utc_offset = nil)
+      utc.respond_to?(:getlocal) ? utc.getlocal(utc_offset) : utc.to_time.getlocal(utc_offset)
     end
     alias_method :getlocal, :localtime
 
@@ -201,15 +201,11 @@ module ActiveSupport
     end
     alias_method :to_formatted_s, :to_s
 
-    # Replaces <tt>%Z</tt> and <tt>%z</tt> directives with +zone+ and
-    # +formatted_offset+, respectively, before passing to Time#strftime, so
-    # that zone information is correct
+    # Replaces <tt>%Z</tt> directive with +zone before passing to Time#strftime,
+    # so that zone information is correct.
     def strftime(format)
-      format = format.gsub('%Z', zone)
-                     .gsub('%z',   formatted_offset(false))
-                     .gsub('%:z',  formatted_offset(true))
-                     .gsub('%::z', formatted_offset(true) + ":00")
-      time.strftime(format)
+      format = format.gsub(/((?:\A|[^%])(?:%%)*)%Z/, "\\1#{zone}")
+      getlocal(utc_offset).strftime(format)
     end
 
     # Use the time in UTC for comparisons.

data/lib/active_support/values/time_zone.rb

@@ -184,7 +184,7 @@ module ActiveSupport
     }
 
     UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
-    UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')
+    UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.tr(':', '')
 
     @lazy_zones_map = ThreadSafe::Cache.new
 

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta3
+  version: 4.2.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 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.0.beta1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.0.beta1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 description: A toolkit of support libraries and Ruby core extensions extracted from
@@ -291,6 +291,7 @@ files:
 - lib/active_support/rails.rb
 - lib/active_support/railtie.rb
 - lib/active_support/rescuable.rb
+- lib/active_support/security_utils.rb
 - lib/active_support/string_inquirer.rb
 - lib/active_support/subscriber.rb
 - lib/active_support/tagged_logging.rb
@@ -322,23 +323,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--encoding"
+- --encoding
 - UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the