lib/tzinfo/data_timezone.rb in tzinfo-1.1.0 vs lib/tzinfo/data_timezone.rb in tzinfo-1.2.0
- old
+ new
@@ -1,27 +1,5 @@
-#--
-# Copyright (c) 2006-2013 Philip Ross
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
module TZInfo
# A Timezone based on a DataTimezoneInfo.
#
# @private
@@ -66,8 +44,15 @@
#
# If utc_from is specified and utc_to is not greater than utc_from, then
# transitions_up_to raises an ArgumentError exception.
def transitions_up_to(utc_to, utc_from = nil)
info.transitions_up_to(utc_to, utc_from)
+ end
+
+ # Returns the canonical zone for this Timezone.
+ #
+ # For a DataTimezone, this is always self.
+ def canonical_zone
+ self
end
end
end