activesupport 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+*2.1.2 (October 23rd, 2008)*
+
+* TimeWithZone#freeze: preload instance variables so that we can actually freeze [Geoff Buesing]
+
+
 *2.1.1 (September 4th, 2008)*
 
 * Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved]:activesupport/CHANGELOG

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

@@ -10,7 +10,7 @@ module ActiveSupport #:nodoc:
       module Except
         # Returns a new hash without the given keys.
         def except(*keys)
-          clone.except!(*keys)
+          dup.except!(*keys)
         end
 
         # Replaces the hash without only the given keys.

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

@@ -15,7 +15,7 @@ module ActiveSupport #:nodoc:
         # Returns a new hash with only the given keys.
         def slice(*keys)
           allowed = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
-          hash = {}
+          hash = self.class.new
           allowed.each { |k| hash[k] = self[k] if has_key?(k) }
           hash
         end

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

@@ -3,18 +3,17 @@ class Object
     Class.remove_class(*subclasses_of(*superclasses))
   end
 
-  # Exclude this class unless it's a subclass of our supers and is defined.
-  # We check defined? in case we find a removed class that has yet to be
-  # garbage collected. This also fails for anonymous classes -- please
-  # submit a patch if you have a workaround.
   def subclasses_of(*superclasses) #:nodoc:
     subclasses = []
 
-    superclasses.each do |sup|
-      ObjectSpace.each_object(class << sup; self; end) do |k|
-        if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
-          subclasses << k
-        end
+    # Exclude this class unless it's a subclass of our supers and is defined.
+    # We check defined? in case we find a removed class that has yet to be
+    # garbage collected. This also fails for anonymous classes -- please
+    # submit a patch if you have a workaround.
+    ObjectSpace.each_object(Class) do |k|
+      if superclasses.any? { |superclass| k < superclass } &&
+        (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+        subclasses << k
       end
     end
 

data/lib/active_support/core_ext/rexml.rb

@@ -5,7 +5,8 @@ require 'rexml/entity'
 # http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
 # This fix is identical to rexml-expansion-fix version 1.0.1
 
-unless REXML::VERSION > "3.1.7.2"
+# Earlier versions of rexml defined REXML::Version, newer ones REXML::VERSION
+unless (defined?(REXML::VERSION) ? REXML::VERSION : REXML::Version) > "3.1.7.2"
   module REXML
     class Entity < Child
       undef_method :unnormalized
@@ -32,4 +33,4 @@ unless REXML::VERSION > "3.1.7.2"
       end
     end
   end
-end
+end

data/lib/active_support/deprecation.rb

@@ -51,7 +51,7 @@ module ActiveSupport
 
       private
         def deprecation_message(callstack, message = nil)
-          message ||= "You are using deprecated behavior which will be removed from Rails 2.0."
+          message ||= "You are using deprecated behavior which will be removed from Rails 2.2"
           "DEPRECATION WARNING: #{message}  See http://www.rubyonrails.org/deprecation for details. #{deprecation_caller_message(callstack)}"
         end
 

data/lib/active_support/time_with_zone.rb

@@ -252,10 +252,10 @@ module ActiveSupport
       klass == ::Time || super
     end
     alias_method :kind_of?, :is_a?
-  
-    # Neuter freeze because freezing can cause problems with lazy loading of attributes.
+
     def freeze
-      self
+      period; utc; time # preload instance variables before freezing
+      super
     end
 
     def marshal_dump

data/lib/active_support/values/time_zone.rb

@@ -51,7 +51,7 @@ module ActiveSupport
         "La Paz"                       => "America/La_Paz",
         "Santiago"                     => "America/Santiago",
         "Newfoundland"                 => "America/St_Johns",
-        "Brasilia"                     => "America/Argentina/Buenos_Aires",
+        "Brasilia"                     => "America/Sao_Paulo",
         "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
         "Georgetown"                   => "America/Argentina/San_Juan",
         "Greenland"                    => "America/Godthab",

data/lib/active_support/vendor.rb

@@ -20,7 +20,7 @@ rescue Gem::LoadError
 end
 
 begin
-  gem 'tzinfo', '~> 0.3.9'
+  gem 'tzinfo', '~> 0.3.11'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.9"
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.11"
 end

data/lib/active_support/vendor/{tzinfo-0.3.9 → tzinfo-0.3.11}/tzinfo/definitions/Africa/Casablanca.rb

@@ -32,7 +32,7 @@ module TZInfo
           tz.transition 1984, 3, :o3, 448243200
           tz.transition 1985, 12, :o1, 504918000
           tz.transition 2008, 6, :o2, 1212278400
-          tz.transition 2008, 9, :o1, 1222556400
+          tz.transition 2008, 8, :o1, 1220223600
         end
       end
     end

data/lib/active_support/vendor/{tzinfo-0.3.9 → tzinfo-0.3.11}/tzinfo/definitions/America/Argentina/Buenos_Aires.rb

@@ -74,89 +74,89 @@ module TZInfo
             tz.transition 2000, 3, :o4, 952052400
             tz.transition 2007, 12, :o5, 1198983600
             tz.transition 2008, 3, :o4, 1205632800
-            tz.transition 2008, 10, :o5, 1223175600
+            tz.transition 2008, 10, :o5, 1224385200
             tz.transition 2009, 3, :o4, 1237082400
-            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2009, 10, :o5, 1255834800
             tz.transition 2010, 3, :o4, 1269136800
-            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2010, 10, :o5, 1287284400
             tz.transition 2011, 3, :o4, 1300586400
-            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2011, 10, :o5, 1318734000
             tz.transition 2012, 3, :o4, 1332036000
-            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2012, 10, :o5, 1350788400
             tz.transition 2013, 3, :o4, 1363485600
-            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2013, 10, :o5, 1382238000
             tz.transition 2014, 3, :o4, 1394935200
-            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2014, 10, :o5, 1413687600
             tz.transition 2015, 3, :o4, 1426384800
-            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2015, 10, :o5, 1445137200
             tz.transition 2016, 3, :o4, 1458439200
-            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2016, 10, :o5, 1476586800
             tz.transition 2017, 3, :o4, 1489888800
-            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2017, 10, :o5, 1508036400
             tz.transition 2018, 3, :o4, 1521338400
-            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2018, 10, :o5, 1540090800
             tz.transition 2019, 3, :o4, 1552788000
-            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2019, 10, :o5, 1571540400
             tz.transition 2020, 3, :o4, 1584237600
-            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2020, 10, :o5, 1602990000
             tz.transition 2021, 3, :o4, 1616292000
-            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2021, 10, :o5, 1634439600
             tz.transition 2022, 3, :o4, 1647741600
-            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2022, 10, :o5, 1665889200
             tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2023, 10, :o5, 1697338800
             tz.transition 2024, 3, :o4, 1710640800
-            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2024, 10, :o5, 1729393200
             tz.transition 2025, 3, :o4, 1742090400
-            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2025, 10, :o5, 1760842800
             tz.transition 2026, 3, :o4, 1773540000
-            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2026, 10, :o5, 1792292400
             tz.transition 2027, 3, :o4, 1805594400
-            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2027, 10, :o5, 1823742000
             tz.transition 2028, 3, :o4, 1837044000
-            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2028, 10, :o5, 1855191600
             tz.transition 2029, 3, :o4, 1868493600
-            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2029, 10, :o5, 1887246000
             tz.transition 2030, 3, :o4, 1899943200
-            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2030, 10, :o5, 1918695600
             tz.transition 2031, 3, :o4, 1931392800
-            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2031, 10, :o5, 1950145200
             tz.transition 2032, 3, :o4, 1963447200
-            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2032, 10, :o5, 1981594800
             tz.transition 2033, 3, :o4, 1994896800
-            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2033, 10, :o5, 2013044400
             tz.transition 2034, 3, :o4, 2026346400
-            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2034, 10, :o5, 2044494000
             tz.transition 2035, 3, :o4, 2057796000
-            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2035, 10, :o5, 2076548400
             tz.transition 2036, 3, :o4, 2089245600
-            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2036, 10, :o5, 2107998000
             tz.transition 2037, 3, :o4, 2120695200
-            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2037, 10, :o5, 2139447600
             tz.transition 2038, 3, :o4, 29586043, 12
-            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2038, 10, :o5, 19725709, 8
             tz.transition 2039, 3, :o4, 29590411, 12
-            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2039, 10, :o5, 19728621, 8
             tz.transition 2040, 3, :o4, 29594779, 12
-            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2040, 10, :o5, 19731589, 8
             tz.transition 2041, 3, :o4, 29599147, 12
-            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2041, 10, :o5, 19734501, 8
             tz.transition 2042, 3, :o4, 29603515, 12
-            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2042, 10, :o5, 19737413, 8
             tz.transition 2043, 3, :o4, 29607883, 12
-            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2043, 10, :o5, 19740325, 8
             tz.transition 2044, 3, :o4, 29612335, 12
-            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2044, 10, :o5, 19743237, 8
             tz.transition 2045, 3, :o4, 29616703, 12
-            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2045, 10, :o5, 19746149, 8
             tz.transition 2046, 3, :o4, 29621071, 12
-            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2046, 10, :o5, 19749117, 8
             tz.transition 2047, 3, :o4, 29625439, 12
-            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2047, 10, :o5, 19752029, 8
             tz.transition 2048, 3, :o4, 29629807, 12
-            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2048, 10, :o5, 19754941, 8
             tz.transition 2049, 3, :o4, 29634259, 12
-            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2049, 10, :o5, 19757853, 8
             tz.transition 2050, 3, :o4, 29638627, 12
           end
         end

data/lib/active_support/vendor/{tzinfo-0.3.9 → tzinfo-0.3.11}/tzinfo/definitions/America/Argentina/San_Juan.rb

@@ -78,89 +78,89 @@ module TZInfo
             tz.transition 2004, 7, :o4, 1090728000
             tz.transition 2007, 12, :o5, 1198983600
             tz.transition 2008, 3, :o4, 1205632800
-            tz.transition 2008, 10, :o5, 1223175600
+            tz.transition 2008, 10, :o5, 1224385200
             tz.transition 2009, 3, :o4, 1237082400
-            tz.transition 2009, 10, :o5, 1254625200
+            tz.transition 2009, 10, :o5, 1255834800
             tz.transition 2010, 3, :o4, 1269136800
-            tz.transition 2010, 10, :o5, 1286074800
+            tz.transition 2010, 10, :o5, 1287284400
             tz.transition 2011, 3, :o4, 1300586400
-            tz.transition 2011, 10, :o5, 1317524400
+            tz.transition 2011, 10, :o5, 1318734000
             tz.transition 2012, 3, :o4, 1332036000
-            tz.transition 2012, 10, :o5, 1349578800
+            tz.transition 2012, 10, :o5, 1350788400
             tz.transition 2013, 3, :o4, 1363485600
-            tz.transition 2013, 10, :o5, 1381028400
+            tz.transition 2013, 10, :o5, 1382238000
             tz.transition 2014, 3, :o4, 1394935200
-            tz.transition 2014, 10, :o5, 1412478000
+            tz.transition 2014, 10, :o5, 1413687600
             tz.transition 2015, 3, :o4, 1426384800
-            tz.transition 2015, 10, :o5, 1443927600
+            tz.transition 2015, 10, :o5, 1445137200
             tz.transition 2016, 3, :o4, 1458439200
-            tz.transition 2016, 10, :o5, 1475377200
+            tz.transition 2016, 10, :o5, 1476586800
             tz.transition 2017, 3, :o4, 1489888800
-            tz.transition 2017, 10, :o5, 1506826800
+            tz.transition 2017, 10, :o5, 1508036400
             tz.transition 2018, 3, :o4, 1521338400
-            tz.transition 2018, 10, :o5, 1538881200
+            tz.transition 2018, 10, :o5, 1540090800
             tz.transition 2019, 3, :o4, 1552788000
-            tz.transition 2019, 10, :o5, 1570330800
+            tz.transition 2019, 10, :o5, 1571540400
             tz.transition 2020, 3, :o4, 1584237600
-            tz.transition 2020, 10, :o5, 1601780400
+            tz.transition 2020, 10, :o5, 1602990000
             tz.transition 2021, 3, :o4, 1616292000
-            tz.transition 2021, 10, :o5, 1633230000
+            tz.transition 2021, 10, :o5, 1634439600
             tz.transition 2022, 3, :o4, 1647741600
-            tz.transition 2022, 10, :o5, 1664679600
+            tz.transition 2022, 10, :o5, 1665889200
             tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 10, :o5, 1696129200
+            tz.transition 2023, 10, :o5, 1697338800
             tz.transition 2024, 3, :o4, 1710640800
-            tz.transition 2024, 10, :o5, 1728183600
+            tz.transition 2024, 10, :o5, 1729393200
             tz.transition 2025, 3, :o4, 1742090400
-            tz.transition 2025, 10, :o5, 1759633200
+            tz.transition 2025, 10, :o5, 1760842800
             tz.transition 2026, 3, :o4, 1773540000
-            tz.transition 2026, 10, :o5, 1791082800
+            tz.transition 2026, 10, :o5, 1792292400
             tz.transition 2027, 3, :o4, 1805594400
-            tz.transition 2027, 10, :o5, 1822532400
+            tz.transition 2027, 10, :o5, 1823742000
             tz.transition 2028, 3, :o4, 1837044000
-            tz.transition 2028, 10, :o5, 1853982000
+            tz.transition 2028, 10, :o5, 1855191600
             tz.transition 2029, 3, :o4, 1868493600
-            tz.transition 2029, 10, :o5, 1886036400
+            tz.transition 2029, 10, :o5, 1887246000
             tz.transition 2030, 3, :o4, 1899943200
-            tz.transition 2030, 10, :o5, 1917486000
+            tz.transition 2030, 10, :o5, 1918695600
             tz.transition 2031, 3, :o4, 1931392800
-            tz.transition 2031, 10, :o5, 1948935600
+            tz.transition 2031, 10, :o5, 1950145200
             tz.transition 2032, 3, :o4, 1963447200
-            tz.transition 2032, 10, :o5, 1980385200
+            tz.transition 2032, 10, :o5, 1981594800
             tz.transition 2033, 3, :o4, 1994896800
-            tz.transition 2033, 10, :o5, 2011834800
+            tz.transition 2033, 10, :o5, 2013044400
             tz.transition 2034, 3, :o4, 2026346400
-            tz.transition 2034, 10, :o5, 2043284400
+            tz.transition 2034, 10, :o5, 2044494000
             tz.transition 2035, 3, :o4, 2057796000
-            tz.transition 2035, 10, :o5, 2075338800
+            tz.transition 2035, 10, :o5, 2076548400
             tz.transition 2036, 3, :o4, 2089245600
-            tz.transition 2036, 10, :o5, 2106788400
+            tz.transition 2036, 10, :o5, 2107998000
             tz.transition 2037, 3, :o4, 2120695200
-            tz.transition 2037, 10, :o5, 2138238000
+            tz.transition 2037, 10, :o5, 2139447600
             tz.transition 2038, 3, :o4, 29586043, 12
-            tz.transition 2038, 10, :o5, 19725597, 8
+            tz.transition 2038, 10, :o5, 19725709, 8
             tz.transition 2039, 3, :o4, 29590411, 12
-            tz.transition 2039, 10, :o5, 19728509, 8
+            tz.transition 2039, 10, :o5, 19728621, 8
             tz.transition 2040, 3, :o4, 29594779, 12
-            tz.transition 2040, 10, :o5, 19731477, 8
+            tz.transition 2040, 10, :o5, 19731589, 8
             tz.transition 2041, 3, :o4, 29599147, 12
-            tz.transition 2041, 10, :o5, 19734389, 8
+            tz.transition 2041, 10, :o5, 19734501, 8
             tz.transition 2042, 3, :o4, 29603515, 12
-            tz.transition 2042, 10, :o5, 19737301, 8
+            tz.transition 2042, 10, :o5, 19737413, 8
             tz.transition 2043, 3, :o4, 29607883, 12
-            tz.transition 2043, 10, :o5, 19740213, 8
+            tz.transition 2043, 10, :o5, 19740325, 8
             tz.transition 2044, 3, :o4, 29612335, 12
-            tz.transition 2044, 10, :o5, 19743125, 8
+            tz.transition 2044, 10, :o5, 19743237, 8
             tz.transition 2045, 3, :o4, 29616703, 12
-            tz.transition 2045, 10, :o5, 19746037, 8
+            tz.transition 2045, 10, :o5, 19746149, 8
             tz.transition 2046, 3, :o4, 29621071, 12
-            tz.transition 2046, 10, :o5, 19749005, 8
+            tz.transition 2046, 10, :o5, 19749117, 8
             tz.transition 2047, 3, :o4, 29625439, 12
-            tz.transition 2047, 10, :o5, 19751917, 8
+            tz.transition 2047, 10, :o5, 19752029, 8
             tz.transition 2048, 3, :o4, 29629807, 12
-            tz.transition 2048, 10, :o5, 19754829, 8
+            tz.transition 2048, 10, :o5, 19754941, 8
             tz.transition 2049, 3, :o4, 29634259, 12
-            tz.transition 2049, 10, :o5, 19757741, 8
+            tz.transition 2049, 10, :o5, 19757853, 8
             tz.transition 2050, 3, :o4, 29638627, 12
           end
         end