aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2016-04-23 23:51:49 +0900
committeryui-knk <spiketeika@gmail.com>2016-04-23 23:51:49 +0900
commit941eee5c8ebb82f97434f93fb233502cbb4f8270 (patch)
tree58164a5e255d2d863a381e9d09571a178e04f0e2 /activesupport/lib/active_support/core_ext/date_time
parentc9c5788a527b70d7f983e2b4b47e3afd863d9f48 (diff)
downloadrails-941eee5c8ebb82f97434f93fb233502cbb4f8270.tar.gz
rails-941eee5c8ebb82f97434f93fb233502cbb4f8270.tar.bz2
rails-941eee5c8ebb82f97434f93fb233502cbb4f8270.zip
Move `DateTime#getlocal` to `/core_ext/date_time/calculations.rb`
`DateTime#getlocal` is newly added public API. It's responsible is same as `DateTime#utc`, so `calculations.rb` is a best plase to define this method. For keeping consistency with `DateTime#utc`, defines `#localtime` and defines `getlocal` as an alias method.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/calculations.rb12
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/compatibility.rb11
2 files changed, 12 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index ac46f5ffe8..e6eaa02a60 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -152,6 +152,18 @@ class DateTime
end
alias_method :getutc, :utc
+ # Returns a <tt>Time.local()</tt> instance of the simultaneous time in your
+ # system's <tt>ENV['TZ']</tt> zone.
+ def localtime(utc_offset = nil)
+ utc = getutc
+
+ Time.utc(
+ utc.year, utc.month, utc.day,
+ utc.hour, utc.min, utc.sec + utc.sec_fraction
+ ).getlocal(utc_offset)
+ end
+ alias_method :getlocal, :localtime
+
# Returns +true+ if <tt>offset == 0</tt>.
def utc?
offset == 0
diff --git a/activesupport/lib/active_support/core_ext/date_time/compatibility.rb b/activesupport/lib/active_support/core_ext/date_time/compatibility.rb
index 63ac4c2f3a..03e4a2adfa 100644
--- a/activesupport/lib/active_support/core_ext/date_time/compatibility.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/compatibility.rb
@@ -2,15 +2,4 @@ require 'active_support/core_ext/date_and_time/compatibility'
class DateTime
prepend DateAndTime::Compatibility
-
- # Returns a <tt>Time.local()</tt> instance of the simultaneous time in your
- # system's <tt>ENV['TZ']</tt> zone.
- def getlocal(utc_offset = nil)
- utc = getutc
-
- Time.utc(
- utc.year, utc.month, utc.day,
- utc.hour, utc.min, utc.sec + utc.sec_fraction
- ).getlocal(utc_offset)
- end
end