activesupport 3.2.22.5 → 4.0.0.beta1

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

@@ -0,0 +1,46 @@
+require 'active_support/core_ext/object/duplicable'
+
+class Object
+  # Returns a deep copy of object if it's duplicable. If it's
+  # not duplicable, returns +self+.
+  #
+  #   object = Object.new
+  #   dup    = object.deep_dup
+  #   dup.instance_variable_set(:@a, 1)
+  #
+  #   object.instance_variable_defined?(:@a) #=> false
+  #   dup.instance_variable_defined?(:@a)    #=> true
+  def deep_dup
+    duplicable? ? dup : self
+  end
+end
+
+class Array
+  # Returns a deep copy of array.
+  #
+  #   array = [1, [2, 3]]
+  #   dup   = array.deep_dup
+  #   dup[1][2] = 4
+  #
+  #   array[1][2] #=> nil
+  #   dup[1][2]   #=> 4
+  def deep_dup
+    map { |it| it.deep_dup }
+  end
+end
+
+class Hash
+  # Returns a deep copy of hash.
+  #
+  #   hash = { a: { b: 'b' } }
+  #   dup  = hash.deep_dup
+  #   dup[:a][:c] = 'c'
+  #
+  #   hash[:a][:c] #=> nil
+  #   dup[:a][:c]  #=> "c"
+  def deep_dup
+    each_with_object(dup) do |(key, value), hash|
+      hash[key.deep_dup] = value.deep_dup
+    end
+  end
+end

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

@@ -19,7 +19,7 @@
 class Object
   # Can you safely dup this object?
   #
-  # False for +nil+, +false+, +true+, symbols, numbers, class and module objects;
+  # False for +nil+, +false+, +true+, symbol, and number objects;
   # true otherwise.
   def duplicable?
     true
@@ -31,7 +31,6 @@ class NilClass
   #
   #   nil.duplicable? # => false
   #   nil.dup         # => TypeError: can't dup NilClass
-  #
   def duplicable?
     false
   end
@@ -42,7 +41,6 @@ class FalseClass
   #
   #   false.duplicable? # => false
   #   false.dup         # => TypeError: can't dup FalseClass
-  #
   def duplicable?
     false
   end
@@ -53,7 +51,6 @@ class TrueClass
   #
   #   true.duplicable? # => false
   #   true.dup         # => TypeError: can't dup TrueClass
-  #
   def duplicable?
     false
   end
@@ -64,7 +61,6 @@ class Symbol
   #
   #   :my_symbol.duplicable? # => false
   #   :my_symbol.dup         # => TypeError: can't dup Symbol
-  #
   def duplicable?
     false
   end
@@ -75,31 +71,6 @@ class Numeric
   #
   #  3.duplicable? # => false
   #  3.dup         # => TypeError: can't dup Fixnum
-  #
-  def duplicable?
-    false
-  end
-end
-
-class Class
-  # Classes are not duplicable:
-  #
-  #  c = Class.new # => #<Class:0x10328fd80>
-  #  c.dup         # => #<Class:0x10328fd80>
-  #
-  # Note +dup+ returned the same class object.
-  def duplicable?
-    false
-  end
-end
-
-class Module
-  # Modules are not duplicable:
-  #
-  #  m = Module.new # => #<Module:0x10328b6e0>
-  #  m.dup          # => #<Module:0x10328b6e0>
-  #
-  # Note +dup+ returned the same module object.
   def duplicable?
     false
   end

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

@@ -2,11 +2,11 @@ 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:
   #
-  #   characters = ["Konata", "Kagami", "Tsukasa"]
-  #   "Konata".in?(characters) # => true
-  #   
-  #   character = "Konata"
-  #   character.in?("Konata", "Kagami", "Tsukasa") # => 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
   # to +#include?+.
@@ -18,7 +18,7 @@ class Object
       if another_object.respond_to? :include?
         another_object.include? self
       else
-        raise ArgumentError.new("The single parameter passed to #in? must respond to #include?")
+        raise ArgumentError.new 'The single parameter passed to #in? must respond to #include?'
       end
     end
   end

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

@@ -1,6 +1,6 @@
 class Object
-  # Returns a hash that maps instance variable names without "@" to their
-  # corresponding values. Keys are strings both in Ruby 1.8 and 1.9.
+  # Returns a hash with string keys that maps instance variable names without "@" to their
+  # corresponding values.
   #
   #   class C
   #     def initialize(x, y)
@@ -9,12 +9,11 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
-  def instance_values #:nodoc:
-    Hash[instance_variables.map { |name| [name.to_s[1..-1], instance_variable_get(name)] }]
+  def instance_values
+    Hash[instance_variables.map { |name| [name[1..-1], instance_variable_get(name)] }]
   end
 
-  # Returns an array of instance variable names including "@". They are strings
-  # both in Ruby 1.8 and 1.9.
+  # Returns an array of instance variable names as strings including "@".
   #
   #   class C
   #     def initialize(x, y)
@@ -23,11 +22,7 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_variable_names # => ["@y", "@x"]
-  if RUBY_VERSION >= '1.9'
-    def instance_variable_names
-      instance_variables.map { |var| var.to_s }
-    end
-  else
-    alias_method :instance_variable_names, :instance_variables
+  def instance_variable_names
+    instance_variables.map { |var| var.to_s }
   end
 end

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

@@ -17,3 +17,11 @@ end
     end
   end
 end
+
+module Process
+  class Status
+    def as_json(options = nil)
+      { :exitstatus => exitstatus, :pid => pid }
+    end
+  end
+end

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

@@ -6,18 +6,21 @@ class Object
 end
 
 class NilClass
+  # Returns +self+.
   def to_param
     self
   end
 end
 
 class TrueClass
+  # Returns +self+.
   def to_param
     self
   end
 end
 
 class FalseClass
+  # Returns +self+.
   def to_param
     self
   end
@@ -35,12 +38,12 @@ class Hash
   # Returns a string representation of the receiver suitable for use as a URL
   # query string:
   #
-  #   {:name => 'David', :nationality => 'Danish'}.to_param
+  #   {name: 'David', nationality: 'Danish'}.to_param
   #   # => "name=David&nationality=Danish"
   #
   # An optional namespace can be passed to enclose the param names:
   #
-  #   {:name => 'David', :nationality => 'Danish'}.to_param('user')
+  #   {name: 'David', nationality: 'Danish'}.to_param('user')
   #   # => "user[name]=David&user[nationality]=Danish"
   #
   # The string pairs "key=value" that conform the query string

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

@@ -1,39 +1,58 @@
 class Object
-  # Invokes the method identified by the symbol +method+, passing it any arguments
-  # and/or the block specified, just like the regular Ruby <tt>Object#send</tt> does.
+  # Invokes the public method whose name goes as first argument just like
+  # +public_send+ does, except that if the receiver does not respond to it the
+  # call returns +nil+ rather than raising an exception.
   #
-  # *Unlike* that method however, a +NoMethodError+ exception will *not* be raised
-  # and +nil+ will be returned instead, if the receiving object is a +nil+ object or NilClass.
+  # This method is defined to be able to write
   #
-  # If try is called without a method to call, it will yield any given block with the object.
-  #
-  # Please also note that +try+ is defined on +Object+, therefore it won't work with
-  # subclasses of +BasicObject+. For example, using try with +SimpleDelegator+ will
-  # delegate +try+ to target instead of calling it on delegator itself.
+  #   @person.try(:name)
   #
-  # ==== Examples
+  # instead of
   #
-  # Without +try+
-  #   @person && @person.name
-  # or
   #   @person ? @person.name : nil
   #
-  # With +try+
-  #   @person.try(:name)
+  # +try+ returns +nil+ when called on +nil+ regardless of whether it responds
+  # to the method:
+  #
+  #   nil.try(:to_i) # => nil, rather than 0
+  #
+  # Arguments and blocks are forwarded to the method if invoked:
+  #
+  #   @posts.try(:each_slice, 2) do |a, b|
+  #     ...
+  #   end
+  #
+  # 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.
+  #
+  # If +try+ is called without arguments it yields the receiver to a given
+  # block unless it is +nil+:
   #
-  # +try+ also accepts arguments and/or a block, for the method it is trying
-  #   Person.try(:find, 1)
-  #   @people.try(:collect) {|p| p.name}
+  #   @person.try do |p|
+  #     ...
+  #   end
   #
-  # Without a method argument try will yield to the block unless the receiver is nil.
-  #   @person.try { |p| "#{p.first_name} #{p.last_name}" }
-  #--
-  # +try+ behaves like +Object#send+, unless called on +NilClass+.
+  # 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.
   def try(*a, &b)
     if a.empty? && block_given?
       yield self
     else
-      __send__(*a, &b)
+      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 implemented the tried method.
+  def try!(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      public_send(*a, &b)
     end
   end
 end
@@ -42,8 +61,6 @@ class NilClass
   # Calling +try+ on +nil+ always returns +nil+.
   # It becomes specially helpful when navigating through associations that may return +nil+.
   #
-  # === Examples
-  #
   #   nil.try(:name) # => nil
   #
   # Without +try+
@@ -54,4 +71,8 @@ class NilClass
   def try(*args)
     nil
   end
+
+  def try!(*args)
+    nil
+  end
 end

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

@@ -10,16 +10,16 @@ class Object
   # Without <tt>with_options></tt>, this code contains duplication:
   #
   #   class Account < ActiveRecord::Base
-  #     has_many :customers, :dependent => :destroy
-  #     has_many :products,  :dependent => :destroy
-  #     has_many :invoices,  :dependent => :destroy
-  #     has_many :expenses,  :dependent => :destroy
+  #     has_many :customers, dependent: :destroy
+  #     has_many :products,  dependent: :destroy
+  #     has_many :invoices,  dependent: :destroy
+  #     has_many :expenses,  dependent: :destroy
   #   end
   #
   # Using <tt>with_options</tt>, we can remove the duplication:
   #
   #   class Account < ActiveRecord::Base
-  #     with_options :dependent => :destroy do |assoc|
+  #     with_options dependent: :destroy do |assoc|
   #       assoc.has_many :customers
   #       assoc.has_many :products
   #       assoc.has_many :invoices
@@ -29,14 +29,13 @@ class Object
   #
   # It can also be used with an explicit receiver:
   #
-  #   I18n.with_options :locale => user.locale, :scope => "newsletter" do |i18n|
+  #   I18n.with_options locale: user.locale, scope: 'newsletter' do |i18n|
   #     subject i18n.t :subject
-  #     body    i18n.t :body, :user_name => user.name
+  #     body    i18n.t :body, user_name: user.name
   #   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.
-  #
   def with_options(options)
     yield ActiveSupport::OptionMerger.new(self, options)
   end

data/lib/active_support/core_ext/proc.rb

@@ -1,7 +1,10 @@
 require "active_support/core_ext/kernel/singleton_class"
+require "active_support/deprecation"
 
 class Proc #:nodoc:
   def bind(object)
+    ActiveSupport::Deprecation.warn 'Proc#bind is deprecated and will be removed in future versions'
+
     block, time = self, Time.now
     object.class_eval do
       method_name = "__bind_#{time.to_i}_#{time.usec}"

data/lib/active_support/core_ext/range.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/range/blockless_step'
 require 'active_support/core_ext/range/conversions'
 require 'active_support/core_ext/range/include_range'
 require 'active_support/core_ext/range/overlaps'
-require 'active_support/core_ext/range/cover'

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

@@ -5,8 +5,6 @@ class Range
 
   # Gives a human readable format of the range.
   #
-  # ==== Example
-  #
   #   (1..100).to_formatted_s # => "1..100"
   def to_formatted_s(format = :default)
     if formatter = RANGE_FORMATS[format]

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

@@ -5,7 +5,7 @@ class Range
   #  (1..5).include?(2..6) # => false
   #
   # The native Range#include? behavior is untouched.
-  #  ("a".."f").include?("c") # => true
+  #  ('a'..'f').include?('c') # => true
   #  (5..9).include?(11) # => false
   def include_with_range?(value)
     if value.is_a?(::Range)

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

@@ -3,6 +3,6 @@ class Range
   #  (1..5).overlaps?(4..6) # => true
   #  (1..5).overlaps?(7..9) # => false
   def overlaps?(other)
-    include?(other.first) || other.include?(first)
+    cover?(other.first) || other.cover?(first)
   end
 end

data/lib/active_support/core_ext/string.rb

@@ -6,9 +6,9 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/string/access'
 require 'active_support/core_ext/string/xchar'
 require 'active_support/core_ext/string/behavior'
-require 'active_support/core_ext/string/interpolation'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/string/exclude'
-require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/string/inquiry'
+require 'active_support/core_ext/string/indent'
+require 'active_support/core_ext/string/zones'

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

@@ -1,99 +1,104 @@
-require "active_support/multibyte"
-
 class String
-  unless '1.9'.respond_to?(:force_encoding)
-    # Returns the character at the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".at(0)  # => "h"
-    #   "hello".at(4)  # => "o"
-    #   "hello".at(10) # => ERROR if < 1.9, nil in 1.9
-    def at(position)
-      mb_chars[position, 1].to_s
-    end
-
-    # Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".from(0)  # => "hello"
-    #   "hello".from(2)  # => "llo"
-    #   "hello".from(10) # => "" if < 1.9, nil in 1.9
-    def from(position)
-      mb_chars[position..-1].to_s
-    end
-
-    # Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
-    #
-    # Examples:
-    #   "hello".to(0)  # => "h"
-    #   "hello".to(2)  # => "hel"
-    #   "hello".to(10) # => "hello"
-    def to(position)
-      mb_chars[0..position].to_s
-    end
-
-    # Returns the first character of the string or the first +limit+ characters.
-    #
-    # Examples:
-    #   "hello".first     # => "h"
-    #   "hello".first(2)  # => "he"
-    #   "hello".first(10) # => "hello"
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[0...limit].to_s
-      end
-    end
-
-    # Returns the last character of the string or the last +limit+ characters.
-    #
-    # Examples:
-    #   "hello".last     # => "o"
-    #   "hello".last(2)  # => "lo"
-    #   "hello".last(10) # => "hello"
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        mb_chars[(-limit)..-1].to_s
-      end
-    end
-  else
-    def at(position)
-      self[position]
-    end
+  # If you pass a single Fixnum, returns a substring of one character at that
+  # position. The first character of the string is at position 0, the next at
+  # position 1, and so on. If a range is supplied, a substring containing
+  # characters at offsets given by the range is returned. In both cases, if an
+  # offset is negative, it is counted from the end of the string. Returns nil
+  # if the initial offset falls outside the string. Returns an empty string if
+  # the beginning of the range is greater than the end of the string.
+  #
+  #   str = "hello"
+  #   str.at(0)      #=> "h"
+  #   str.at(1..3)   #=> "ell"
+  #   str.at(-2)     #=> "l"
+  #   str.at(-2..-1) #=> "lo"
+  #   str.at(5)      #=> nil
+  #   str.at(5..-1)  #=> ""
+  #
+  # If a Regexp is given, the matching portion of the string is returned.
+  # If a String is given, that given string is returned if it occurs in
+  # the string. In both cases, nil is returned if there is no match.
+  #
+  #   str = "hello"
+  #   str.at(/lo/) #=> "lo"
+  #   str.at(/ol/) #=> nil
+  #   str.at("lo") #=> "lo"
+  #   str.at("ol") #=> nil
+  def at(position)
+    self[position]
+  end
 
-    def from(position)
-      self[position..-1]
-    end
+  # Returns a substring from the given position to the end of the string.
+  # If the position is negative, it is counted from the end of the string.
+  #
+  #   str = "hello"
+  #   str.from(0)  #=> "hello"
+  #   str.from(3)  #=> "lo"
+  #   str.from(-2) #=> "lo"
+  #
+  # You can mix it with +to+ method and do fun things like:
+  #
+  #   str = "hello"
+  #   str.from(0).to(-1) #=> "hello"
+  #   str.from(1).to(-2) #=> "ell"
+  def from(position)
+    self[position..-1]
+  end
 
-    def to(position)
-      self[0..position]
-    end
+  # Returns a substring from the beginning of the string to the given position.
+  # If the position is negative, it is counted from the end of the string.
+  #
+  #   str = "hello"
+  #   str.to(0)  #=> "h"
+  #   str.to(3)  #=> "hell"
+  #   str.to(-2) #=> "hell"
+  #
+  # You can mix it with +from+ method and do fun things like:
+  #
+  #   str = "hello"
+  #   str.from(0).to(-1) #=> "hello"
+  #   str.from(1).to(-2) #=> "ell"
+  def to(position)
+    self[0..position]
+  end
 
-    def first(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        to(limit - 1)
-      end
+  # Returns the first character. If a limit is supplied, returns a substring
+  # from the beginning of the string until it reaches the limit value. If the
+  # given limit is greater than or equal to the string length, returns self.
+  #
+  #   str = "hello"
+  #   str.first    #=> "h"
+  #   str.first(1) #=> "h"
+  #   str.first(2) #=> "he"
+  #   str.first(0) #=> ""
+  #   str.first(6) #=> "hello"
+  def first(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      to(limit - 1)
     end
+  end
 
-    def last(limit = 1)
-      if limit == 0
-        ''
-      elsif limit >= size
-        self
-      else
-        from(-limit)
-      end
+  # Returns the last character of the string. If a limit is supplied, returns a substring
+  # from the end of the string until it reaches the limit value (counting backwards). If
+  # the given limit is greater than or equal to the string length, returns self.
+  #
+  #   str = "hello"
+  #   str.last    #=> "o"
+  #   str.last(1) #=> "o"
+  #   str.last(2) #=> "lo"
+  #   str.last(0) #=> ""
+  #   str.last(6) #=> "hello"
+  def last(limit = 1)
+    if limit == 0
+      ''
+    elsif limit >= size
+      self
+    else
+      from(-limit)
     end
   end
 end