activesupport 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 787831cae30c98f2e6f3e06b1ac405a5c5597861
-  data.tar.gz: 34441857e5037fdaa192293f732de973fa362f22
+  metadata.gz: 50394a5dde9dbcdf47f30b09e2114d00c746e661
+  data.tar.gz: 05b98599f6d9846bb6bd90950e916cf7bcfee450
 SHA512:
-  metadata.gz: 2af16317b996dfcdef387e1e8c68fc488b80d85329339c71f640faf69212fb308b2f24723a6134911eddc9358bf87a194363f7bab0997d05ec574ec8345b645e
-  data.tar.gz: c5ea3235e50432543c82825c40e44d34e765d7bb94c5c3b586a179b015f21df62c8fc18458cdb2a63430a6a66db8f72eb58ca68c72000527462241059cf5c2ca
+  metadata.gz: ff1d8f80f99c75b2396df78f4f8cca93c5de6a62ecc6e40b4144f9f90992a5a754de2157d1f1d74a841fa2b461afb4cc2275e42822cda8c0961306ba24370424
+  data.tar.gz: 01bce3c3e5d91185ca68a5c15858f6cd1107278e5e10f400d59ecb2daf846b8ae5cbd945946495b9b02fb1f6178709a50bd2c1ccb13cd244b0d386c3de076a41

data/CHANGELOG.md

@@ -1,8 +1,17 @@
-## Rails 4.0.0 (unreleased) ##
+*   Override `Time.at` to support the passing of Time-like values when called with a single argument.
+
+    *Andrew White*
+
+*   Allow Date to be compared with Time (like it was possible to compare Time with Date).
+
+    *DHH*
+
+*   Deprecate multiple parameters support of `Object#in?`.
+
+    *Brian Morearty + Carlos Antonio da Silva*
 
-*   Fix skipping of filters defined by objects in `ActiveSupport::Callbacks::Callback`.
 
-    *Ben McRedmond*
+## Rails 4.0.0.rc1 (April 29, 2013) ##
 
 *   An `ActiveSupport::Subscriber` class has been extracted from
     `ActiveSupport::LogSubscriber`, allowing you to use the event attachment
@@ -32,6 +41,7 @@
 
     *Charles Jones*
 
+
 ## Rails 4.0.0.beta1 (February 25, 2013) ##
 
 *   Improve singularizing a singular for multiple cases.
@@ -134,19 +144,6 @@
 
     *Kelly Stannard*
 
-*   It's now possible to compare `Date`, `DateTime`, `Time` and `TimeWithZone`
-    with `Float::INFINITY`. This allows to create date/time ranges with one infinite bound.
-    Example:
-
-        range = Range.new(Date.today, Float::INFINITY)
-
-    Also it's possible to check inclusion of date/time in range with conversion.
-
-        range.include?(Time.now + 1.year)     # => true
-        range.include?(DateTime.now + 1.year) # => true
-
-    *Alexander Grebennik*
-
 *   Remove meaningless `ActiveSupport::FrozenObjectError`, which was just an alias of `RuntimeError`.
 
     *Akira Matsuda*

data/lib/active_support/callbacks.rb

@@ -133,13 +133,7 @@ module ActiveSupport
       end
 
       def matches?(_kind, _filter)
-        if @_is_object_filter
-          _filter_matches = @filter.to_s.start_with?(_method_name_for_object_filter(_kind, _filter, false))
-        else
-          _filter_matches = (@filter == _filter) 
-        end
-
-        @kind == _kind && _filter_matches
+        @kind == _kind && @filter == _filter
       end
 
       def duplicates?(other)
@@ -242,16 +236,6 @@ module ActiveSupport
         @compiled_options = conditions.flatten.join(" && ")
       end
 
-      def _method_name_for_object_filter(kind, filter, append_next_id = true)
-        class_name = filter.kind_of?(Class) ? filter.to_s : filter.class.to_s
-        class_name.gsub!(/<|>|#/, '')
-        class_name.gsub!(/\/|:/, "_")
-
-        method_name = "_callback_#{kind}_#{class_name}"
-        method_name << "_#{next_id}" if append_next_id
-        method_name
-      end
-
       # Filters support:
       #
       #   Arrays::  Used in conditions. This is used to specify
@@ -273,8 +257,6 @@ module ActiveSupport
       #     a method is created that calls the before_foo method
       #     on the object.
       def _compile_filter(filter)
-        @_is_object_filter = false
-
         case filter
         when Array
           filter.map {|f| _compile_filter(f)}
@@ -289,8 +271,7 @@ module ActiveSupport
 
           method_name << (filter.arity == 1 ? "(self)" : " self, Proc.new ")
         else
-          method_name = _method_name_for_object_filter(kind, filter)
-          @_is_object_filter = true
+          method_name = "_callback_#{@kind}_#{next_id}"
           @klass.send(:define_method, "#{method_name}_object") { filter }
 
           _normalize_legacy_filter(kind, filter)

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

@@ -15,12 +15,12 @@ class Array
   #
   # * If the argument responds to +to_ary+ the method is invoked. <tt>Kernel#Array</tt>
   #   moves on to try +to_a+ if the returned value is +nil+, but <tt>Array.wrap</tt> returns
-  #   such a +nil+ right away.
+  #   +nil+ right away.
   # * If the returned value from +to_ary+ is neither +nil+ nor an +Array+ object, <tt>Kernel#Array</tt>
   #   raises an exception, while <tt>Array.wrap</tt> does not, it just returns the value.
-  # * It does not call +to_a+ on the argument, though special-cases +nil+ to return an empty array.
+  # * It does not call +to_a+ on the argument, but returns an empty array if argument is +nil+.
   #
-  # The last point is particularly worth comparing for some enumerables:
+  # The second point is easily explained with some enumerables:
   #
   #   Array(foo: :bar)      # => [[:foo, :bar]]
   #   Array.wrap(foo: :bar) # => [{:foo=>:bar}]
@@ -29,10 +29,10 @@ class Array
   #
   #   [*object]
   #
-  # which for +nil+ returns <tt>[]</tt>, and calls to <tt>Array(object)</tt> otherwise.
+  # which returns <tt>[]</tt> for +nil+, but calls to <tt>Array(object)</tt> otherwise.
   #
-  # Thus, in this case the behavior may be different for +nil+, and the differences with
-  # <tt>Kernel#Array</tt> explained above apply to the rest of <tt>object</tt>s.
+  # The differences with <tt>Kernel#Array</tt> explained above
+  # apply to the rest of <tt>object</tt>s.
   def self.wrap(object)
     if object.nil?
       []

data/lib/active_support/core_ext/date.rb

@@ -2,5 +2,4 @@ require 'active_support/core_ext/date/acts_like'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date/conversions'
 require 'active_support/core_ext/date/zones'
-require 'active_support/core_ext/date/infinite_comparable'
 

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

@@ -119,4 +119,15 @@ class Date
       options.fetch(:day, day)
     )
   end
+  
+  # Allow Date to be compared with Time by converting to DateTime and relying on the <=> from there.
+  def compare_with_coercion(other)
+    if other.is_a?(Time)
+      self.to_datetime <=> other
+    else
+      compare_without_coercion(other)
+    end
+  end
+  alias_method :compare_without_coercion, :<=>
+  alias_method :<=>, :compare_with_coercion
 end

data/lib/active_support/core_ext/date_time.rb

@@ -2,4 +2,3 @@ require 'active_support/core_ext/date_time/acts_like'
 require 'active_support/core_ext/date_time/calculations'
 require 'active_support/core_ext/date_time/conversions'
 require 'active_support/core_ext/date_time/zones'
-require 'active_support/core_ext/date_time/infinite_comparable'

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

@@ -154,4 +154,11 @@ class DateTime
   def utc_offset
     (offset * 86400).to_i
   end
+
+  # Layers additional behavior on DateTime#<=> so that Time and
+  # ActiveSupport::TimeWithZone instances can be compared with a DateTime.
+  def <=>(other)
+    super other.to_datetime
+  end
+
 end

data/lib/active_support/core_ext/marshal.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/aliasing'
+
 module Marshal
   class << self
     def load_with_autoloading(source)

data/lib/active_support/core_ext/numeric.rb

@@ -1,4 +1,3 @@
 require 'active_support/core_ext/numeric/bytes'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/numeric/conversions'
-require 'active_support/core_ext/numeric/infinite_comparable'

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

@@ -1,17 +1,18 @@
+require 'active_support/deprecation'
+
 class Object
-  # Returns true if this object is included in the argument(s). Argument must be
-  # any object which responds to +#include?+ or optionally, multiple arguments can be passed in. Usage:
+  # Returns true if this object is included in the argument. Argument must be
+  # any object which responds to +#include?+. Usage:
   #
-  #   characters = ['Konata', 'Kagami', 'Tsukasa']
-  #   'Konata'.in?(characters) # => true
+  #   characters = ["Konata", "Kagami", "Tsukasa"]
+  #   "Konata".in?(characters) # => true
   #
-  #   character = 'Konata'
-  #   character.in?('Konata', 'Kagami', 'Tsukasa') # => true
-  #
-  # This will throw an ArgumentError if a single argument is passed in and it doesn't respond
+  # This will throw an ArgumentError if the argument doesn't respond
   # to +#include?+.
   def in?(*args)
     if args.length > 1
+      ActiveSupport::Deprecation.warn "Calling #in? with multiple arguments is" \
+        " deprecated, please pass in an object that responds to #include? instead."
       args.include? self
     else
       another_object = args.first

data/lib/active_support/core_ext/range/include_range.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/aliasing'
+
 class Range
   # Extends the default Range#include? to support range comparisons.
   #  (1..5).include?(1..5) # => true

data/lib/active_support/core_ext/time.rb

@@ -3,4 +3,3 @@ require 'active_support/core_ext/time/calculations'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/zones'
-require 'active_support/core_ext/time/infinite_comparable'

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

@@ -65,6 +65,18 @@ class Time
     def current
       ::Time.zone ? ::Time.zone.now : ::Time.now
     end
+
+    # Layers additional behavior on Time.at so that ActiveSupport::TimeWithZone and DateTime
+    # instances can be used when called with a single argument
+    def at_with_coercion(*args)
+      if args.size == 1 && args.first.acts_like?(:time)
+        at_without_coercion(args.first.to_i)
+      else
+        at_without_coercion(*args)
+      end
+    end
+    alias_method :at_without_coercion, :at
+    alias_method :at, :at_with_coercion
   end
 
   # Seconds since midnight: Time.now.seconds_since_midnight

data/lib/active_support/deprecation/proxy_wrappers.rb

@@ -25,7 +25,7 @@ module ActiveSupport
         end
     end
 
-    # This DeprecatedObjectProxy transforms object to depracated object.
+    # This DeprecatedObjectProxy transforms object to deprecated object.
     #
     #   @old_object = DeprecatedObjectProxy.new(Object.new, "Don't use this object anymore!")
     #   @old_object = DeprecatedObjectProxy.new(Object.new, "Don't use this object anymore!", deprecator_instance)
@@ -52,7 +52,7 @@ module ActiveSupport
     end
 
     # This DeprecatedInstanceVariableProxy transforms instance variable to
-    # depracated instance variable.
+    # deprecated instance variable.
     #
     #   class Example
     #     def initialize(deprecator)
@@ -93,7 +93,7 @@ module ActiveSupport
         end
     end
 
-    # This DeprecatedConstantProxy transforms constant to depracated constant.
+    # This DeprecatedConstantProxy transforms constant to deprecated constant.
     #
     #   OLD_CONST = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OLD_CONST', 'NEW_CONST')
     #   OLD_CONST = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OLD_CONST', 'NEW_CONST', deprecator_instance)

data/lib/active_support/hash_with_indifferent_access.rb

@@ -91,7 +91,7 @@ module ActiveSupport
     #
     # This value can be later fetched using either +:key+ or +'key'+.
     def []=(key, value)
-      regular_writer(convert_key(key), convert_value(value))
+      regular_writer(convert_key(key), convert_value(value, for: :assignment))
     end
 
     alias_method :store, :[]=
@@ -229,7 +229,11 @@ module ActiveSupport
 
     # Convert to a regular hash with string keys.
     def to_hash
-      Hash.new(default).merge!(self)
+      _new_hash= {}
+      each do |key, value|
+        _new_hash[convert_key(key)] = convert_value(value, for: :to_hash)
+      end
+      Hash.new(default).merge!(_new_hash)
     end
 
     protected
@@ -237,12 +241,18 @@ module ActiveSupport
         key.kind_of?(Symbol) ? key.to_s : key
       end
 
-      def convert_value(value)
+      def convert_value(value, options = {})
         if value.is_a? Hash
-          value.nested_under_indifferent_access
+          if options[:for] == :to_hash
+            value.to_hash
+          else
+            value.nested_under_indifferent_access
+          end
         elsif value.is_a?(Array)
-          value = value.dup if value.frozen?
-          value.map! { |e| convert_value(e) }
+          unless options[:for] == :assignment
+            value = value.dup
+          end
+          value.map! { |e| convert_value(e, options) }
         else
           value
         end

data/lib/active_support/notifications/fanout.rb

@@ -79,6 +79,13 @@ module ActiveSupport
           def initialize(pattern, delegate)
             @pattern = pattern
             @delegate = delegate
+            @can_publish = delegate.respond_to?(:publish)
+          end
+
+          def publish(name, *args)
+            if @can_publish
+              @delegate.publish name, *args
+            end
           end
 
           def start(name, id, payload)

data/lib/active_support/testing/isolation.rb

@@ -40,6 +40,10 @@ module ActiveSupport
       def method_missing(name, *args)
         @calls << [name, args]
       end
+
+      def info_signal
+        Signal.list['INFO']
+      end
     end
 
     module Isolation

data/lib/active_support/version.rb

@@ -1,7 +1,7 @@
 module ActiveSupport
   # Returns the version of the currently loaded ActiveSupport as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.0.rc1"
+    Gem::Version.new "4.0.0.rc2"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -132,14 +132,12 @@ files:
 - lib/active_support/core_ext/date/acts_like.rb
 - lib/active_support/core_ext/date/calculations.rb
 - lib/active_support/core_ext/date/conversions.rb
-- lib/active_support/core_ext/date/infinite_comparable.rb
 - lib/active_support/core_ext/date/zones.rb
 - lib/active_support/core_ext/date.rb
 - lib/active_support/core_ext/date_and_time/calculations.rb
 - lib/active_support/core_ext/date_time/acts_like.rb
 - lib/active_support/core_ext/date_time/calculations.rb
 - lib/active_support/core_ext/date_time/conversions.rb
-- lib/active_support/core_ext/date_time/infinite_comparable.rb
 - lib/active_support/core_ext/date_time/zones.rb
 - lib/active_support/core_ext/date_time.rb
 - lib/active_support/core_ext/enumerable.rb
@@ -154,7 +152,6 @@ files:
 - lib/active_support/core_ext/hash/reverse_merge.rb
 - lib/active_support/core_ext/hash/slice.rb
 - lib/active_support/core_ext/hash.rb
-- lib/active_support/core_ext/infinite_comparable.rb
 - lib/active_support/core_ext/integer/inflections.rb
 - lib/active_support/core_ext/integer/multiple.rb
 - lib/active_support/core_ext/integer/time.rb
@@ -181,7 +178,6 @@ files:
 - lib/active_support/core_ext/name_error.rb
 - lib/active_support/core_ext/numeric/bytes.rb
 - lib/active_support/core_ext/numeric/conversions.rb
-- lib/active_support/core_ext/numeric/infinite_comparable.rb
 - lib/active_support/core_ext/numeric/time.rb
 - lib/active_support/core_ext/numeric.rb
 - lib/active_support/core_ext/object/acts_like.rb
@@ -223,7 +219,6 @@ files:
 - lib/active_support/core_ext/time/acts_like.rb
 - lib/active_support/core_ext/time/calculations.rb
 - lib/active_support/core_ext/time/conversions.rb
-- lib/active_support/core_ext/time/infinite_comparable.rb
 - lib/active_support/core_ext/time/marshal.rb
 - lib/active_support/core_ext/time/zones.rb
 - lib/active_support/core_ext/time.rb
@@ -326,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A toolkit of support libraries and Ruby core extensions extracted from the

data/lib/active_support/core_ext/date/infinite_comparable.rb

@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Date
-  include InfiniteComparable
-end

data/lib/active_support/core_ext/date_time/infinite_comparable.rb

@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class DateTime
-  include InfiniteComparable
-end

data/lib/active_support/core_ext/infinite_comparable.rb

@@ -1,35 +0,0 @@
-require 'active_support/concern'
-require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/object/try'
-
-module InfiniteComparable
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method_chain :<=>, :infinity
-  end
-
-  define_method :'<=>_with_infinity' do |other|
-    if other.class == self.class
-      public_send :'<=>_without_infinity', other
-    else
-      infinite = try(:infinite?)
-      other_infinite = other.try(:infinite?)
-
-      # inf <=> inf
-      if infinite && other_infinite
-        infinite <=> other_infinite
-      # not_inf <=> inf
-      elsif other_infinite
-        -other_infinite
-      # inf <=> not_inf
-      elsif infinite
-        infinite
-      else
-        conversion = "to_#{self.class.name.downcase}"
-        other = other.public_send(conversion) if other.respond_to?(conversion)
-        public_send :'<=>_without_infinity', other
-      end
-    end
-  end
-end

data/lib/active_support/core_ext/numeric/infinite_comparable.rb

@@ -1,9 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Float
-  include InfiniteComparable
-end
-
-class BigDecimal
-  include InfiniteComparable
-end

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

@@ -1,5 +0,0 @@
-require 'active_support/core_ext/infinite_comparable'
-
-class Time
-  include InfiniteComparable
-end