Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git@github.com:rails/rails

  • Loading branch information...
commit e433bb16a6200351893077a723d4885c3080779f 2 parents fa2a255 + f31651b
@jeremy jeremy authored
Showing with 117 additions and 110 deletions.
  1. +1 −0  actionpack/lib/action_view/template_handlers.rb
  2. +1 −1  activesupport/Rakefile
  3. +2 −2 activesupport/lib/active_support/vendor.rb
  4. +0 −95 activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/offset_rationals.rb
  5. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo.rb
  6. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/data_timezone.rb
  7. +2 −0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/data_timezone_info.rb
  8. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Algiers.rb
  9. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Cairo.rb
  10. +2 −0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Casablanca.rb
  11. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Harare.rb
  12. 0  ...port/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Johannesburg.rb
  13. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Monrovia.rb
  14. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Africa/Nairobi.rb
  15. 0  ...tive_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
  16. 0  ...b/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Argentina/San_Juan.rb
  17. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Bogota.rb
  18. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Caracas.rb
  19. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Chicago.rb
  20. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Chihuahua.rb
  21. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Denver.rb
  22. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Godthab.rb
  23. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Guatemala.rb
  24. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Halifax.rb
  25. 0  ...active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Indiana/Indianapolis.rb
  26. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Juneau.rb
  27. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/La_Paz.rb
  28. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Lima.rb
  29. 0  ...port/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Los_Angeles.rb
  30. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Mazatlan.rb
  31. 0  ...port/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Mexico_City.rb
  32. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Monterrey.rb
  33. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/New_York.rb
  34. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Phoenix.rb
  35. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Regina.rb
  36. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Santiago.rb
  37. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/St_Johns.rb
  38. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/America/Tijuana.rb
  39. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Almaty.rb
  40. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Baghdad.rb
  41. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Baku.rb
  42. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Bangkok.rb
  43. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Chongqing.rb
  44. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Dhaka.rb
  45. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Hong_Kong.rb
  46. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Irkutsk.rb
  47. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Jakarta.rb
  48. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Jerusalem.rb
  49. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Kabul.rb
  50. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Kamchatka.rb
  51. +2 −0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Karachi.rb
  52. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Katmandu.rb
  53. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Kolkata.rb
  54. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Krasnoyarsk.rb
  55. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Kuala_Lumpur.rb
  56. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Kuwait.rb
  57. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Magadan.rb
  58. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Muscat.rb
  59. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Novosibirsk.rb
  60. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Rangoon.rb
  61. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Riyadh.rb
  62. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Seoul.rb
  63. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Shanghai.rb
  64. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Singapore.rb
  65. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Taipei.rb
  66. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Tashkent.rb
  67. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Tbilisi.rb
  68. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Tehran.rb
  69. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Tokyo.rb
  70. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Ulaanbaatar.rb
  71. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Urumqi.rb
  72. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Vladivostok.rb
  73. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Yakutsk.rb
  74. 0  ...pport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Yekaterinburg.rb
  75. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Asia/Yerevan.rb
  76. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Atlantic/Azores.rb
  77. 0  ...port/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Atlantic/Cape_Verde.rb
  78. 0  ...t/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Atlantic/South_Georgia.rb
  79. 0  ...pport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Adelaide.rb
  80. 0  ...pport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Brisbane.rb
  81. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Darwin.rb
  82. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Hobart.rb
  83. 0  ...port/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Melbourne.rb
  84. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Perth.rb
  85. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Australia/Sydney.rb
  86. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Etc/UTC.rb
  87. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Amsterdam.rb
  88. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Athens.rb
  89. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Belgrade.rb
  90. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Berlin.rb
  91. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Bratislava.rb
  92. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Brussels.rb
  93. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Bucharest.rb
  94. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Budapest.rb
  95. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Copenhagen.rb
  96. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Dublin.rb
  97. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Helsinki.rb
  98. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Istanbul.rb
  99. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Kiev.rb
  100. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Lisbon.rb
  101. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Ljubljana.rb
  102. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/London.rb
  103. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Madrid.rb
  104. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Minsk.rb
  105. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Moscow.rb
  106. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Paris.rb
  107. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Prague.rb
  108. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Riga.rb
  109. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Rome.rb
  110. 0  ...esupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Sarajevo.rb
  111. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Skopje.rb
  112. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Sofia.rb
  113. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Stockholm.rb
  114. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Tallinn.rb
  115. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Vienna.rb
  116. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Vilnius.rb
  117. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Warsaw.rb
  118. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Europe/Zagreb.rb
  119. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Auckland.rb
  120. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Fiji.rb
  121. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Guam.rb
  122. 0  ...support/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Honolulu.rb
  123. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Majuro.rb
  124. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Midway.rb
  125. 0  ...vesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Noumea.rb
  126. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Pago_Pago.rb
  127. 0  ...ort/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Port_Moresby.rb
  128. 0  ...upport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/definitions/Pacific/Tongatapu.rb
  129. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/info_timezone.rb
  130. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/linked_timezone.rb
  131. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/linked_timezone_info.rb
  132. +95 −0 activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
  133. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/time_or_datetime.rb
  134. +6 −6 activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone.rb
  135. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone_definition.rb
  136. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone_info.rb
  137. +4 −4 activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone_offset_info.rb
  138. 0  activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone_period.rb
  139. +2 −2 activesupport/lib/active_support/vendor/{tzinfo-0.3.8 → tzinfo-0.3.9}/tzinfo/timezone_transition_info.rb
View
1  actionpack/lib/action_view/template_handlers.rb
@@ -28,6 +28,7 @@ def self.extended(base)
# return the rendered template as a string.
def register_template_handler(extension, klass)
@@template_handlers[extension.to_sym] = klass
+ ActionView::TemplateFinder.reload!
end
def template_handler_extensions
View
2  activesupport/Rakefile
@@ -119,7 +119,7 @@ namespace :tzinfo do
task :copy_definitions => :unpack_gem do
definitions_path = "#{destination_path}/tzinfo/definitions/"
mkdir_p definitions_path
- TimeZone::MAPPING.values.each do |zone|
+ ActiveSupport::TimeZone::MAPPING.values.each do |zone|
subdir = nil
if /\// === zone
subdir = zone.sub(/\w+$/, '')
View
4 activesupport/lib/active_support/vendor.rb
@@ -20,7 +20,7 @@
end
begin
- gem 'tzinfo', '~> 0.3.8'
+ gem 'tzinfo', '~> 0.3.9'
rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.8"
+ $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.9"
end
View
95 activesupport/lib/active_support/vendor/tzinfo-0.3.8/tzinfo/offset_rationals.rb
@@ -1,95 +0,0 @@
-#--
-# Copyright (c) 2006 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
-
- # Provides a method for getting Rationals for a timezone offset in seconds.
- # Pre-reduced rationals are returned for all the half-hour intervals between
- # -14 and +14 hours to avoid having to call gcd at runtime.
- module OffsetRationals #:nodoc:
- @@rational_cache = {
- -50400 => Rational(-7,12),
- -48600 => Rational(-9,16),
- -46800 => Rational(-13,24),
- -45000 => Rational(-25,48),
- -43200 => Rational(-1,2),
- -41400 => Rational(-23,48),
- -39600 => Rational(-11,24),
- -37800 => Rational(-7,16),
- -36000 => Rational(-5,12),
- -34200 => Rational(-19,48),
- -32400 => Rational(-3,8),
- -30600 => Rational(-17,48),
- -28800 => Rational(-1,3),
- -27000 => Rational(-5,16),
- -25200 => Rational(-7,24),
- -23400 => Rational(-13,48),
- -21600 => Rational(-1,4),
- -19800 => Rational(-11,48),
- -18000 => Rational(-5,24),
- -16200 => Rational(-3,16),
- -14400 => Rational(-1,6),
- -12600 => Rational(-7,48),
- -10800 => Rational(-1,8),
- -9000 => Rational(-5,48),
- -7200 => Rational(-1,12),
- -5400 => Rational(-1,16),
- -3600 => Rational(-1,24),
- -1800 => Rational(-1,48),
- 0 => Rational(0,1),
- 1800 => Rational(1,48),
- 3600 => Rational(1,24),
- 5400 => Rational(1,16),
- 7200 => Rational(1,12),
- 9000 => Rational(5,48),
- 10800 => Rational(1,8),
- 12600 => Rational(7,48),
- 14400 => Rational(1,6),
- 16200 => Rational(3,16),
- 18000 => Rational(5,24),
- 19800 => Rational(11,48),
- 21600 => Rational(1,4),
- 23400 => Rational(13,48),
- 25200 => Rational(7,24),
- 27000 => Rational(5,16),
- 28800 => Rational(1,3),
- 30600 => Rational(17,48),
- 32400 => Rational(3,8),
- 34200 => Rational(19,48),
- 36000 => Rational(5,12),
- 37800 => Rational(7,16),
- 39600 => Rational(11,24),
- 41400 => Rational(23,48),
- 43200 => Rational(1,2),
- 45000 => Rational(25,48),
- 46800 => Rational(13,24),
- 48600 => Rational(9,16),
- 50400 => Rational(7,12)}
-
- # Returns a Rational expressing the fraction of a day that offset in
- # seconds represents (i.e. equivalent to Rational(offset, 86400)).
- def rational_for_offset(offset)
- @@rational_cache[offset] || Rational(offset, 86400)
- end
- module_function :rational_for_offset
- end
-end
View
0  .../lib/active_support/vendor/tzinfo-0.3.8/tzinfo.rb → .../lib/active_support/vendor/tzinfo-0.3.9/tzinfo.rb
File renamed without changes
View
0  ...pport/vendor/tzinfo-0.3.8/tzinfo/data_timezone.rb → ...pport/vendor/tzinfo-0.3.9/tzinfo/data_timezone.rb
File renamed without changes
View
2  .../vendor/tzinfo-0.3.8/tzinfo/data_timezone_info.rb → .../vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
@@ -40,6 +40,8 @@ def initialize(identifier)
super(identifier)
@offsets = {}
@transitions = []
+ @previous_offset = nil
+ @transitions_index = nil
end
# Defines a offset. The id uniquely identifies this offset within the
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Africa/Algiers.rb → ...tzinfo-0.3.9/tzinfo/definitions/Africa/Algiers.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Africa/Cairo.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Africa/Cairo.rb
File renamed without changes
View
2  ...nfo-0.3.8/tzinfo/definitions/Africa/Casablanca.rb → ...nfo-0.3.9/tzinfo/definitions/Africa/Casablanca.rb
@@ -31,6 +31,8 @@ module Casablanca
tz.transition 1978, 8, :o1, 271033200
tz.transition 1984, 3, :o3, 448243200
tz.transition 1985, 12, :o1, 504918000
+ tz.transition 2008, 6, :o2, 1212278400
+ tz.transition 2008, 9, :o1, 1222556400
end
end
end
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Africa/Harare.rb → .../tzinfo-0.3.9/tzinfo/definitions/Africa/Harare.rb
File renamed without changes
View
0  ...o-0.3.8/tzinfo/definitions/Africa/Johannesburg.rb → ...o-0.3.9/tzinfo/definitions/Africa/Johannesburg.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Africa/Monrovia.rb → ...zinfo-0.3.9/tzinfo/definitions/Africa/Monrovia.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Africa/Nairobi.rb → ...tzinfo-0.3.9/tzinfo/definitions/Africa/Nairobi.rb
File renamed without changes
View
0  ...nfo/definitions/America/Argentina/Buenos_Aires.rb → ...nfo/definitions/America/Argentina/Buenos_Aires.rb
File renamed without changes
View
0  .../tzinfo/definitions/America/Argentina/San_Juan.rb → .../tzinfo/definitions/America/Argentina/San_Juan.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/America/Bogota.rb → ...tzinfo-0.3.9/tzinfo/definitions/America/Bogota.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Caracas.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Caracas.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Chicago.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Chicago.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/America/Chihuahua.rb → ...nfo-0.3.9/tzinfo/definitions/America/Chihuahua.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/America/Denver.rb → ...tzinfo-0.3.9/tzinfo/definitions/America/Denver.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Godthab.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Godthab.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/America/Guatemala.rb → ...nfo-0.3.9/tzinfo/definitions/America/Guatemala.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Halifax.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Halifax.rb
File renamed without changes
View
0  ...zinfo/definitions/America/Indiana/Indianapolis.rb → ...zinfo/definitions/America/Indiana/Indianapolis.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/America/Juneau.rb → ...tzinfo-0.3.9/tzinfo/definitions/America/Juneau.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/America/La_Paz.rb → ...tzinfo-0.3.9/tzinfo/definitions/America/La_Paz.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/America/Lima.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/America/Lima.rb
File renamed without changes
View
0  ...o-0.3.8/tzinfo/definitions/America/Los_Angeles.rb → ...o-0.3.9/tzinfo/definitions/America/Los_Angeles.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/America/Mazatlan.rb → ...info-0.3.9/tzinfo/definitions/America/Mazatlan.rb
File renamed without changes
View
0  ...o-0.3.8/tzinfo/definitions/America/Mexico_City.rb → ...o-0.3.9/tzinfo/definitions/America/Mexico_City.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/America/Monterrey.rb → ...nfo-0.3.9/tzinfo/definitions/America/Monterrey.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/America/New_York.rb → ...info-0.3.9/tzinfo/definitions/America/New_York.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Phoenix.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Phoenix.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/America/Regina.rb → ...tzinfo-0.3.9/tzinfo/definitions/America/Regina.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/America/Santiago.rb → ...info-0.3.9/tzinfo/definitions/America/Santiago.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/America/St_Johns.rb → ...info-0.3.9/tzinfo/definitions/America/St_Johns.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/America/Tijuana.rb → ...zinfo-0.3.9/tzinfo/definitions/America/Tijuana.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Almaty.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Almaty.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Baghdad.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Baghdad.rb
File renamed without changes
View
0  ...ndor/tzinfo-0.3.8/tzinfo/definitions/Asia/Baku.rb → ...ndor/tzinfo-0.3.9/tzinfo/definitions/Asia/Baku.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Bangkok.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Bangkok.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Asia/Chongqing.rb → ...tzinfo-0.3.9/tzinfo/definitions/Asia/Chongqing.rb
File renamed without changes
View
0  ...dor/tzinfo-0.3.8/tzinfo/definitions/Asia/Dhaka.rb → ...dor/tzinfo-0.3.9/tzinfo/definitions/Asia/Dhaka.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Asia/Hong_Kong.rb → ...tzinfo-0.3.9/tzinfo/definitions/Asia/Hong_Kong.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Irkutsk.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Irkutsk.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Jakarta.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Jakarta.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Asia/Jerusalem.rb → ...tzinfo-0.3.9/tzinfo/definitions/Asia/Jerusalem.rb
File renamed without changes
View
0  ...dor/tzinfo-0.3.8/tzinfo/definitions/Asia/Kabul.rb → ...dor/tzinfo-0.3.9/tzinfo/definitions/Asia/Kabul.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Asia/Kamchatka.rb → ...tzinfo-0.3.9/tzinfo/definitions/Asia/Kamchatka.rb
File renamed without changes
View
2  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Karachi.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Karachi.rb
@@ -21,6 +21,8 @@ module Karachi
tz.transition 1971, 3, :o4, 38775600
tz.transition 2002, 4, :o5, 1018119660
tz.transition 2002, 10, :o4, 1033840860
+ tz.transition 2008, 5, :o5, 1212260400
+ tz.transition 2008, 8, :o4, 1220205600
end
end
end
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Asia/Katmandu.rb → .../tzinfo-0.3.9/tzinfo/definitions/Asia/Katmandu.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Kolkata.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Kolkata.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Asia/Krasnoyarsk.rb → ...info-0.3.9/tzinfo/definitions/Asia/Krasnoyarsk.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/Asia/Kuala_Lumpur.rb → ...nfo-0.3.9/tzinfo/definitions/Asia/Kuala_Lumpur.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Kuwait.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Kuwait.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Magadan.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Magadan.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Muscat.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Muscat.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Asia/Novosibirsk.rb → ...info-0.3.9/tzinfo/definitions/Asia/Novosibirsk.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Rangoon.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Rangoon.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Riyadh.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Riyadh.rb
File renamed without changes
View
0  ...dor/tzinfo-0.3.8/tzinfo/definitions/Asia/Seoul.rb → ...dor/tzinfo-0.3.9/tzinfo/definitions/Asia/Seoul.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Asia/Shanghai.rb → .../tzinfo-0.3.9/tzinfo/definitions/Asia/Shanghai.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Asia/Singapore.rb → ...tzinfo-0.3.9/tzinfo/definitions/Asia/Singapore.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Taipei.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Taipei.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Asia/Tashkent.rb → .../tzinfo-0.3.9/tzinfo/definitions/Asia/Tashkent.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Tbilisi.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Tbilisi.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Tehran.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Tehran.rb
File renamed without changes
View
0  ...dor/tzinfo-0.3.8/tzinfo/definitions/Asia/Tokyo.rb → ...dor/tzinfo-0.3.9/tzinfo/definitions/Asia/Tokyo.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Asia/Ulaanbaatar.rb → ...info-0.3.9/tzinfo/definitions/Asia/Ulaanbaatar.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Asia/Urumqi.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Asia/Urumqi.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Asia/Vladivostok.rb → ...info-0.3.9/tzinfo/definitions/Asia/Vladivostok.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Yakutsk.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Yakutsk.rb
File renamed without changes
View
0  ...fo-0.3.8/tzinfo/definitions/Asia/Yekaterinburg.rb → ...fo-0.3.9/tzinfo/definitions/Asia/Yekaterinburg.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Asia/Yerevan.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Asia/Yerevan.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Atlantic/Azores.rb → ...zinfo-0.3.9/tzinfo/definitions/Atlantic/Azores.rb
File renamed without changes
View
0  ...o-0.3.8/tzinfo/definitions/Atlantic/Cape_Verde.rb → ...o-0.3.9/tzinfo/definitions/Atlantic/Cape_Verde.rb
File renamed without changes
View
0  ....3.8/tzinfo/definitions/Atlantic/South_Georgia.rb → ....3.9/tzinfo/definitions/Atlantic/South_Georgia.rb
File renamed without changes
View
0  ...fo-0.3.8/tzinfo/definitions/Australia/Adelaide.rb → ...fo-0.3.9/tzinfo/definitions/Australia/Adelaide.rb
File renamed without changes
View
0  ...fo-0.3.8/tzinfo/definitions/Australia/Brisbane.rb → ...fo-0.3.9/tzinfo/definitions/Australia/Brisbane.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Australia/Darwin.rb → ...info-0.3.9/tzinfo/definitions/Australia/Darwin.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Australia/Hobart.rb → ...info-0.3.9/tzinfo/definitions/Australia/Hobart.rb
File renamed without changes
View
0  ...o-0.3.8/tzinfo/definitions/Australia/Melbourne.rb → ...o-0.3.9/tzinfo/definitions/Australia/Melbourne.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Australia/Perth.rb → ...zinfo-0.3.9/tzinfo/definitions/Australia/Perth.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Australia/Sydney.rb → ...info-0.3.9/tzinfo/definitions/Australia/Sydney.rb
File renamed without changes
View
0  ...vendor/tzinfo-0.3.8/tzinfo/definitions/Etc/UTC.rb → ...vendor/tzinfo-0.3.9/tzinfo/definitions/Etc/UTC.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Europe/Amsterdam.rb → ...info-0.3.9/tzinfo/definitions/Europe/Amsterdam.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Athens.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Athens.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Belgrade.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Belgrade.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Berlin.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Berlin.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/Europe/Bratislava.rb → ...nfo-0.3.9/tzinfo/definitions/Europe/Bratislava.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Brussels.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Brussels.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Europe/Bucharest.rb → ...info-0.3.9/tzinfo/definitions/Europe/Bucharest.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Budapest.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Budapest.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/Europe/Copenhagen.rb → ...nfo-0.3.9/tzinfo/definitions/Europe/Copenhagen.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Dublin.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Dublin.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Helsinki.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Helsinki.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Istanbul.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Istanbul.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Europe/Kiev.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Europe/Kiev.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Lisbon.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Lisbon.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Europe/Ljubljana.rb → ...info-0.3.9/tzinfo/definitions/Europe/Ljubljana.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/London.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/London.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Madrid.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Madrid.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Europe/Minsk.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Europe/Minsk.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Moscow.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Moscow.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Europe/Paris.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Europe/Paris.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Prague.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Prague.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Europe/Riga.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Europe/Riga.rb
File renamed without changes
View
0  ...or/tzinfo-0.3.8/tzinfo/definitions/Europe/Rome.rb → ...or/tzinfo-0.3.9/tzinfo/definitions/Europe/Rome.rb
File renamed without changes
View
0  ...zinfo-0.3.8/tzinfo/definitions/Europe/Sarajevo.rb → ...zinfo-0.3.9/tzinfo/definitions/Europe/Sarajevo.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Skopje.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Skopje.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Europe/Sofia.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Europe/Sofia.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Europe/Stockholm.rb → ...info-0.3.9/tzinfo/definitions/Europe/Stockholm.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Europe/Tallinn.rb → ...tzinfo-0.3.9/tzinfo/definitions/Europe/Tallinn.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Vienna.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Vienna.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Europe/Vilnius.rb → ...tzinfo-0.3.9/tzinfo/definitions/Europe/Vilnius.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Warsaw.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Warsaw.rb
File renamed without changes
View
0  .../tzinfo-0.3.8/tzinfo/definitions/Europe/Zagreb.rb → .../tzinfo-0.3.9/tzinfo/definitions/Europe/Zagreb.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Pacific/Auckland.rb → ...info-0.3.9/tzinfo/definitions/Pacific/Auckland.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Pacific/Fiji.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Pacific/Fiji.rb
File renamed without changes
View
0  ...r/tzinfo-0.3.8/tzinfo/definitions/Pacific/Guam.rb → ...r/tzinfo-0.3.9/tzinfo/definitions/Pacific/Guam.rb
File renamed without changes
View
0  ...info-0.3.8/tzinfo/definitions/Pacific/Honolulu.rb → ...info-0.3.9/tzinfo/definitions/Pacific/Honolulu.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Pacific/Majuro.rb → ...tzinfo-0.3.9/tzinfo/definitions/Pacific/Majuro.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Pacific/Midway.rb → ...tzinfo-0.3.9/tzinfo/definitions/Pacific/Midway.rb
File renamed without changes
View
0  ...tzinfo-0.3.8/tzinfo/definitions/Pacific/Noumea.rb → ...tzinfo-0.3.9/tzinfo/definitions/Pacific/Noumea.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/Pacific/Pago_Pago.rb → ...nfo-0.3.9/tzinfo/definitions/Pacific/Pago_Pago.rb
File renamed without changes
View
0  ...-0.3.8/tzinfo/definitions/Pacific/Port_Moresby.rb → ...-0.3.9/tzinfo/definitions/Pacific/Port_Moresby.rb
File renamed without changes
View
0  ...nfo-0.3.8/tzinfo/definitions/Pacific/Tongatapu.rb → ...nfo-0.3.9/tzinfo/definitions/Pacific/Tongatapu.rb
File renamed without changes
View
0  ...pport/vendor/tzinfo-0.3.8/tzinfo/info_timezone.rb → ...pport/vendor/tzinfo-0.3.9/tzinfo/info_timezone.rb
File renamed without changes
View
0  ...ort/vendor/tzinfo-0.3.8/tzinfo/linked_timezone.rb → ...ort/vendor/tzinfo-0.3.9/tzinfo/linked_timezone.rb
File renamed without changes
View
0  ...endor/tzinfo-0.3.8/tzinfo/linked_timezone_info.rb → ...endor/tzinfo-0.3.9/tzinfo/linked_timezone_info.rb
File renamed without changes
View
95 activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/offset_rationals.rb
@@ -0,0 +1,95 @@
+#--
+# Copyright (c) 2006 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
+
+ # Provides a method for getting Rationals for a timezone offset in seconds.
+ # Pre-reduced rationals are returned for all the half-hour intervals between
+ # -14 and +14 hours to avoid having to call gcd at runtime.
+ module OffsetRationals #:nodoc:
+ @@rational_cache = {
+ -50400 => Rational.send(:new!, -7,12),
+ -48600 => Rational.send(:new!, -9,16),
+ -46800 => Rational.send(:new!, -13,24),
+ -45000 => Rational.send(:new!, -25,48),
+ -43200 => Rational.send(:new!, -1,2),
+ -41400 => Rational.send(:new!, -23,48),
+ -39600 => Rational.send(:new!, -11,24),
+ -37800 => Rational.send(:new!, -7,16),
+ -36000 => Rational.send(:new!, -5,12),
+ -34200 => Rational.send(:new!, -19,48),
+ -32400 => Rational.send(:new!, -3,8),
+ -30600 => Rational.send(:new!, -17,48),
+ -28800 => Rational.send(:new!, -1,3),
+ -27000 => Rational.send(:new!, -5,16),
+ -25200 => Rational.send(:new!, -7,24),
+ -23400 => Rational.send(:new!, -13,48),
+ -21600 => Rational.send(:new!, -1,4),
+ -19800 => Rational.send(:new!, -11,48),
+ -18000 => Rational.send(:new!, -5,24),
+ -16200 => Rational.send(:new!, -3,16),
+ -14400 => Rational.send(:new!, -1,6),
+ -12600 => Rational.send(:new!, -7,48),
+ -10800 => Rational.send(:new!, -1,8),
+ -9000 => Rational.send(:new!, -5,48),
+ -7200 => Rational.send(:new!, -1,12),
+ -5400 => Rational.send(:new!, -1,16),
+ -3600 => Rational.send(:new!, -1,24),
+ -1800 => Rational.send(:new!, -1,48),
+ 0 => Rational.send(:new!, 0,1),
+ 1800 => Rational.send(:new!, 1,48),
+ 3600 => Rational.send(:new!, 1,24),
+ 5400 => Rational.send(:new!, 1,16),
+ 7200 => Rational.send(:new!, 1,12),
+ 9000 => Rational.send(:new!, 5,48),
+ 10800 => Rational.send(:new!, 1,8),
+ 12600 => Rational.send(:new!, 7,48),
+ 14400 => Rational.send(:new!, 1,6),
+ 16200 => Rational.send(:new!, 3,16),
+ 18000 => Rational.send(:new!, 5,24),
+ 19800 => Rational.send(:new!, 11,48),
+ 21600 => Rational.send(:new!, 1,4),
+ 23400 => Rational.send(:new!, 13,48),
+ 25200 => Rational.send(:new!, 7,24),
+ 27000 => Rational.send(:new!, 5,16),
+ 28800 => Rational.send(:new!, 1,3),
+ 30600 => Rational.send(:new!, 17,48),
+ 32400 => Rational.send(:new!, 3,8),
+ 34200 => Rational.send(:new!, 19,48),
+ 36000 => Rational.send(:new!, 5,12),
+ 37800 => Rational.send(:new!, 7,16),
+ 39600 => Rational.send(:new!, 11,24),
+ 41400 => Rational.send(:new!, 23,48),
+ 43200 => Rational.send(:new!, 1,2),
+ 45000 => Rational.send(:new!, 25,48),
+ 46800 => Rational.send(:new!, 13,24),
+ 48600 => Rational.send(:new!, 9,16),
+ 50400 => Rational.send(:new!, 7,12)}
+
+ # Returns a Rational expressing the fraction of a day that offset in
+ # seconds represents (i.e. equivalent to Rational(offset, 86400)).
+ def rational_for_offset(offset)
+ @@rational_cache[offset] || Rational(offset, 86400)
+ end
+ module_function :rational_for_offset
+ end
+end
View
0  ...rt/vendor/tzinfo-0.3.8/tzinfo/time_or_datetime.rb → ...rt/vendor/tzinfo-0.3.9/tzinfo/time_or_datetime.rb
File renamed without changes
View
12 ...ve_support/vendor/tzinfo-0.3.8/tzinfo/timezone.rb → ...ve_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
@@ -371,8 +371,8 @@ def period_for_local(local, dst = nil)
# type as utc. Any timezone information in utc is ignored (it is treated as
# a UTC time).
def utc_to_local(utc)
- TimeOrDateTime.wrap(utc) {|utc|
- period_for_utc(utc).to_local(utc)
+ TimeOrDateTime.wrap(utc) {|wrapped|
+ period_for_utc(wrapped).to_local(wrapped)
}
end
@@ -410,14 +410,14 @@ def utc_to_local(utc)
# single period to use to convert the time or return nil or an empty array
# to cause an AmbiguousTime exception to be raised.
def local_to_utc(local, dst = nil)
- TimeOrDateTime.wrap(local) {|local|
+ TimeOrDateTime.wrap(local) {|wrapped|
if block_given?
- period = period_for_local(local, dst) {|periods| yield periods }
+ period = period_for_local(wrapped, dst) {|periods| yield periods }
else
- period = period_for_local(local, dst)
+ period = period_for_local(wrapped, dst)
end
- period.to_utc(local)
+ period.to_utc(wrapped)
}
end
View
0  ...vendor/tzinfo-0.3.8/tzinfo/timezone_definition.rb → ...vendor/tzinfo-0.3.9/tzinfo/timezone_definition.rb
File renamed without changes
View
0  ...pport/vendor/tzinfo-0.3.8/tzinfo/timezone_info.rb → ...pport/vendor/tzinfo-0.3.9/tzinfo/timezone_info.rb
File renamed without changes
View
8 ...endor/tzinfo-0.3.8/tzinfo/timezone_offset_info.rb → ...endor/tzinfo-0.3.9/tzinfo/timezone_offset_info.rb
@@ -56,15 +56,15 @@ def dst?
# Converts a UTC DateTime to local time based on the offset of this period.
def to_local(utc)
- TimeOrDateTime.wrap(utc) {|utc|
- utc + @utc_total_offset
+ TimeOrDateTime.wrap(utc) {|wrapped|
+ wrapped + @utc_total_offset
}
end
# Converts a local DateTime to UTC based on the offset of this period.
def to_utc(local)
- TimeOrDateTime.wrap(local) {|local|
- local - @utc_total_offset
+ TimeOrDateTime.wrap(local) {|wrapped|
+ wrapped - @utc_total_offset
}
end
View
0  ...ort/vendor/tzinfo-0.3.8/tzinfo/timezone_period.rb → ...ort/vendor/tzinfo-0.3.9/tzinfo/timezone_period.rb
File renamed without changes
View
4 ...r/tzinfo-0.3.8/tzinfo/timezone_transition_info.rb → ...r/tzinfo-0.3.9/tzinfo/timezone_transition_info.rb
@@ -48,7 +48,7 @@ class TimezoneTransitionInfo #:nodoc:
# seconds since the epoch. If denominator is specified numerator_or_time
# and denominator are used to create a DateTime as follows:
#
- # DateTime.new!(Rational.new!(numerator_or_time, denominator), 0, Date::ITALY)
+ # DateTime.new!(Rational.send(:new!, numerator_or_time, denominator), 0, Date::ITALY)
#
# For performance reasons, the numerator and denominator must be specified
# in their lowest form.
@@ -70,7 +70,7 @@ def at
unless @denominator
@at = TimeOrDateTime.new(@numerator_or_time)
else
- r = Rational.new!(@numerator_or_time, @denominator)
+ r = Rational.send(:new!, @numerator_or_time, @denominator)
# Ruby 1.8.6 introduced new! and deprecated new0.
# Ruby 1.9.0 removed new0.
Please sign in to comment.
Something went wrong with that request. Please try again.