activesupport 4.2.0.beta4 → 4.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977535bf869ab9b1cd7302daad1d884ba844fd04
-  data.tar.gz: 6ab3b58355d80563255e185ca657dc5667a741ec
+  metadata.gz: caee7cfa2a96aaf934d4cd377bb39757d4f16141
+  data.tar.gz: 7aff6e8441f05ce7683b27421df2d6980a4bcb14
 SHA512:
-  metadata.gz: 059eb20ff7658055d192c7bbe278284ff5108a2af3f1cdbccce1ba191836e0ab5c1f4f24d6ea621eb9ede68c0f523760e6f93546c9fd3df937feaaef28712c4f
-  data.tar.gz: 5d6e3f0f0a07e827e67f48e4b9805d3f22f5bee08241205c6962d2a3e7d9c6d7524887e1e6052cbdfdd3c67b247afcae0b81504a10bf25b52b06dfca1f0714cf
+  metadata.gz: c944001b96d6a512cdb58d02380291b27486daed225c4f6404c526c3f04028abfd9db75307e54fb0ad664b8da80aa1266df35ace84674eb728a9daf33dba05a6
+  data.tar.gz: 7f9c2f3acf99f17d6b21f13c1cb0531ede5dab6cc76ef8bc5018708444e4448941dc8e9b7816df6ce3da4513c21e070dce32d4dcabc3d65e532d673fb877ad23

data/CHANGELOG.md

@@ -1,9 +1,19 @@
-*   TimeWithZone#strftime now delegates every directive to Time#strftime except for '%Z',
+*   The decorated `load` and `require` methods are now kept private.
+
+    Fixes #17553.
+
+    *Xavier Noria*
+
+*   `String#remove` and `String#remove!` accept multiple arguments.
+
+    *Pavel Pravosud*
+
+*   `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.
+*   Corrected `Inflector#underscore` handling of multiple successive acroynms.
 
     *James Le Cuirot*
 
@@ -156,7 +166,7 @@
 
 *   Fixed `ActiveSupport::Cache::FileStore` exploding with long paths.
 
-    *Adam Panzer / Michael Grosser*
+    *Adam Panzer*, *Michael Grosser*
 
 *   Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost
     when working with objects with a nanosecond component.

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

@@ -1,6 +1,6 @@
 class Hash
   # Returns a hash with non +nil+ values.
-  # 
+  #
   #   hash = { a: true, b: false, c: nil}
   #   hash.compact # => { a: true, b: false}
   #   hash # => { a: true, b: false, c: nil}
@@ -8,9 +8,9 @@ class Hash
   def compact
     self.select { |_, value| !value.nil? }
   end
-  
+
   # Replaces current hash with non +nil+ values.
-  # 
+  #
   #   hash = { a: true, b: false, c: nil}
   #   hash.compact! # => { a: true, b: false}
   #   hash # => { a: true, b: false}

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

@@ -1,13 +1,19 @@
 class Hash
-  # Returns a hash that includes everything but the given keys. This is useful for
-  # limiting a set of parameters to everything but a few known toggles:
+  # 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}
   #
+  # This is useful for limiting a set of parameters to everything but a few known toggles:
   #   @person.update(params[:person].except(:admin))
   def except(*keys)
     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 }
   def except!(*keys)
     keys.each { |key| delete(key) }
     self

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

@@ -1,6 +1,12 @@
 class Hash
-  # Slice a hash to include only the given keys. This is useful for
-  # limiting an options hash to valid keys before passing to a method:
+  # Slice 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)
+  #   # => {:a=>1, :b=>2}
+  # 
+  # This is useful for limiting an options hash to valid keys before 
+  # passing to a method:
   #
   #   def search(criteria = {})
   #     criteria.assert_valid_keys(:mass, :velocity, :time)

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

@@ -13,6 +13,9 @@ class String
   end
 
   # Performs a destructive squish. See String#squish.
+  #   str = " foo   bar    \n   \t   boo"
+  #   str.squish!                         # => "foo bar boo"
+  #   str                                 # => "foo bar boo"
   def squish!
     gsub!(/\A[[:space:]]+/, '')
     gsub!(/[[:space:]]+\z/, '')
@@ -20,14 +23,24 @@ class String
     self
   end
 
-  # Returns a new string with all occurrences of the pattern removed. Short-hand for String#gsub(pattern, '').
-  def remove(pattern)
-    gsub pattern, ''
+  # Returns a new string with all occurrences of the patterns removed.
+  #   str = "foo bar test"
+  #   str.remove(" test")                 # => "foo bar"
+  #   str                                 # => "foo bar test"
+  def remove(*patterns)
+    dup.remove!(*patterns)
   end
 
-  # Alters the string by removing all occurrences of the pattern. Short-hand for String#gsub!(pattern, '').
-  def remove!(pattern)
-    gsub! pattern, ''
+  # Alters the string by removing all occurrences of the patterns.
+  #   str = "foo bar test"
+  #   str.remove!(" test")                 # => "foo bar"
+  #   str                                  # => "foo bar"
+  def remove!(*patterns)
+    patterns.each do |pattern|
+      gsub! pattern, ""
+    end
+
+    self
   end
 
   # Truncates a given +text+ after a given <tt>length</tt> if +text+ is longer than <tt>length</tt>:

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

@@ -247,6 +247,11 @@ module ActiveSupport #:nodoc:
 end
 
 class String
+  # Marks a string as trusted safe. It will be inserted into HTML with no
+  # additional escaping performed. It is your responsibilty to ensure that the
+  # string contains no malicious content. This method is equivalent to the
+  # `raw` helper in views. It is recommended that you use `sanitize` instead of
+  # this method. It should never be called on user input.
   def html_safe
     ActiveSupport::SafeBuffer.new(self)
   end

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

@@ -1,4 +1,5 @@
 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

@@ -205,7 +205,10 @@ module ActiveSupport #:nodoc:
     # Object includes this module.
     module Loadable #:nodoc:
       def self.exclude_from(base)
-        base.class_eval { define_method(:load, Kernel.instance_method(:load)) }
+        base.class_eval do
+          define_method(:load, Kernel.instance_method(:load))
+          private :load
+        end
       end
 
       def require_or_load(file_name)
@@ -241,18 +244,6 @@ module ActiveSupport #:nodoc:
         raise
       end
 
-      def load(file, wrap = false)
-        result = false
-        load_dependency(file) { result = super }
-        result
-      end
-
-      def require(file)
-        result = false
-        load_dependency(file) { result = super }
-        result
-      end
-
       # Mark the given constant as unloadable. Unloadable constants are removed
       # each time dependencies are cleared.
       #
@@ -269,6 +260,20 @@ module ActiveSupport #:nodoc:
       def unloadable(const_desc)
         Dependencies.mark_for_unload const_desc
       end
+
+      private
+
+      def load(file, wrap = false)
+        result = false
+        load_dependency(file) { result = super }
+        result
+      end
+
+      def require(file)
+        result = false
+        load_dependency(file) { result = super }
+        result
+      end
     end
 
     # Exception file-blaming.

data/lib/active_support/dependencies/autoload.rb

@@ -67,7 +67,7 @@ module ActiveSupport
     end
 
     def eager_load!
-      @_autoloads.values.each { |file| require file }
+      @_autoloads.each_value { |file| require file }
     end
 
     def autoloads

data/lib/active_support/duration.rb

@@ -1,4 +1,3 @@
-require 'active_support/proxy_object'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/object/acts_like'
 
@@ -103,6 +102,8 @@ module ActiveSupport
       @value.respond_to?(method, include_private)
     end
 
+    delegate :<=>, to: :value
+
     protected
 
       def sum(sign, time = ::Time.current) #:nodoc:

data/lib/active_support/gem_version.rb

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

data/lib/active_support/inflector/methods.rb

@@ -73,7 +73,7 @@ module ActiveSupport
         string = string.sub(/^(?:#{inflections.acronym_regex}(?=\b|[A-Z_])|\w)/) { $&.downcase }
       end
       string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{inflections.acronyms[$2] || $2.capitalize}" }
-      string.gsub!('/', '::')
+      string.gsub!(/\//, '::')
       string
     end
 

data/lib/active_support/message_verifier.rb

@@ -40,7 +40,7 @@ module ActiveSupport
       data, digest = signed_message.split("--")
       if data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data))
         begin
-          @serializer.load(::Base64.strict_decode64(data))
+          @serializer.load(decode(data))
         rescue ArgumentError => argument_error
           raise InvalidSignature if argument_error.message =~ %r{invalid base64}
           raise
@@ -51,11 +51,19 @@ module ActiveSupport
     end
 
     def generate(value)
-      data = ::Base64.strict_encode64(@serializer.dump(value))
+      data = encode(@serializer.dump(value))
       "#{data}--#{generate_digest(data)}"
     end
 
     private
+      def encode(data)
+        ::Base64.strict_encode64(data)
+      end
+
+      def decode(data)
+        ::Base64.strict_decode64(data)
+      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/multibyte/unicode.rb

@@ -11,7 +11,7 @@ module ActiveSupport
       NORMALIZATION_FORMS = [:c, :kc, :d, :kd]
 
       # The Unicode version that is supported by the implementation
-      UNICODE_VERSION = '6.3.0'
+      UNICODE_VERSION = '7.0.0'
 
       # The default normalization used for operations that require
       # normalization. It can be set to any of the normalizations

data/lib/active_support/notifications.rb

@@ -16,7 +16,7 @@ module ActiveSupport
   #     render text: 'Foo'
   #   end
   #
-  # That executes the block first and notifies all subscribers once done.
+  # That first executes the block and then notifies all subscribers once done.
   #
   # In the example above +render+ is the name of the event, and the rest is called
   # the _payload_. The payload is a mechanism that allows instrumenters to pass

metadata

@@ -1,95 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta4
+  version: 4.2.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-28 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
@@ -323,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.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the