aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/active_support_core_extensions.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-06-12 00:18:52 +0200
committerXavier Noria <fxn@hashref.com>2010-06-12 00:19:12 +0200
commitb731948bda27c50793c4d2ef249fee7ae625064c (patch)
tree1d8ebc9b6478fc2e539e3c454ad659c80a636c8b /railties/guides/source/active_support_core_extensions.textile
parent4146a443b6ffc3d250a280a3b5218c0e5d1a54dd (diff)
downloadrails-b731948bda27c50793c4d2ef249fee7ae625064c.tar.gz
rails-b731948bda27c50793c4d2ef249fee7ae625064c.tar.bz2
rails-b731948bda27c50793c4d2ef249fee7ae625064c.zip
AS guide: updates docs on date calculations to reflect a0a6cc2
Diffstat (limited to 'railties/guides/source/active_support_core_extensions.textile')
-rw-r--r--railties/guides/source/active_support_core_extensions.textile26
1 files changed, 21 insertions, 5 deletions
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 06d1a801c8..1c17609b0a 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -2885,11 +2885,9 @@ Date.new(2010, 1, 31).change(:month => 2)
# => ArgumentError: invalid date
</ruby>
-h5. Named Times
+h5. Timestamps
-WARNING: The following methods do not take into account the user time zone. They return timestamps in localtime.
-
-INFO: The following methods return a +Time+ object if possible, otherwise a +DateTime+.
+INFO: The following methods return a +Time+ object if possible, otherwise a +DateTime+. If set, they honor the user time zone.
h6. +beginning_of_day+, +end_of_day+
@@ -2907,7 +2905,25 @@ date = Date.new(2010, 6, 7)
date.end_of_day # => Sun Jun 06 23:59:59 +0200 2010
</ruby>
-+beginning_of_day+ is aliased to +at_beginning_of_day+, +midnight+, +at_midnight+
++beginning_of_day+ is aliased to +at_beginning_of_day+, +midnight+, +at_midnight+.
+
+h6. +ago+, +since+
+
+The method +ago+ receives a number of seconds as argument and returns a timestamp those many seconds ago from midnight:
+
+<ruby>
+date = Date.current # => Fri, 11 Jun 2010
+date.ago(1) # => Thu, 10 Jun 2010 23:59:59 EDT -04:00
+</ruby>
+
+Similarly, +since+ moves forward:
+
+<ruby>
+date = Date.current # => Fri, 11 Jun 2010
+date.since(1) # => Fri, 11 Jun 2010 00:00:01 EDT -04:00
+</ruby>
+
+h5. Other Time Computations
h4(#date-conversions). Conversions