activesupport 3.1.0.beta1 → 3.1.0.rc1

data/CHANGELOG

@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* New reporting method Kernel#quietly. [fxn]
+
 * Add String#inquiry as a convenience method for turning a string into a StringInquirer object [DHH]
 
 * Add Object#in? to test if an object is included in another object [Prem Sichanugrist, Brian Morearty, John Reitano]
@@ -19,14 +21,44 @@ advantage of the new ClassCache.
 
 * Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
 
-*Rails 3.0.2 (unreleased)*
+* JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. [Josh Kalderimis]
+
+
+*Rails 3.0.7 (April 18, 2011)*
+
+* Hash.from_xml no longer loses attributes on tags containing only whitespace [André Arko]
+
+
+*Rails 3.0.6 (April 5, 2011)
+
+* No changes.
+
+
+*Rails 3.0.5 (February 26, 2011)*
+
+* No changes.
+
+
+*Rails 3.0.4 (February 8, 2011)*
+
+* No changes.
+
+
+*Rails 3.0.3 (November 16, 2010)*
+
+* No changes.
+
+
+*Rails 3.0.2 (November 15, 2010)*
 
 * Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
 
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
 
+
 *Rails 3.0.0 (August 29, 2010)*
 
 * Implemented String#strip_heredoc. [fxn]

data/README.rdoc

@@ -30,4 +30,4 @@ API documentation is at
 
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 
-* https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets
+* https://github.com/rails/rails/issues

data/lib/active_support.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005 David Heinemeier Hansson
+# Copyright (c) 2005-2011 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/active_support/buffered_logger.rb

@@ -48,12 +48,17 @@ module ActiveSupport
       if log.respond_to?(:write)
         @log = log
       elsif File.exist?(log)
-        @log = open(log, (File::WRONLY | File::APPEND))
-        @log.sync = true
+        @log = open_log(log, (File::WRONLY | File::APPEND))
       else
         FileUtils.mkdir_p(File.dirname(log))
-        @log = open(log, (File::WRONLY | File::APPEND | File::CREAT))
-        @log.sync = true
+        @log = open_log(log, (File::WRONLY | File::APPEND | File::CREAT))
+      end
+    end
+
+    def open_log(log, mode)
+      open(log, mode).tap do |open_log|
+        open_log.set_encoding(Encoding::BINARY) if open_log.respond_to?(:set_encoding)
+        open_log.sync = true
       end
     end
 

data/lib/active_support/configurable.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 require 'active_support/ordered_options'
 require 'active_support/core_ext/kernel/singleton_class'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/array/extract_options'
 
 module ActiveSupport
   # Configurable provides a <tt>config</tt> method to store and retrieve
@@ -51,14 +52,16 @@ module ActiveSupport
       #   user.allowed_access # => true
       #
       def config_accessor(*names)
+        options = names.extract_options!
+
         names.each do |name|
-          code, line = <<-RUBY, __LINE__ + 1
-            def #{name}; config.#{name}; end
-            def #{name}=(value); config.#{name} = value; end
-          RUBY
+          reader, line = "def #{name}; config.#{name}; end", __LINE__
+          writer, line = "def #{name}=(value); config.#{name} = value; end", __LINE__
 
-          singleton_class.class_eval code, __FILE__, line
-          class_eval code, __FILE__, line
+          singleton_class.class_eval reader, __FILE__, line
+          singleton_class.class_eval writer, __FILE__, line
+          class_eval reader, __FILE__, line unless options[:instance_reader] == false
+          class_eval writer, __FILE__, line unless options[:instance_writer] == false
         end
       end
     end

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

@@ -37,12 +37,12 @@ class Array
   # Converts a collection of elements into a formatted string by calling
   # <tt>to_s</tt> on all elements and joining them:
   #
-  #   Blog.find(:all).to_formatted_s # => "First PostSecond PostThird Post"
+  #   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
   #
   # Adding in the <tt>:db</tt> argument as the format yields a prettier
   # output:
   #
-  #   Blog.find(:all).to_formatted_s(:db) # => "First Post,Second Post,Third Post"
+  #   Blog.all.to_formatted_s(:db) # => "First Post,Second Post,Third Post"
   def to_formatted_s(format = :default)
     case format
       when :db

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

@@ -7,7 +7,7 @@ class Array
   #
   #   [1,2,3,4,5,6].sample     # => 4
   #   [1,2,3,4,5,6].sample(3)  # => [2, 4, 5]
-  #   [1,2,3,4,5,6].sample(-3) # => ArgumentError: negative sample number
+  #   [1,2,3,4,5,6].sample(-3) # => ArgumentError: negative array size
   #              [].sample     # => nil
   #              [].sample(3)  # => []
   def sample(n=nil)

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

@@ -1,8 +1,7 @@
 class Array
-  # Return an unique array based on the criteria given as a proc.
+  # Returns an unique array based on the criteria given as a +Proc+.
   #
-  #   [1, 2, 3, 4].uniq_by { |i| i.odd? }
-  #   # => [1, 2]
+  #   [1, 2, 3, 4].uniq_by { |i| i.odd? } # => [1, 2]
   #
   def uniq_by
     hash, array = {}, []

data/lib/active_support/core_ext/class/inheritable_attributes.rb

@@ -130,7 +130,6 @@ class Class # :nodoc:
   end
 
   def write_inheritable_attribute(key, value)
-    ActiveSupport::Deprecation.warn ClassInheritableAttributes::DEPRECATION_WARNING_MESSAGE
     if inheritable_attributes.equal?(EMPTY_INHERITABLE_ATTRIBUTES)
       @inheritable_attributes = {}
     end
@@ -148,7 +147,6 @@ class Class # :nodoc:
   end
 
   def read_inheritable_attribute(key)
-    ActiveSupport::Deprecation.warn ClassInheritableAttributes::DEPRECATION_WARNING_MESSAGE
     inheritable_attributes[key]
   end
 

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

@@ -206,7 +206,7 @@ class Date
 
   # Returns a new ; DateTime objects will have time set to 0:00DateTime representing the start of the month (1st of the month; DateTime objects will have time set to 0:00)
   def beginning_of_month
-    self.acts_like?(:time) ? change(:day => 1,:hour => 0, :min => 0, :sec => 0) : change(:day => 1)
+    self.acts_like?(:time) ? change(:day => 1, :hour => 0) : change(:day => 1)
   end
   alias :at_beginning_of_month :beginning_of_month
 
@@ -231,13 +231,13 @@ class Date
 
   # Returns a new Date/DateTime representing the start of the year (1st of january; DateTime objects will have time set to 0:00)
   def beginning_of_year
-    self.acts_like?(:time) ? change(:month => 1, :day => 1, :hour => 0, :min => 0, :sec => 0) : change(:month => 1, :day => 1)
+    self.acts_like?(:time) ? change(:month => 1, :day => 1, :hour => 0) : change(:month => 1, :day => 1)
   end
   alias :at_beginning_of_year :beginning_of_year
 
   # Returns a new Time representing the end of the year (31st of december; DateTime objects will have time set to 23:59:59)
   def end_of_year
-    self.acts_like?(:time) ? change(:month => 12,:day => 31,:hour => 23, :min => 59, :sec => 59) : change(:month => 12, :day => 31)
+    self.acts_like?(:time) ? change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59) : change(:month => 12, :day => 31)
   end
   alias :at_end_of_year :end_of_year
 

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

@@ -1,6 +1,7 @@
 require 'date'
 require 'active_support/inflector/methods'
 require 'active_support/core_ext/date/zones'
+require 'active_support/core_ext/module/remove_method'
 
 class Date
   DATE_FORMATS = {
@@ -13,10 +14,10 @@ class Date
   }
 
   # Ruby 1.9 has Date#to_time which converts to localtime only.
-  remove_method :to_time if method_defined?(:to_time)
+  remove_possible_method :to_time
 
   # Ruby 1.9 has Date#xmlschema which converts to a string without the time component.
-  remove_method :xmlschema if method_defined?(:xmlschema)
+  remove_possible_method :xmlschema
 
   # Convert to a formatted string. See DATE_FORMATS for predefined formats.
   #

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

@@ -51,25 +51,25 @@ class DateTime
     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"
+  # 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)
   end
   alias_method :default_inspect, :inspect
   alias_method :inspect, :readable_inspect
 
-  # Converts self to a Ruby Date object; time portion is discarded
+  # Converts self to a Ruby Date object; time portion is discarded.
   def to_date
     ::Date.new(year, month, day)
   end unless instance_methods(false).include?(:to_date)
 
-  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class
-  # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time
+  # Attempts to convert self to a Ruby Time object; returns self if out of range of Ruby Time class.
+  # If self has an offset other than 0, self will just be returned unaltered, since there's no clean way to map it to a Time.
   def to_time
     self.offset == 0 ? ::Time.utc_time(year, month, day, hour, min, sec, sec_fraction * (RUBY_VERSION < '1.9' ? 86400000000 : 1000000)) : self
   end
 
-  # To be able to keep Times, Dates and DateTimes interchangeable on conversions
+  # To be able to keep Times, Dates and DateTimes interchangeable on conversions.
   def to_datetime
     self
   end unless instance_methods(false).include?(:to_datetime)
@@ -79,17 +79,17 @@ class DateTime
     civil(year, month, day, hour, min, sec, offset)
   end
 
-  # Converts datetime to an appropriate format for use in XML
+  # Converts datetime to an appropriate format for use in XML.
   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
 
-  # Converts self to an integer number of seconds since the Unix epoch
+  # Converts self to an integer number of seconds since the Unix epoch.
   def to_i
     seconds_since_unix_epoch.to_i
   end

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

@@ -108,7 +108,8 @@ class Hash
                   raise "can't typecast #{entries.inspect}"
                 end
               end
-            elsif value['type'] == 'file' || value["__content__"].present?
+            elsif value['type'] == 'file' || 
+               (value["__content__"] && (value.keys.size == 1 || value["__content__"].present?))
               content = value["__content__"]
               if parser = ActiveSupport::XmlMini::PARSING[value["type"]]
                 parser.arity == 1 ? parser.call(content) : parser.call(content, value)

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

@@ -9,4 +9,16 @@ class Hash
   def with_indifferent_access
     ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(self)
   end
+
+  # Called when object is nested under an object that receives
+  # #with_indifferent_access. This method with be called on the current object
+  # by the enclosing object and is aliased to #with_indifferent_access by
+  # default. Subclasses of Hash may overwrite this method to return +self+ if
+  # converting to an +ActiveSupport::HashWithIndifferentAccess+ would not be
+  # desirable.
+  #
+  #   b = {:b => 1}
+  #   {:a => b}.with_indifferent_access["a"] # calls b.nested_under_indifferent_access
+  #
+  alias nested_under_indifferent_access with_indifferent_access
 end

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

@@ -21,7 +21,7 @@ class Hash
 
   # Replaces the hash with only the given keys.
   # Returns a hash contained the removed key/value pairs
-  #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d =>4}
+  #   {:a => 1, :b => 2, :c => 3, :d => 4}.slice!(:a, :b) # => {:c => 3, :d => 4}
   def slice!(*keys)
     keys = keys.map! { |key| convert_key(key) } if respond_to?(:convert_key)
     omit = slice(*self.keys - keys)

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

@@ -4,10 +4,13 @@ class Integer
   # Ordinalize turns a number into an ordinal string used to denote the
   # position in an ordered sequence such as 1st, 2nd, 3rd, 4th.
   #
-  #   1.ordinalize    # => "1st"
-  #   2.ordinalize    # => "2nd"
-  #   1002.ordinalize # => "1002nd"
-  #   1003.ordinalize # => "1003rd"
+  #  1.ordinalize     # => "1st"
+  #  2.ordinalize     # => "2nd"
+  #  1002.ordinalize  # => "1002nd"
+  #  1003.ordinalize  # => "1003rd"
+  #  -11.ordinalize   # => "-11th"
+  #  -1001.ordinalize # => "-1001st"
+  #
   def ordinalize
     ActiveSupport::Inflector.ordinalize(self)
   end

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

@@ -62,7 +62,7 @@ module Kernel
   
   # Captures the given stream and returns it:
   #
-  #   stream = capture(:stdout){ puts "Cool" }
+  #   stream = capture(:stdout) { puts "Cool" }
   #   stream # => "Cool\n"
   #
   def capture(stream)
@@ -78,4 +78,16 @@ module Kernel
     result
   end
   alias :silence :capture
+
+  # Silences both STDOUT and STDERR, even for subprocesses.
+  #
+  #   quietly { system 'bundle install' }
+  #
+  def quietly
+    silence_stream(STDOUT) do
+      silence_stream(STDERR) do
+        yield
+      end
+    end
+  end
 end

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

@@ -19,6 +19,7 @@ class Module
   #   attr_accessor_with_default(:element_name) { name.underscore }
   #
   def attr_accessor_with_default(sym, default = Proc.new)
+    ActiveSupport::Deprecation.warn "attr_accessor_with_default is deprecated. Use Ruby instead!"
     define_method(sym, block_given? ? default : Proc.new { default })
     module_eval(<<-EVAL, __FILE__, __LINE__ + 1)
       def #{sym}=(value)                          # def age=(value)

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

@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
 class Module
   # Declare that a method has been deprecated.
   #   deprecate :foo

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

@@ -1,4 +1,6 @@
 require 'active_support/duration'
+require 'active_support/core_ext/time/calculations'
+require 'active_support/core_ext/time/acts_like'
 
 class Numeric
   # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.

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

@@ -1,14 +1,14 @@
 class Object
   # An object is blank if it's false, empty, or a whitespace string.
-  # For example, "", "   ", +nil+, [], and {} are blank.
+  # For example, "", "   ", +nil+, [], and {} are all blank.
   #
   # This simplifies:
   #
-  #   if !address.nil? && !address.empty?
+  #   if address.nil? || address.empty?
   #
   # ...to:
   #
-  #   if !address.blank?
+  #   if address.blank?
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end

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

@@ -1,3 +1,4 @@
+#--
 # Most objects are cloneable, but not all. For example you can't dup +nil+:
 #
 #   nil.dup # => TypeError: can't dup NilClass
@@ -14,6 +15,7 @@
 #
 # That's why we hardcode the following cases and check duplicable? instead of
 # using that rescue idiom.
+#++
 class Object
   # Can you safely dup this object?
   #

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

@@ -28,6 +28,8 @@ class Object
   def try(*a, &b)
     if a.empty? && block_given?
       yield self
+    elsif !a.empty? && !respond_to?(a.first)
+      nil
     else
       __send__(*a, &b)
     end

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

@@ -7,7 +7,7 @@ class Object
   # provided. Each method called on the block variable must take an options
   # hash as its final argument.
   #
-  # Without with_options, this code contains duplication:
+  # Without <tt>with_options></tt>, this code contains duplication:
   #
   #   class Account < ActiveRecord::Base
   #     has_many :customers, :dependent => :destroy
@@ -16,7 +16,7 @@ class Object
   #     has_many :expenses,  :dependent => :destroy
   #   end
   #
-  # Using with_options, we can remove the duplication:
+  # Using <tt>with_options</tt>, we can remove the duplication:
   #
   #   class Account < ActiveRecord::Base
   #     with_options :dependent => :destroy do |assoc|
@@ -29,11 +29,14 @@ class Object
   #
   # It can also be used with an explicit receiver:
   #
-  #   map.with_options :controller => "people" do |people|
-  #     people.connect "/people",     :action => "index"
-  #     people.connect "/people/:id", :action => "show"
+  #   I18n.with_options :locale => user.locale, :scope => "newsletter" do |i18n|
+  #     subject i18n.t :subject
+  #     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