activesupport 5.1.1 → 5.1.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa2e16d1dbeb37a850d4f29b9976e2b97af04cb
-  data.tar.gz: b9d37cfff133a4bf90d61b3f9c2e20a42e68d5eb
+  metadata.gz: 93d2cfe880c83ec575177cb50412397a4c7058cc
+  data.tar.gz: 1f36f1d92087b31345ac6f3250da648d0959643b
 SHA512:
-  metadata.gz: 7428f4f737d838eca82d1ea3efdee001fd6a8d3f88ed244e1ce036d7adaaa7fc2ac833723a05ed647a34284345b3de4d27b6cbd6401dfef1664acb1ac0a857fa
-  data.tar.gz: 694198ea6585501a6c0cfa56aee42c94811c0d05b3e83a5b2cac9bcf3650cba8cef5a9484fd44fa58705c2a166ead565f2580e040b151473607eb5e3171ad81a
+  metadata.gz: 97cb325630df684e61978d04c9c68a10f728bf1ad56cc49170d22a9cf89e606dbcbf9dadb7075aaf6f698ffb5e2455b6a2a9776547196aec2e76a262c60f8485
+  data.tar.gz: 8de7d7dbc0beb11270d7448217160cf50accd9616749378fcbc99eb78d6f7fa416f75eb30de1c4f9a5bf6ad2867d53f9c41359c2320a372bc1fb68c95e55606a

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+## Rails 5.1.2.rc1 (June 20, 2017) ##
+
+*   Cache: Restore the `options = nil` argument for `LocalStore#clear`
+    that was removed in 5.1.0. Restores compatibility with backends that
+    take an options argument and use the local cache strategy.
+
+    *Jeremy Daer*
+
+*   Fix implicit coercion calculations with scalars and durations
+
+    Previously calculations where the scalar is first would be converted to a duration
+    of seconds but this causes issues with dates being converted to times, e.g:
+
+        Time.zone = "Beijing"           # => Asia/Shanghai
+        date = Date.civil(2017, 5, 20)  # => Mon, 20 May 2017
+        2 * 1.day                       # => 172800 seconds
+        date + 2 * 1.day                # => Mon, 22 May 2017 00:00:00 CST +08:00
+
+    Now the `ActiveSupport::Duration::Scalar` calculation methods will try to maintain
+    the part structure of the duration where possible, e.g:
+
+        Time.zone = "Beijing"           # => Asia/Shanghai
+        date = Date.civil(2017, 5, 20)  # => Mon, 20 May 2017
+        2 * 1.day                       # => 2 days
+        date + 2 * 1.day                # => Mon, 22 May 2017
+
+    Fixes #29160, #28970.
+
+    *Andrew White*
+
+
+## Rails 5.1.1 (May 12, 2017) ##
+
+*   No changes.
+
+
 ## Rails 5.1.0 (April 27, 2017) ##
 
 *   `ActiveSupport::EventedFileUpdateChecker` no longer listens to

data/lib/active_support/cache.rb

@@ -466,7 +466,7 @@ module ActiveSupport
       # The options hash is passed to the underlying cache implementation.
       #
       # All implementations may not support this method.
-      def clear
+      def clear(options = nil)
         raise NotImplementedError.new("#{self.class.name} does not support clear")
       end
 

data/lib/active_support/cache/file_store.rb

@@ -27,7 +27,7 @@ module ActiveSupport
       # Deletes all items from the cache. In this case it deletes all the entries in the specified
       # 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
+      def clear(options = nil)
         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

data/lib/active_support/cache/strategy/local_cache.rb

@@ -44,7 +44,7 @@ module ActiveSupport
             yield
           end
 
-          def clear
+          def clear(options = nil)
             @data.clear
           end
 
@@ -79,9 +79,9 @@ module ActiveSupport
             local_cache_key)
         end
 
-        def clear # :nodoc:
+        def clear(options = nil) # :nodoc:
           return super unless cache = local_cache
-          cache.clear
+          cache.clear(options)
           super
         end
 

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

@@ -124,21 +124,31 @@ class Method
 end
 
 class Complex
-  # Complexes are not duplicable:
-  #
-  # Complex(1).duplicable? # => false
-  # Complex(1).dup         # => TypeError: can't copy Complex
-  def duplicable?
-    false
+  begin
+    Complex(1).dup
+  rescue TypeError
+
+    # Complexes are not duplicable for RUBY_VERSION < 2.5.0:
+    #
+    # Complex(1).duplicable? # => false
+    # Complex(1).dup         # => TypeError: can't copy Complex
+    def duplicable?
+      false
+    end
   end
 end
 
 class Rational
-  # Rationals are not duplicable:
-  #
-  # Rational(1).duplicable? # => false
-  # Rational(1).dup         # => TypeError: can't copy Rational
-  def duplicable?
-    false
+  begin
+    Rational(1).dup
+  rescue TypeError
+
+    # Rationals are not duplicable for RUBY_VERSION < 2.5.0:
+    #
+    # Rational(1).duplicable? # => false
+    # Rational(1).dup         # => TypeError: can't copy Rational
+    def duplicable?
+      false
+    end
   end
 end

data/lib/active_support/duration.rb

@@ -37,27 +37,56 @@ module ActiveSupport
       end
 
       def +(other)
-        calculate(:+, other)
+        if Duration === other
+          seconds   = value + other.parts[:seconds]
+          new_parts = other.parts.merge(seconds: seconds)
+          new_value = value + other.value
+
+          Duration.new(new_value, new_parts)
+        else
+          calculate(:+, other)
+        end
       end
 
       def -(other)
-        calculate(:-, other)
+        if Duration === other
+          seconds   = value - other.parts[:seconds]
+          new_parts = other.parts.map { |part, other_value| [part, -other_value] }.to_h
+          new_parts = new_parts.merge(seconds: seconds)
+          new_value = value - other.value
+
+          Duration.new(new_value, new_parts)
+        else
+          calculate(:-, other)
+        end
       end
 
       def *(other)
-        calculate(:*, other)
+        if Duration === other
+          new_parts = other.parts.map { |part, other_value| [part, value * other_value] }.to_h
+          new_value = value * other.value
+
+          Duration.new(new_value, new_parts)
+        else
+          calculate(:*, other)
+        end
       end
 
       def /(other)
-        calculate(:/, other)
+        if Duration === other
+          new_parts = other.parts.map { |part, other_value| [part, value / other_value] }.to_h
+          new_value = new_parts.inject(0) { |total, (part, value)| total + value * Duration::PARTS_IN_SECONDS[part] }
+
+          Duration.new(new_value, new_parts)
+        else
+          calculate(:/, other)
+        end
       end
 
       private
         def calculate(op, other)
           if Scalar === other
             Scalar.new(value.public_send(op, other.value))
-          elsif Duration === other
-            Duration.seconds(value).public_send(op, other)
           elsif Numeric === other
             Scalar.new(value.public_send(op, other))
           else

data/lib/active_support/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveSupport
   module VERSION
     MAJOR = 5
     MINOR = 1
-    TINY  = 1
-    PRE   = nil
+    TINY  = 2
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_support/log_subscriber.rb

@@ -81,8 +81,10 @@ module ActiveSupport
 
     def finish(name, id, payload)
       super if logger
-    rescue Exception => e
-      logger.error "Could not log #{name.inspect} event. #{e.class}: #{e.message} #{e.backtrace}"
+    rescue => e
+      if logger
+        logger.error "Could not log #{name.inspect} event. #{e.class}: #{e.message} #{e.backtrace}"
+      end
     end
 
   private

data/lib/active_support/message_encryptor.rb

@@ -115,7 +115,7 @@ module ActiveSupport
         # Currently the OpenSSL bindings do not raise an error if auth_tag is
         # truncated, which would allow an attacker to easily forge it. See
         # https://github.com/ruby/openssl/issues/63
-        raise InvalidMessage if aead_mode? && auth_tag.bytes.length != 16
+        raise InvalidMessage if aead_mode? && (auth_tag.nil? || auth_tag.bytes.length != 16)
 
         cipher.decrypt
         cipher.key = @secret

data/lib/active_support/number_helper.rb

@@ -4,6 +4,7 @@ module ActiveSupport
 
     eager_autoload do
       autoload :NumberConverter
+      autoload :RoundingHelper
       autoload :NumberToRoundedConverter
       autoload :NumberToDelimitedConverter
       autoload :NumberToHumanConverter

data/lib/active_support/number_helper/number_to_human_converter.rb

@@ -9,6 +9,7 @@ module ActiveSupport
       self.validate_float = true
 
       def convert # :nodoc:
+        @number = RoundingHelper.new(options).round(number)
         @number = Float(number)
 
         # for backwards compatibility with those that didn't add strip_insignificant_zeros to their locale files
@@ -20,10 +21,7 @@ module ActiveSupport
         exponent = calculate_exponent(units)
         @number = number / (10**exponent)
 
-        until (rounded_number = NumberToRoundedConverter.convert(number, options)) != NumberToRoundedConverter.convert(1000, options)
-          @number = number / 1000.0
-          exponent += 3
-        end
+        rounded_number = NumberToRoundedConverter.convert(number, options)
         unit = determine_unit(units, exponent)
         format.gsub("%n".freeze, rounded_number).gsub("%u".freeze, unit).strip
       end

data/lib/active_support/number_helper/number_to_rounded_converter.rb

@@ -5,26 +5,14 @@ module ActiveSupport
       self.validate_float = true
 
       def convert
-        precision = options.delete :precision
+        helper = RoundingHelper.new(options)
+        rounded_number = helper.round(number)
 
-        if precision
-          case number
-          when Float, String
-            @number = BigDecimal(number.to_s)
-          when Rational
-            @number = BigDecimal(number, digit_count(number.to_i) + precision)
-          else
-            @number = number.to_d
-          end
-
-          if options.delete(:significant) && precision > 0
-            digits, rounded_number = digits_and_rounded_number(precision)
+        if precision = options[:precision]
+          if options[:significant] && precision > 0
+            digits = helper.digit_count(rounded_number)
             precision -= digits
             precision = 0 if precision < 0 # don't let it be negative
-          else
-            rounded_number = number.round(precision)
-            rounded_number = rounded_number.to_i if precision == 0 && rounded_number.finite?
-            rounded_number = rounded_number.abs if rounded_number.zero? # prevent showing negative zeros
           end
 
           formatted_string =
@@ -38,7 +26,7 @@ module ActiveSupport
               "%00.#{precision}f" % rounded_number
             end
         else
-          formatted_string = number
+          formatted_string = rounded_number
         end
 
         delimited_number = NumberToDelimitedConverter.convert(formatted_string, options)
@@ -79,14 +67,6 @@ module ActiveSupport
             number
           end
         end
-
-        def absolute_number(number)
-          number.respond_to?(:abs) ? number.abs : number.to_d.abs
-        end
-
-        def zero?
-          number.respond_to?(:zero?) ? number.zero? : number.to_d.zero?
-        end
     end
   end
 end

data/lib/active_support/number_helper/rounding_helper.rb

@@ -0,0 +1,64 @@
+module ActiveSupport
+  module NumberHelper
+    class RoundingHelper # :nodoc:
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+
+      def round(number)
+        return number unless precision
+        number = convert_to_decimal(number)
+        if significant && precision > 0
+          round_significant(number)
+        else
+          round_without_significant(number)
+        end
+      end
+
+      def digit_count(number)
+        return 1 if number.zero?
+        (Math.log10(absolute_number(number)) + 1).floor
+      end
+
+      private
+        def round_without_significant(number)
+          number = number.round(precision)
+          number = number.to_i if precision == 0 && number.finite?
+          number = number.abs if number.zero? # prevent showing negative zeros
+          number
+        end
+
+        def round_significant(number)
+          return 0 if number.zero?
+          digits = digit_count(number)
+          multiplier = 10**(digits - precision)
+          (number / BigDecimal.new(multiplier.to_f.to_s)).round * multiplier
+        end
+
+        def convert_to_decimal(number)
+          case number
+          when Float, String
+            number = BigDecimal(number.to_s)
+          when Rational
+            number = BigDecimal(number, digit_count(number.to_i) + precision)
+          else
+            number = number.to_d
+          end
+        end
+
+        def precision
+          options[:precision]
+        end
+
+        def significant
+          options[:significant]
+        end
+
+        def absolute_number(number)
+          number.respond_to?(:abs) ? number.abs : number.to_d.abs
+        end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -271,6 +271,7 @@ files:
 - lib/active_support/number_helper/number_to_percentage_converter.rb
 - lib/active_support/number_helper/number_to_phone_converter.rb
 - lib/active_support/number_helper/number_to_rounded_converter.rb
+- lib/active_support/number_helper/rounding_helper.rb
 - lib/active_support/option_merger.rb
 - lib/active_support/ordered_hash.rb
 - lib/active_support/ordered_options.rb
@@ -326,15 +327,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the
   Rails framework.
 test_files: []
-has_rdoc: