activesupport 3.1.0 → 3.1.1.rc1

data/CHANGELOG

@@ -1,4 +1,10 @@
-*Rails 3.1.0 (unreleased)*
+*Rails 3.1.1 (unreleased)*
+
+* Fixed performance issue where TimeZone lookups would require tzinfo each time [Tim Lucas]
+
+* ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist]
+
+*Rails 3.1.0 (August 30, 2011)*
 
 * ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
 return the value from `super` [Aaron Patterson]

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

@@ -29,8 +29,11 @@ class BigDecimal
     coder.represent_scalar(nil, YAML_MAPPING[string] || string)
   end
 
-  def to_d
-    self
+  # Backport this method if it doesn't exist
+  unless method_defined?(:to_d)
+    def to_d
+      self
+    end
   end
 
   DEFAULT_STRING_FORMAT = 'F'

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

@@ -95,7 +95,7 @@ class Hash
         case value.class.to_s
           when 'Hash'
             if value['type'] == 'array'
-              _, entries = Array.wrap(value.detect { |k,v| k != 'type' })
+              _, entries = Array.wrap(value.detect { |k,v| not v.is_a?(String) })
               if entries.nil? || (c = value['__content__'] && c.blank?)
                 []
               else

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

@@ -55,9 +55,31 @@ class Time
     utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
   end
 
+  # Converts a Time object to a Date, dropping hour, minute, and second precision.
+  #
+  #   my_time = Time.now  # => Mon Nov 12 22:59:51 -0500 2007
+  #   my_time.to_date     # => Mon, 12 Nov 2007
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_date                                 # => Tue, 13 Jan 2009
+  def to_date
+    ::Date.new(year, month, day)
+  end unless method_defined?(:to_date)
+
   # A method to keep Time, Date and DateTime instances interchangeable on conversions.
   # In this case, it simply returns +self+.
   def to_time
     self
   end unless method_defined?(:to_time)
+
+  # Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
+  #
+  #   my_time = Time.now    # => Mon Nov 12 23:04:21 -0500 2007
+  #   my_time.to_datetime   # => Mon, 12 Nov 2007 23:04:21 -0500
+  #
+  #   your_time = Time.parse("1/13/2009 1:13:03 P.M.")  # => Tue Jan 13 13:13:03 -0500 2009
+  #   your_time.to_datetime                             # => Tue, 13 Jan 2009 13:13:03 -0500
+  def to_datetime
+    ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400))
+  end unless method_defined?(:to_datetime)
 end

data/lib/active_support/i18n_railtie.rb

@@ -1,5 +1,4 @@
 require "active_support"
-require "rails"
 require "active_support/file_update_checker"
 require "active_support/core_ext/array/wrap"
 
@@ -38,6 +37,8 @@ module I18n
 
   protected
 
+    @i18n_inited = false
+
     # Setup i18n configuration
     def self.initialize_i18n(app)
       return if @i18n_inited

data/lib/active_support/log_subscriber/test_helper.rb

@@ -18,8 +18,8 @@ module ActiveSupport
     #       Developer.all
     #       wait
     #       assert_equal 1, @logger.logged(:debug).size
-    #       assert_match /Developer Load/, @logger.logged(:debug).last
-    #       assert_match /SELECT \* FROM "developers"/, @logger.logged(:debug).last
+    #       assert_match(/Developer Load/, @logger.logged(:debug).last)
+    #       assert_match(/SELECT \* FROM "developers"/, @logger.logged(:debug).last)
     #     end
     #   end
     #

data/lib/active_support/ordered_hash.rb

@@ -47,6 +47,11 @@ module ActiveSupport
       self
     end
 
+    # Returns true to make sure that this hash is extractable via <tt>Array#extract_options!</tt>
+    def extractable_options?
+      true
+    end
+
     # Hash is ordered in Ruby 1.9!
     if RUBY_VERSION < '1.9'
 

data/lib/active_support/railtie.rb

@@ -1,5 +1,4 @@
 require "active_support"
-require "rails"
 require "active_support/i18n_railtie"
 
 module ActiveSupport

data/lib/active_support/time_with_zone.rb

@@ -12,7 +12,7 @@ module ActiveSupport
   #
   #   Time.zone = 'Eastern Time (US & Canada)'        # => 'Eastern Time (US & Canada)'
   #   Time.zone.local(2007, 2, 10, 15, 30, 45)        # => Sat, 10 Feb 2007 15:30:45 EST -05:00
-  #   Time.zone.parse('2007-02-01 15:30:45')          # => Sat, 10 Feb 2007 15:30:45 EST -05:00
+  #   Time.zone.parse('2007-02-10 15:30:45')          # => Sat, 10 Feb 2007 15:30:45 EST -05:00
   #   Time.zone.at(1170361845)                        # => Sat, 10 Feb 2007 15:30:45 EST -05:00
   #   Time.zone.now                                   # => Sun, 18 May 2008 13:07:55 EDT -04:00
   #   Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone  # => Sat, 10 Feb 2007 15:30:45 EST -05:00

data/lib/active_support/values/time_zone.rb

@@ -373,7 +373,7 @@ module ActiveSupport
       protected
 
         def require_tzinfo
-          require 'tzinfo'
+          require 'tzinfo' unless defined?(::TZInfo)
         rescue LoadError
           $stderr.puts "You don't have tzinfo installed in your application. Please add it to your Gemfile and run bundle install"
           raise

data/lib/active_support/version.rb

@@ -2,8 +2,8 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 0
-    PRE   = nil
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 977940594
+  prerelease: true
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  - rc1
+  version: 3.1.1.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-14 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -254,6 +256,7 @@ files:
 - lib/active_support/xml_mini/rexml.rb
 - lib/active_support/xml_mini.rb
 - lib/active_support.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -276,16 +279,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.