aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time/conversions.rb
diff options
context:
space:
mode:
authorSerguei Filimonov <serguei.filimonov@gmail.com>2009-12-11 13:08:00 -0800
committerGeoff Buesing <gbuesing@gmail.com>2009-12-15 08:15:21 -0600
commit2ae8300489aaaaaa65f50f3557090b265a2dcc6a (patch)
treebd60f7573422006c15b500862b19b2bef817f843 /activesupport/lib/active_support/core_ext/date_time/conversions.rb
parent7b61541ea53c309847753d5553baa2eed9cc6282 (diff)
downloadrails-2ae8300489aaaaaa65f50f3557090b265a2dcc6a.tar.gz
rails-2ae8300489aaaaaa65f50f3557090b265a2dcc6a.tar.bz2
rails-2ae8300489aaaaaa65f50f3557090b265a2dcc6a.zip
Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly on ActiveRecord models with DateTime attributes.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/conversions.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/conversions.rb15
1 files changed, 13 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
index 5f01bc4fd6..47a31839a6 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -78,7 +78,18 @@ class DateTime
# Converts self to a floating-point number of seconds since the Unix epoch
def to_f
- days_since_unix_epoch = self - ::DateTime.civil(1970)
- (days_since_unix_epoch * 86_400).to_f
+ seconds_since_unix_epoch.to_f
+ end
+
+ # Converts self to an integer number of seconds since the Unix epoch
+ def to_i
+ seconds_since_unix_epoch.to_i
+ end
+
+ private
+
+ def seconds_since_unix_epoch
+ seconds_per_day = 86_400
+ (self - ::DateTime.civil(1970)) * seconds_per_day
end
end