Permalink
Browse files

Convert date extension modules to class reopens

  • Loading branch information...
1 parent bd28c7b commit c43dec888a4823b36ee4369be0558b94d475d734 @jeremy jeremy committed Mar 21, 2009
@@ -1,3 +1,5 @@
require 'active_support/core_ext/util'
require 'date'
-ActiveSupport.core_ext Date, %w(behavior calculations conversions)
+require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/freeze'
+ActiveSupport.core_ext Date, %w(calculations conversions)
@@ -0,0 +1,9 @@
+require 'date'
+
+class Date
+ # Enable more predictable duck-typing on Date-like classes. See
+ # Object#acts_like?.
+ def acts_like_date?
+ true
+ end
+end
@@ -1,42 +0,0 @@
-require 'date'
-
-module ActiveSupport #:nodoc:
- module CoreExtensions #:nodoc:
- module Date #:nodoc:
- module Behavior
- # Enable more predictable duck-typing on Date-like classes. See
- # Object#acts_like?.
- def acts_like_date?
- true
- end
-
- # 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.
- #
- # Ruby 1.9 uses a preinitialized instance variable so it's unaffected.
- # This hack is as close as we can get to feature detection:
- begin
- ::Date.today.freeze.jd
- rescue => frozen_object_error
- if frozen_object_error.message =~ /frozen/
- 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
-
- super
- end
- end
- end
- end
- end
- end
-end
@@ -0,0 +1,31 @@
+# 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.
+#
+# 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 RUBY_VERSION < '1.9'
+ require 'date'
+ begin
+ ::Date.today.freeze.jd
+ rescue => frozen_object_error
+ if frozen_object_error.message =~ /frozen/
+ class Date #:nodoc:
+ def freeze
+ self.class.private_instance_methods(false).each do |m|
+ if m.to_s =~ /\A__\d+__\Z/
+ instance_variable_set(:"@#{m}", [send(m)])
+ end
+ end
+
+ super
+ end
+ end
+ end
+ end
+end

0 comments on commit c43dec8

Please sign in to comment.