activesupport 3.0.0.rc → 3.0.0.rc2

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

@@ -9,12 +9,12 @@ class DateTime
   remove_method :to_time if instance_methods.include?(:to_time)
 
   # Convert to a formatted string. See Time::DATE_FORMATS for predefined formats.
-  # 
+  #
   # This method is aliased to <tt>to_s</tt>.
-  # 
+  #
   # === Examples
   #   datetime = DateTime.civil(2007, 12, 4, 0, 0, 0, 0)   # => Tue, 04 Dec 2007 00:00:00 +0000
-  # 
+  #
   #   datetime.to_formatted_s(:db)            # => "2007-12-04 00:00:00"
   #   datetime.to_s(:db)                      # => "2007-12-04 00:00:00"
   #   datetime.to_s(:number)                  # => "20071204000000"
@@ -50,7 +50,7 @@ class DateTime
   def formatted_offset(colon = true, alternate_utc_string = nil)
     utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
   end
-  
+
   # Overrides the default inspect method with a human readable one, e.g., "Mon, 21 Feb 2005 14:30:00 +0000"
   def readable_inspect
     to_s(:rfc822)
@@ -83,8 +83,8 @@ class DateTime
   def xmlschema
     strftime("%Y-%m-%dT%H:%M:%S%Z")
   end unless instance_methods(false).include?(:xmlschema)
-  
-  # Converts self to a floating-point number of seconds since the Unix epoch 
+
+  # Converts self to a floating-point number of seconds since the Unix epoch
   def to_f
     seconds_since_unix_epoch.to_f
   end

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

@@ -9,7 +9,7 @@ class DateTime
   # This method is similar to Time#localtime, except that it uses <tt>Time.zone</tt> as the local zone
   # instead of the operating system's time zone.
   #
-  # You can also pass in a TimeZone instance or string that identifies a TimeZone as an argument, 
+  # You can also pass in a TimeZone instance or string that identifies a TimeZone as an argument,
   # and the conversion will be based on that zone instead of <tt>Time.zone</tt>.
   #
   #   DateTime.new(2000).in_time_zone('Alaska')  # => Fri, 31 Dec 1999 15:00:00 AKST -09:00

data/lib/active_support/core_ext/enumerable.rb

@@ -9,7 +9,7 @@ module Enumerable
   #
   # Example:
   #
-  #   latest_transcripts.group_by(&:day).each do |day, transcripts| 
+  #   latest_transcripts.group_by(&:day).each do |day, transcripts|
   #     p "#{day} -> #{transcripts.map(&:class).join(', ')}"
   #   end
   #   "2006-03-01 -> Transcript"
@@ -66,7 +66,8 @@ module Enumerable
   # +memo+ to the block. Handy for building up hashes or
   # reducing collections down to one object. Examples:
   #
-  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase } #=> {'foo' => 'FOO', 'bar' => 'BAR'}
+  #   %w(foo bar).each_with_object({}) { |str, hsh| hsh[str] = str.upcase }
+  #   # => {'foo' => 'FOO', 'bar' => 'BAR'}
   #
   # *Note* that you can't use immutable objects like numbers, true or false as
   # the memo. You would think the following returns 120, but since the memo is
@@ -87,21 +88,21 @@ module Enumerable
   #     => { "nextangle" => <Person ...>, "chade-" => <Person ...>, ...}
   #   people.index_by { |person| "#{person.first_name} #{person.last_name}" }
   #     => { "Chade- Fowlersburg-e" => <Person ...>, "David Heinemeier Hansson" => <Person ...>, ...}
-  # 
+  #
   def index_by
     inject({}) do |accum, elem|
       accum[yield(elem)] = elem
       accum
     end
   end
-  
+
   # Returns true if the collection has more than 1 element. Functionally equivalent to collection.size > 1.
   # Works with a block too ala any?, so people.many? { |p| p.age > 26 } # => returns true if more than 1 person is over 26.
   def many?(&block)
     size = block_given? ? select(&block).size : self.size
     size > 1
   end
-  
+
   # The negative of the Enumerable#include?. Returns true if the collection does not include the object.
   def exclude?(object)
     !include?(object)

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

@@ -7,7 +7,7 @@ require 'active_support/core_ext/string/inflections'
 
 class Hash
   # Returns a string containing an XML representation of its receiver:
-  # 
+  #
   #   {"foo" => 1, "bar" => 2}.to_xml
   #   # =>
   #   # <?xml version="1.0" encoding="UTF-8"?>
@@ -15,22 +15,22 @@ class Hash
   #   #   <foo type="integer">1</foo>
   #   #   <bar type="integer">2</bar>
   #   # </hash>
-  # 
+  #
   # To do so, the method loops over the pairs and builds nodes that depend on
   # the _values_. Given a pair +key+, +value+:
-  # 
+  #
   # * If +value+ is a hash there's a recursive call with +key+ as <tt>:root</tt>.
-  # 
+  #
   # * If +value+ is an array there's a recursive call with +key+ as <tt>:root</tt>,
   #   and +key+ singularized as <tt>:children</tt>.
-  # 
+  #
   # * If +value+ is a callable object it must expect one or two arguments. Depending
   #   on the arity, the callable is invoked with the +options+ hash as first argument
   #   with +key+ as <tt>:root</tt>, and +key+ singularized as second argument. Its
   #   return value becomes a new node.
-  # 
+  #
   # * If +value+ responds to +to_xml+ the method is invoked with +key+ as <tt>:root</tt>.
-  # 
+  #
   # * Otherwise, a node with +key+ as tag is created with a string representation of
   #   +value+ as text node. If +value+ is +nil+ an attribute "nil" set to "true" is added.
   #   Unless the option <tt>:skip_types</tt> exists and is true, an attribute "type" is
@@ -48,9 +48,9 @@ class Hash
   #       "DateTime"   => "datetime",
   #       "Time"       => "datetime"
   #     }
-  # 
+  #
   # By default the root node is "hash", but that's configurable via the <tt>:root</tt> option.
-  # 
+  #
   # The default XML builder is a fresh instance of <tt>Builder::XmlMarkup</tt>. You can
   # configure your own builder with the <tt>:builder</tt> option. The method also accepts
   # options like <tt>:dasherize</tt> and friends, they are forwarded to the builder.
@@ -108,7 +108,7 @@ class Hash
             # blank or nil parsed values are represented by nil
             elsif value.blank? || value['nil'] == 'true'
               nil
-            # If the type is the only element which makes it then 
+            # If the type is the only element which makes it then
             # this still makes the value nil, except if type is
             # a XML node(where type['value'] is a Hash)
             elsif value['type'] && value.size == 1 && !value['type'].is_a?(::Hash)
@@ -118,7 +118,7 @@ class Hash
                 h[k] = typecast_xml_value(v)
                 h
               end
-              
+
               # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
               # how multipart uploaded files from HTML appear
               xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value

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

@@ -7,8 +7,6 @@ class Hash
   #   {:a => 1}.with_indifferent_access["a"] # => 1
   #
   def with_indifferent_access
-    hash = ActiveSupport::HashWithIndifferentAccess.new(self)
-    hash.default = self.default
-    hash
+    ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(self)
   end
 end

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

@@ -1,7 +1,7 @@
 class Integer
   # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
   #
-  # These methods use Time#advance for precise date calculations when using from_now, ago, etc. 
+  # These methods use Time#advance for precise date calculations when using from_now, ago, etc.
   # as well as adding or subtracting their results from a Time object. For example:
   #
   #   # equivalent to Time.now.advance(:months => 1)
@@ -12,7 +12,7 @@ class Integer
   #
   #   # equivalent to Time.now.advance(:months => 4, :years => 5)
   #   (4.months + 5.years).from_now
-  # 
+  #
   # While these methods provide precise calculation when used as in the examples above, care
   # should be taken to note that this is not true if the result of `months', `years', etc is
   # converted before use:

data/lib/active_support/core_ext/kernel/reporting.rb

@@ -38,7 +38,7 @@ module Kernel
   #   puts 'But this will'
   def silence_stream(stream)
     old_stream = stream.dup
-    stream.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
     stream.sync = true
     yield
   ensure

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

@@ -19,6 +19,6 @@ class Module
   def anonymous?
     # Uses blank? because the name of an anonymous class is an empty
     # string in 1.8, and nil in 1.9.
-    name.blank? 
+    name.blank?
   end
 end

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

@@ -2,7 +2,7 @@ class Module
   # Declare an attribute accessor with an initial default return value.
   #
   # To give attribute <tt>:age</tt> the initial value <tt>25</tt>:
-  #  
+  #
   #   class Person
   #     attr_accessor_with_default :age, 25
   #   end
@@ -16,7 +16,7 @@ class Module
   # To give attribute <tt>:element_name</tt> a dynamic default value, evaluated
   # in scope of self:
   #
-  #   attr_accessor_with_default(:element_name) { name.underscore } 
+  #   attr_accessor_with_default(:element_name) { name.underscore }
   #
   def attr_accessor_with_default(sym, default = nil, &block)
     raise 'Default value or block required' unless !default.nil? || block

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

@@ -11,7 +11,7 @@ class Module
           @@#{sym}
         end
       EOS
-      
+
       unless options[:instance_reader] == false
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{sym}

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

@@ -3,7 +3,7 @@ class Module
     remove_method(method)
   rescue NameError
   end
-  
+
   def redefine_method(method, &block)
     remove_possible_method(method)
     define_method(method, &block)

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

@@ -3,9 +3,9 @@ require 'active_support/core_ext/array/extract_options'
 
 class Module
   # Synchronize access around a method, delegating synchronization to a
-  # particular mutex. A mutex (either a Mutex, or any object that responds to 
+  # particular mutex. A mutex (either a Mutex, or any object that responds to
   # #synchronize and yields to a block) must be provided as a final :with option.
-  # The :with option should be a symbol or string, and can represent a method, 
+  # The :with option should be a symbol or string, and can represent a method,
   # constant, or instance or class variable.
   # Example:
   #   class SharedCache

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

@@ -3,7 +3,7 @@ require 'active_support/duration'
 class Numeric
   # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
   #
-  # These methods use Time#advance for precise date calculations when using from_now, ago, etc. 
+  # These methods use Time#advance for precise date calculations when using from_now, ago, etc.
   # as well as adding or subtracting their results from a Time object. For example:
   #
   #   # equivalent to Time.now.advance(:months => 1)
@@ -14,7 +14,7 @@ class Numeric
   #
   #   # equivalent to Time.now.advance(:months => 4, :years => 5)
   #   (4.months + 5.years).from_now
-  # 
+  #
   # While these methods provide precise calculation when used as in the examples above, care
   # should be taken to note that this is not true if the result of `months', `years', etc is
   # converted before use:
@@ -25,8 +25,8 @@ class Numeric
   #   # equivalent to 365.25.days.to_f.from_now
   #   1.year.to_f.from_now
   #
-  # In such cases, Ruby's core 
-  # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and 
+  # In such cases, Ruby's core
+  # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and
   # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
   # date and time arithmetic
   def seconds
@@ -37,13 +37,13 @@ class Numeric
   def minutes
     ActiveSupport::Duration.new(self * 60, [[:seconds, self * 60]])
   end
-  alias :minute :minutes  
-  
+  alias :minute :minutes
+
   def hours
     ActiveSupport::Duration.new(self * 3600, [[:seconds, self * 3600]])
   end
   alias :hour :hours
-  
+
   def days
     ActiveSupport::Duration.new(self * 24.hours, [[:days, self]])
   end
@@ -53,12 +53,12 @@ class Numeric
     ActiveSupport::Duration.new(self * 7.days, [[:days, self * 7]])
   end
   alias :week :weeks
-  
+
   def fortnights
     ActiveSupport::Duration.new(self * 2.weeks, [[:days, self * 14]])
   end
   alias :fortnight :fortnights
-  
+
   # Reads best without arguments:  10.minutes.ago
   def ago(time = ::Time.now)
     time - self

data/lib/active_support/core_ext/object.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/returning'
 
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/object/instance_variables'

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

@@ -17,7 +17,7 @@ class Object
   def present?
     !blank?
   end
-  
+
   # Returns object if it's #present? otherwise returns nil.
   # object.presence is equivalent to object.present? ? object : nil.
   #

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

@@ -7,7 +7,7 @@ class Object
   #       @x, @y = x, y
   #     end
   #   end
-  #   
+  #
   #   C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
   def instance_values #:nodoc:
     instance_variables.inject({}) do |values, name|
@@ -24,7 +24,7 @@ class Object
   #       @x, @y = x, y
   #     end
   #   end
-  #   
+  #
   #   C.new(0, 1).instance_variable_names # => ["@y", "@x"]
   if RUBY_VERSION >= '1.9'
     def instance_variable_names
@@ -47,15 +47,15 @@ class Object
   #     def initialize(x, y, z)
   #       @x, @y, @z = x, y, z
   #     end
-  #   
+  #
   #     def protected_instance_variables
   #       %w(@z)
   #     end
   #   end
-  #   
+  #
   #   a = C.new(0, 1, 2)
   #   b = C.new(3, 4, 5)
-  #   
+  #
   #   a.copy_instance_variables_from(b, [:@y])
   #   # a is now: @x = 3, @y = 1, @z = 2
   def copy_instance_variables_from(object, exclude = []) #:nodoc:

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

@@ -0,0 +1,43 @@
+class Object
+  # Returns +value+ after yielding +value+ to the block. This simplifies the
+  # process of constructing an object, performing work on the object, and then
+  # returning the object from a method. It is a Ruby-ized realization of the K
+  # combinator, courtesy of Mikael Brockman.
+  #
+  # ==== Examples
+  #
+  #  # Without returning
+  #  def foo
+  #    values = []
+  #    values << "bar"
+  #    values << "baz"
+  #    return values
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  #
+  #  # returning with a local variable
+  #  def foo
+  #    returning values = [] do
+  #      values << 'bar'
+  #      values << 'baz'
+  #    end
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  #
+  #  # returning with a block argument
+  #  def foo
+  #    returning [] do |values|
+  #      values << 'bar'
+  #      values << 'baz'
+  #    end
+  #  end
+  #
+  #  foo # => ['bar', 'baz']
+  def returning(value)
+    ActiveSupport::Deprecation.warn('Object#returning has been deprecated in favor of Object#tap.', caller)
+    yield(value)
+    value
+  end
+end

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

@@ -6,7 +6,7 @@ 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/string/access.rb

@@ -4,27 +4,27 @@ 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: 
+    # 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: 
+    # 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: 
+    # Examples:
     #   "hello".to(0)  # => "h"
     #   "hello".to(2)  # => "hel"
     #   "hello".to(10) # => "hello"
@@ -34,7 +34,7 @@ class String
 
     # Returns the first character of the string or the first +limit+ characters.
     #
-    # Examples: 
+    # Examples:
     #   "hello".first     # => "h"
     #   "hello".first(2)  # => "he"
     #   "hello".first(10) # => "hello"
@@ -50,7 +50,7 @@ class String
 
     # Returns the last character of the string or the last +limit+ characters.
     #
-    # Examples: 
+    # Examples:
     #   "hello".last     # => "o"
     #   "hello".last(2)  # => "lo"
     #   "hello".last(10) # => "hello"