activesupport 4.2.0.beta1 → 4.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87eea925ef4fa58abf42432943f13b713de57b3e
-  data.tar.gz: abc0910fb0e3f30c1c972713ebf60b02ef68cf32
+  metadata.gz: 6855c98b53b4f198dd4f49a962702e8430f2f350
+  data.tar.gz: bd5e7919ad2fa36d651dfaf9dc44ac90e06c2c98
 SHA512:
-  metadata.gz: d39d5653f9c06f2359a45acbe3048145fd1119eb8bb93528a619b99e5d500f63c88702a65833df05ac6463b25252ef51053a8add2b175d87aa88fe318c15f7b3
-  data.tar.gz: f8dbbb8ae2ee61e328f63332e393287eda7e14a1d6bd80a051e2c6808b7687c3757db369a5ace7476a5e7a182f90ad8302951290342061a2642c6c01764ac41b
+  metadata.gz: d641ebd16a416b3edc15bb2cb0dc66fe60f791a97657c63ad7bcb84c936a2014341fb47d26ec3cbe972bb72e64613cb45b691dc9167bd96067b233497490ae56
+  data.tar.gz: 5eeaa5cc8751d5d4070bc957cb02a426816fee1b793f756573099a432b62772447918a544d745a7128e05d1d4823e5244763f56af2addf0234d2e142817392e9

data/CHANGELOG.md

@@ -1,13 +1,84 @@
-*   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.
-    
+*   Delegation now works with ruby reserved words passed to `:to` option.
+
+    Fixes #16956.
+
+    *Agis Anastasopoulos*
+
+*   Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`.
+
+    Currently, the following returns `false`, contrary to expectation:
+
+        1.minute.eql?(1.minute)
+
+    Adding method `#eql?` will make this behave like expected. Method `#eql?` is
+    just a bit stricter than `#==`, as it checks whether the argument is also a duration. Their
+    parts may be different though.
+
+        1.minute.eql?(60.seconds)  # => true
+        1.minute.eql?(60)          # => false
+
+    *Joost Lubach*
+
+*   Time#change can now change nanoseconds (:nsec) as a higher-precision
+    alternative to microseconds (:usec).
+
+    *Agis Anastasooulos*
+
+*   `MessageVerifier.new` raises an appropriate exception if the secret is `nil`.
+    This prevents `MessageVerifier#generate` from raising a cryptic error later on.
+
+    *Kostiantyn Kahanskyi*
+
+*   Introduced new configuration option `active_support.test_order` for
+    specifying the order in which test cases are executed. This option currently defaults
+    to `:sorted` but will be changed to `:random` in Rails 5.0.
+
+    *Akira Matsuda*, *Godfrey Chan*
+
+*   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
+    the time has an offset other than UTC or local.
+
+    *Agis Anastasopoulos*
+
+*   `Method` objects now report themselves as not `duplicable?`. This allows
+    hashes and arrays containing `Method` objects to be `deep_dup`ed.
+
+    *Peter Jaros*
+
+*   `determine_constant_from_test_name` does no longer shadow `NameError`s
+    which happens during constant autoloading.
+
+    Fixes #9933.
+
+    *Guo Xiang Tan*
+
+*   Added instance_eval version to Object#try, so you can do this:
+
+      person.try { name.first }
+
+    instead of:
+
+      person.try { |person| person.name.first }
+
     *DHH*
 
-*   Fix ActiveSupport::TestCase not to order users' test cases by default.
-    If this change breaks your tests because your tests are order dependent, you need to explicitly call
-    ActiveSupport::TestCase.my_tests_are_order_dependent! at the top of your tests.
+*   Fix the `ActiveSupport::Duration#instance_of?` method to return the right
+    value with the class itself since it was previously delegated to the
+    internal value.
+
+    *Robin Dupret*
 
-    *Akira Matsuda*
+*   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.
 
@@ -60,8 +131,8 @@
 
 *   Always instrument `ActiveSupport::Cache`.
 
-    Since `ActiveSupport::Notifications` only instrument items when there
-    are subscriber we don't need to disable instrumentation.
+    Since `ActiveSupport::Notifications` only instruments items when there
+    are attached subscribers, we don't need to disable instrumentation.
 
     *Peter Wagenet*
 
@@ -84,17 +155,17 @@
     `ActiveSupport::TimeWithZone#-` should return the same result as if we were
     using `Time#-`:
 
-        Time.now.end_of_day - Time.now.beginning_of_day #=> 86399.999999999
+        Time.now.end_of_day - Time.now.beginning_of_day # => 86399.999999999
 
     Before:
 
-        Time.zone.now.end_of_day.nsec #=> 999999999
-        Time.zone.now.end_of_day - Time.zone.now.beginning_of_day #=> 86400.0
+        Time.zone.now.end_of_day.nsec # => 999999999
+        Time.zone.now.end_of_day - Time.zone.now.beginning_of_day # => 86400.0
 
     After:
 
         Time.zone.now.end_of_day - Time.zone.now.beginning_of_day
-        #=> 86399.999999999
+        # => 86399.999999999
 
     *Gordon Chan*
 
@@ -103,12 +174,12 @@
     Before:
 
         ActiveSupport::NumberHelper.number_to_rounded Rational(1000, 3), precision: 2
-        #=> "330.00"
+        # => "330.00"
 
     After:
 
         ActiveSupport::NumberHelper.number_to_rounded Rational(1000, 3), precision: 2
-        #=> "333.33"
+        # => "333.33"
 
     See #15379.
 
@@ -190,9 +261,9 @@
 
     *Xavier Noria*
 
-*   Fixed backward compatibility isues introduced in 326e652.
+*   Fixed backward compatibility issues introduced in 326e652.
 
-    Empty Hash or Array should not present in serialization result.
+    Empty Hash or Array should not be present in serialization result.
 
         {a: []}.to_query # => ""
         {a: {}}.to_query # => ""
@@ -211,20 +282,20 @@
 
     This fixes the current situation of:
 
-        1.second.eql?(1.second) #=> false
+        1.second.eql?(1.second) # => false
 
     `eql?` also requires that the other object is an `ActiveSupport::Duration`.
     This requirement makes `ActiveSupport::Duration`'s behavior consistent with
     the behavior of Ruby's numeric types:
 
-        1.eql?(1.0) #=> false
-        1.0.eql?(1) #=> false
+        1.eql?(1.0) # => false
+        1.0.eql?(1) # => false
 
-        1.second.eql?(1) #=> false (was true)
-        1.eql?(1.second) #=> false
+        1.second.eql?(1) # => false (was true)
+        1.eql?(1.second) # => false
 
         { 1 => "foo", 1.0 => "bar" }
-        #=> { 1 => "foo", 1.0 => "bar" }
+        # => { 1 => "foo", 1.0 => "bar" }
 
         { 1 => "foo", 1.second => "bar" }
         # now => { 1 => "foo", 1.second => "bar" }
@@ -232,11 +303,11 @@
 
     And though the behavior of these hasn't changed, for reference:
 
-        1 == 1.0 #=> true
-        1.0 == 1 #=> true
+        1 == 1.0 # => true
+        1.0 == 1 # => true
 
-        1 == 1.second #=> true
-        1.second == 1 #=> true
+        1 == 1.second # => true
+        1.second == 1 # => true
 
     *Emily Dobervich*
 
@@ -246,8 +317,8 @@
 
     *Pavel Pravosud*
 
-*   `HashWithIndifferentAccess` better respects `#to_hash` on objects it's
-    given. In particular, `.new`, `#update`, `#merge`, `#replace` all accept
+*   `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
     directly.
 

data/lib/active_support.rb

@@ -70,6 +70,16 @@ module ActiveSupport
 
     NumberHelper.eager_load!
   end
+
+  @@test_order = nil
+
+  def self.test_order=(new_order)
+    @@test_order = new_order
+  end
+
+  def self.test_order
+    @@test_order
+  end
 end
 
 autoload :I18n, "active_support/i18n"

data/lib/active_support/concern.rb

@@ -95,7 +95,7 @@ module ActiveSupport
   #   end
   #
   #   class Host
-  #     include Bar # works, Bar takes care now of its dependencies
+  #     include Bar # It works, now Bar takes care of its dependencies
   #   end
   module Concern
     class MultipleIncludedBlocks < StandardError #:nodoc:

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

@@ -1,8 +1,16 @@
+require 'set'
+
 class Module
   # Error generated by +delegate+ when a method is called on +nil+ and +allow_nil+
   # option is not used.
   class DelegationError < NoMethodError; end
 
+  RUBY_RESERVED_WORDS = Set.new(
+    %w(alias and BEGIN begin break case class def defined? do else elsif END
+       end ensure false for if in module next nil not or redo rescue retry
+       return self super then true undef unless until when while yield)
+  ).freeze
+
   # Provides a +delegate+ class method to easily expose contained objects'
   # public methods as your own.
   #
@@ -163,7 +171,7 @@ class Module
     line = line.to_i
 
     to = to.to_s
-    to = 'self.class' if to == 'class'
+    to = "self.#{to}" if RUBY_RESERVED_WORDS.include?(to)
 
     methods.each do |method|
       # Attribute writer methods only accept one argument. Makes sure []=

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

@@ -91,3 +91,13 @@ 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

@@ -1,6 +1,9 @@
 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:
+  # TODO: Remove this file when we drop support for Ruby < 2.2
+  unless respond_to?(:itself)
+    # Returns the object itself.
+    #
+    # Useful for chaining methods, such as Active Record scopes:
     #
     #   Event.public_send(state.presence_in([ :trashed, :drafted ]) || :itself).order(:created_at)
     #

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

@@ -33,6 +33,11 @@ class Object
   #     ...
   #   end
   #
+  # You can also call try with a block without accepting an argument, and the block
+  # will be instance_eval'ed instead:
+  #
+  #   @person.try { upcase.truncate(50) }
+  #
   # 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
@@ -40,7 +45,11 @@ class Object
   # delegator itself.
   def try(*a, &b)
     if a.empty? && block_given?
-      yield self
+      if b.arity.zero?
+        instance_eval(&b)
+      else
+        yield self
+      end
     else
       public_send(*a, &b) if respond_to?(a.first)
     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 like mongolian vowel separator (U+180E).
+  # Note that it handles both ASCII and Unicode whitespace.
   #
   #   %{ Multi-line
   #      string }.squish                   # => "Multi-line string"

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

@@ -199,6 +199,7 @@ class String
   #   'employee_salary'.humanize              # => "Employee salary"
   #   'author_id'.humanize                    # => "Author"
   #   'author_id'.humanize(capitalize: false) # => "author"
+  #   '_id'.humanize                          # => "Id"
   def humanize(options = {})
     ActiveSupport::Inflector.humanize(self, options)
   end

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

@@ -64,11 +64,12 @@ class Time
 
   # Returns a new Time where one or more of the elements have been changed according
   # to the +options+ parameter. The time options (<tt>:hour</tt>, <tt>:min</tt>,
-  # <tt>:sec</tt>, <tt>:usec</tt>) reset cascadingly, so if only the hour is passed,
-  # then minute, sec, and usec is set to 0. If the hour and minute is passed, then
-  # sec and usec is set to 0.  The +options+ parameter takes a hash with any of these
-  # keys: <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:min</tt>,
-  # <tt>:sec</tt>, <tt>:usec</tt>.
+  # <tt>:sec</tt>, <tt>:usec</tt>, <tt>:nsec</tt>) reset cascadingly, so if only
+  # the hour is passed, then minute, sec, usec and nsec is set to 0. If the hour
+  # and minute is passed, then sec, usec and nsec is set to 0. The +options+
+  # parameter takes a hash with any of these keys: <tt>:year</tt>, <tt>:month</tt>,
+  # <tt>:day</tt>, <tt>:hour</tt>, <tt>:min</tt>, <tt>:sec</tt>, <tt>:usec</tt>
+  # <tt>:nsec</tt>. Path either <tt>:usec</tt> or <tt>:nsec</tt>, not both.
   #
   #   Time.new(2012, 8, 29, 22, 35, 0).change(day: 1)              # => Time.new(2012, 8, 1, 22, 35, 0)
   #   Time.new(2012, 8, 29, 22, 35, 0).change(year: 1981, day: 1)  # => Time.new(1981, 8, 1, 22, 35, 0)
@@ -80,13 +81,20 @@ class Time
     new_hour  = options.fetch(:hour, hour)
     new_min   = options.fetch(:min, options[:hour] ? 0 : min)
     new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
-    new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    if new_nsec = options[:nsec]
+      raise ArgumentError, "Can't change both :nsec and :usec at the same time: #{options.inspect}" if options[:usec]
+      new_usec = Rational(new_nsec, 1000)
+    else
+      new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+    end
 
     if utc?
       ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
     elsif zone
       ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
     else
+      raise ArgumentError, 'argument out of range' if new_usec > 999999
       ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
     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 = '4.2', gem_name = 'Rails')
+    def initialize(deprecation_horizon = '5.0', 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/duration.rb

@@ -7,7 +7,7 @@ module ActiveSupport
   # Time#advance, respectively. It mainly supports the methods on Numeric.
   #
   #   1.month.ago       # equivalent to Time.now.advance(months: -1)
-  class Duration < ProxyObject
+  class Duration
     attr_accessor :value, :parts
 
     def initialize(value, parts) #:nodoc:
@@ -39,6 +39,10 @@ module ActiveSupport
     end
     alias :kind_of? :is_a?
 
+    def instance_of?(klass) # :nodoc:
+      Duration == klass || value.instance_of?(klass)
+    end
+
     # Returns +true+ if +other+ is also a Duration instance with the
     # same +value+, or if <tt>other == value</tt>.
     def ==(other)
@@ -49,8 +53,14 @@ module ActiveSupport
       end
     end
 
+    def to_s
+      @value.to_s
+    end
+
+    # Returns +true+ if +other+ is also a Duration instance, which has the
+    # same parts as this one.
     def eql?(other)
-      other.is_a?(Duration) && self == other
+      Duration === other && other.value.eql?(value)
     end
 
     def self.===(other) #:nodoc:
@@ -85,6 +95,10 @@ module ActiveSupport
       to_i
     end
 
+    def respond_to_missing?(method, include_private=false) #:nodoc
+      @value.respond_to?(method, include_private)
+    end
+
     protected
 
       def sum(sign, time = ::Time.current) #:nodoc:

data/lib/active_support/gem_version.rb

@@ -1,5 +1,5 @@
 module ActiveSupport
-  # Returns the version of the currently loaded ActiveSupport as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded Active Support as a <tt>Gem::Version</tt>
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
@@ -8,7 +8,7 @@ module ActiveSupport
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/inflector/methods.rb

@@ -91,7 +91,7 @@ module ActiveSupport
     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])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+      word.gsub!(/(?:([A-Za-z\d])|\b)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$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/message_verifier.rb

@@ -27,6 +27,7 @@ module ActiveSupport
     class InvalidSignature < StandardError; end
 
     def initialize(secret, options = {})
+      raise ArgumentError, 'Secret should not be nil.' unless secret
       @secret = secret
       @digest = options[:digest] || 'SHA1'
       @serializer = options[:serializer] || Marshal

data/lib/active_support/multibyte/unicode.rb

@@ -42,7 +42,6 @@ module ActiveSupport
         0x0085,                # White_Space # Cc       <control-0085>
         0x00A0,                # White_Space # Zs       NO-BREAK SPACE
         0x1680,                # White_Space # Zs       OGHAM SPACE MARK
-        0x180E,                # White_Space # Zs       MONGOLIAN VOWEL SEPARATOR
         (0x2000..0x200A).to_a, # White_Space # Zs  [11] EN QUAD..HAIR SPACE
         0x2028,                # White_Space # Zl       LINE SEPARATOR
         0x2029,                # White_Space # Zp       PARAGRAPH SEPARATOR

data/lib/active_support/number_helper/number_to_rounded_converter.rb

@@ -33,7 +33,7 @@ module ActiveSupport
             a, b = s.split('.', 2)
             a + '.' + b[0, precision]
           else
-            "%01.#{precision}f" % rounded_number
+            "%00.#{precision}f" % rounded_number
           end
 
         delimited_number = NumberToDelimitedConverter.convert(formatted_string, options)
@@ -59,7 +59,7 @@ module ActiveSupport
         end
 
         def digit_count(number)
-          (Math.log10(absolute_number(number)) + 1).floor
+          number.zero? ? 1 : (Math.log10(absolute_number(number)) + 1).floor
         end
 
         def strip_insignificant_zeros

data/lib/active_support/test_case.rb

@@ -16,6 +16,35 @@ module ActiveSupport
     Assertion = Minitest::Assertion
 
     class << self
+      def test_order=(new_order)
+        ActiveSupport.test_order = new_order
+      end
+
+      def test_order
+        test_order = ActiveSupport.test_order
+
+        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, " \
+            "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 " \
+            "the following line to your `config/environments/test.rb`:\n" \
+            "\n" \
+            "  Rails.application.configure do\n" \
+            "    config.active_support.test_order = :sorted\n" \
+            "  end\n" \
+            "\n" \
+            "Alternatively, you can opt into the future behavior by setting this " \
+            "option to `:random`."
+
+          test_order = :sorted
+          self.test_order = test_order
+        end
+
+        test_order
+      end
+
       alias :my_tests_are_order_dependent! :i_suck_and_my_tests_are_order_dependent!
     end
 

data/lib/active_support/testing/constant_lookup.rb

@@ -36,12 +36,8 @@ module ActiveSupport
           while names.size > 0 do
             names.last.sub!(/Test$/, "")
             begin
-              constant = names.join("::").constantize
+              constant = names.join("::").safe_constantize
               break(constant) if yield(constant)
-            rescue NoMethodError # subclass of NameError
-              raise
-            rescue NameError
-              # Constant wasn't found, move on
             ensure
               names.pop
             end

data/lib/active_support/values/time_zone.rb

@@ -276,8 +276,8 @@ module ActiveSupport
       if @utc_offset
         @utc_offset
       else
-        @current_period ||= tzinfo.try(:current_period)
-        @current_period.try(:utc_offset)
+        @current_period ||= tzinfo.current_period if tzinfo
+        @current_period.utc_offset if @current_period
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta1
+  version: 4.2.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n