diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-28 22:27:55 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-28 22:27:55 -0700 |
commit | c94f6ea2f30c4fa27cfe18db3af92b2633bcad36 (patch) | |
tree | a58cf80f0b583790dc852939247490456be6699b /activesupport | |
parent | 766fb54c8f112aa2ae82a031a4bb1b0d040a4e84 (diff) | |
download | rails-c94f6ea2f30c4fa27cfe18db3af92b2633bcad36.tar.gz rails-c94f6ea2f30c4fa27cfe18db3af92b2633bcad36.tar.bz2 rails-c94f6ea2f30c4fa27cfe18db3af92b2633bcad36.zip |
Date#freeze bug doesn't affect Ruby 1.9
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date/behavior.rb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/behavior.rb b/activesupport/lib/active_support/core_ext/date/behavior.rb index 6f8f7c6a82..50c77867f8 100644 --- a/activesupport/lib/active_support/core_ext/date/behavior.rb +++ b/activesupport/lib/active_support/core_ext/date/behavior.rb @@ -1,3 +1,5 @@ +require 'date' + module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Date #:nodoc: @@ -10,18 +12,25 @@ module ActiveSupport #:nodoc: # Date memoizes some instance methods using metaprogramming to wrap # the methods with one that caches the result in an instance variable. + # # If a Date is frozen but the memoized method hasn't been called, the # first call will result in a frozen object error since the memo - # instance variable is uninitialized. Work around by eagerly memoizing - # before freezing. - def freeze #:nodoc: - self.class.private_instance_methods(false).each do |m| - if m.to_s =~ /\A__\d+__\Z/ - instance_variable_set(:"@#{m}", [send(m)]) + # instance variable is uninitialized. + # + # Work around by eagerly memoizing before freezing. + # + # Ruby 1.9 uses a preinitialized instance variable so it's unaffected. + # This hack is as close as we can get to feature detection: + if (Date.today.freeze.inspect rescue false) + def freeze #:nodoc: + self.class.private_instance_methods(false).each do |m| + if m.to_s =~ /\A__\d+__\Z/ + instance_variable_set(:"@#{m}", [send(m)]) + end end - end - super + super + end end end end |