removed 'unless const_defined?' code smell

Signed-off-by: José Valim <jose.valim@gmail.com>

1 files changed, 146 insertions, 148 deletions

diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 7550d8909f..0a08016522 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -30,154 +30,152 @@ end
 # (if a recent version of the gem is installed locally, this will be used instead of the bundled version.)
 module ActiveSupport
   class TimeZone
-    unless const_defined?(:MAPPING)
-      # Keys are Rails TimeZone names, values are TZInfo identifiers
-      MAPPING = {
-        "International Date Line West" => "Pacific/Midway",
-        "Midway Island"                => "Pacific/Midway",
-        "Samoa"                        => "Pacific/Pago_Pago",
-        "Hawaii"                       => "Pacific/Honolulu",
-        "Alaska"                       => "America/Juneau",
-        "Pacific Time (US & Canada)"   => "America/Los_Angeles",
-        "Tijuana"                      => "America/Tijuana",
-        "Mountain Time (US & Canada)"  => "America/Denver",
-        "Arizona"                      => "America/Phoenix",
-        "Chihuahua"                    => "America/Chihuahua",
-        "Mazatlan"                     => "America/Mazatlan",
-        "Central Time (US & Canada)"   => "America/Chicago",
-        "Saskatchewan"                 => "America/Regina",
-        "Guadalajara"                  => "America/Mexico_City",
-        "Mexico City"                  => "America/Mexico_City",
-        "Monterrey"                    => "America/Monterrey",
-        "Central America"              => "America/Guatemala",
-        "Eastern Time (US & Canada)"   => "America/New_York",
-        "Indiana (East)"               => "America/Indiana/Indianapolis",
-        "Bogota"                       => "America/Bogota",
-        "Lima"                         => "America/Lima",
-        "Quito"                        => "America/Lima",
-        "Atlantic Time (Canada)"       => "America/Halifax",
-        "Caracas"                      => "America/Caracas",
-        "La Paz"                       => "America/La_Paz",
-        "Santiago"                     => "America/Santiago",
-        "Newfoundland"                 => "America/St_Johns",
-        "Brasilia"                     => "America/Sao_Paulo",
-        "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
-        "Georgetown"                   => "America/Guyana",
-        "Greenland"                    => "America/Godthab",
-        "Mid-Atlantic"                 => "Atlantic/South_Georgia",
-        "Azores"                       => "Atlantic/Azores",
-        "Cape Verde Is."               => "Atlantic/Cape_Verde",
-        "Dublin"                       => "Europe/Dublin",
-        "Edinburgh"                    => "Europe/London",
-        "Lisbon"                       => "Europe/Lisbon",
-        "London"                       => "Europe/London",
-        "Casablanca"                   => "Africa/Casablanca",
-        "Monrovia"                     => "Africa/Monrovia",
-        "UTC"                          => "Etc/UTC",
-        "Belgrade"                     => "Europe/Belgrade",
-        "Bratislava"                   => "Europe/Bratislava",
-        "Budapest"                     => "Europe/Budapest",
-        "Ljubljana"                    => "Europe/Ljubljana",
-        "Prague"                       => "Europe/Prague",
-        "Sarajevo"                     => "Europe/Sarajevo",
-        "Skopje"                       => "Europe/Skopje",
-        "Warsaw"                       => "Europe/Warsaw",
-        "Zagreb"                       => "Europe/Zagreb",
-        "Brussels"                     => "Europe/Brussels",
-        "Copenhagen"                   => "Europe/Copenhagen",
-        "Madrid"                       => "Europe/Madrid",
-        "Paris"                        => "Europe/Paris",
-        "Amsterdam"                    => "Europe/Amsterdam",
-        "Berlin"                       => "Europe/Berlin",
-        "Bern"                         => "Europe/Berlin",
-        "Rome"                         => "Europe/Rome",
-        "Stockholm"                    => "Europe/Stockholm",
-        "Vienna"                       => "Europe/Vienna",
-        "West Central Africa"          => "Africa/Algiers",
-        "Bucharest"                    => "Europe/Bucharest",
-        "Cairo"                        => "Africa/Cairo",
-        "Helsinki"                     => "Europe/Helsinki",
-        "Kyiv"                         => "Europe/Kiev",
-        "Riga"                         => "Europe/Riga",
-        "Sofia"                        => "Europe/Sofia",
-        "Tallinn"                      => "Europe/Tallinn",
-        "Vilnius"                      => "Europe/Vilnius",
-        "Athens"                       => "Europe/Athens",
-        "Istanbul"                     => "Europe/Istanbul",
-        "Minsk"                        => "Europe/Minsk",
-        "Jerusalem"                    => "Asia/Jerusalem",
-        "Harare"                       => "Africa/Harare",
-        "Pretoria"                     => "Africa/Johannesburg",
-        "Moscow"                       => "Europe/Moscow",
-        "St. Petersburg"               => "Europe/Moscow",
-        "Volgograd"                    => "Europe/Moscow",
-        "Kuwait"                       => "Asia/Kuwait",
-        "Riyadh"                       => "Asia/Riyadh",
-        "Nairobi"                      => "Africa/Nairobi",
-        "Baghdad"                      => "Asia/Baghdad",
-        "Tehran"                       => "Asia/Tehran",
-        "Abu Dhabi"                    => "Asia/Muscat",
-        "Muscat"                       => "Asia/Muscat",
-        "Baku"                         => "Asia/Baku",
-        "Tbilisi"                      => "Asia/Tbilisi",
-        "Yerevan"                      => "Asia/Yerevan",
-        "Kabul"                        => "Asia/Kabul",
-        "Ekaterinburg"                 => "Asia/Yekaterinburg",
-        "Islamabad"                    => "Asia/Karachi",
-        "Karachi"                      => "Asia/Karachi",
-        "Tashkent"                     => "Asia/Tashkent",
-        "Chennai"                      => "Asia/Kolkata",
-        "Kolkata"                      => "Asia/Kolkata",
-        "Mumbai"                       => "Asia/Kolkata",
-        "New Delhi"                    => "Asia/Kolkata",
-        "Kathmandu"                    => "Asia/Kathmandu",
-        "Astana"                       => "Asia/Dhaka",
-        "Dhaka"                        => "Asia/Dhaka",
-        "Sri Jayawardenepura"          => "Asia/Colombo",
-        "Almaty"                       => "Asia/Almaty",
-        "Novosibirsk"                  => "Asia/Novosibirsk",
-        "Rangoon"                      => "Asia/Rangoon",
-        "Bangkok"                      => "Asia/Bangkok",
-        "Hanoi"                        => "Asia/Bangkok",
-        "Jakarta"                      => "Asia/Jakarta",
-        "Krasnoyarsk"                  => "Asia/Krasnoyarsk",
-        "Beijing"                      => "Asia/Shanghai",
-        "Chongqing"                    => "Asia/Chongqing",
-        "Hong Kong"                    => "Asia/Hong_Kong",
-        "Urumqi"                       => "Asia/Urumqi",
-        "Kuala Lumpur"                 => "Asia/Kuala_Lumpur",
-        "Singapore"                    => "Asia/Singapore",
-        "Taipei"                       => "Asia/Taipei",
-        "Perth"                        => "Australia/Perth",
-        "Irkutsk"                      => "Asia/Irkutsk",
-        "Ulaan Bataar"                 => "Asia/Ulaanbaatar",
-        "Seoul"                        => "Asia/Seoul",
-        "Osaka"                        => "Asia/Tokyo",
-        "Sapporo"                      => "Asia/Tokyo",
-        "Tokyo"                        => "Asia/Tokyo",
-        "Yakutsk"                      => "Asia/Yakutsk",
-        "Darwin"                       => "Australia/Darwin",
-        "Adelaide"                     => "Australia/Adelaide",
-        "Canberra"                     => "Australia/Melbourne",
-        "Melbourne"                    => "Australia/Melbourne",
-        "Sydney"                       => "Australia/Sydney",
-        "Brisbane"                     => "Australia/Brisbane",
-        "Hobart"                       => "Australia/Hobart",
-        "Vladivostok"                  => "Asia/Vladivostok",
-        "Guam"                         => "Pacific/Guam",
-        "Port Moresby"                 => "Pacific/Port_Moresby",
-        "Magadan"                      => "Asia/Magadan",
-        "Solomon Is."                  => "Asia/Magadan",
-        "New Caledonia"                => "Pacific/Noumea",
-        "Fiji"                         => "Pacific/Fiji",
-        "Kamchatka"                    => "Asia/Kamchatka",
-        "Marshall Is."                 => "Pacific/Majuro",
-        "Auckland"                     => "Pacific/Auckland",
-        "Wellington"                   => "Pacific/Auckland",
-        "Nuku'alofa"                   => "Pacific/Tongatapu"
-      }.each { |name, zone| name.freeze; zone.freeze }
-      MAPPING.freeze
-    end
+    # Keys are Rails TimeZone names, values are TZInfo identifiers
+    MAPPING = {
+      "International Date Line West" => "Pacific/Midway",
+      "Midway Island"                => "Pacific/Midway",
+      "Samoa"                        => "Pacific/Pago_Pago",
+      "Hawaii"                       => "Pacific/Honolulu",
+      "Alaska"                       => "America/Juneau",
+      "Pacific Time (US & Canada)"   => "America/Los_Angeles",
+      "Tijuana"                      => "America/Tijuana",
+      "Mountain Time (US & Canada)"  => "America/Denver",
+      "Arizona"                      => "America/Phoenix",
+      "Chihuahua"                    => "America/Chihuahua",
+      "Mazatlan"                     => "America/Mazatlan",
+      "Central Time (US & Canada)"   => "America/Chicago",
+      "Saskatchewan"                 => "America/Regina",
+      "Guadalajara"                  => "America/Mexico_City",
+      "Mexico City"                  => "America/Mexico_City",
+      "Monterrey"                    => "America/Monterrey",
+      "Central America"              => "America/Guatemala",
+      "Eastern Time (US & Canada)"   => "America/New_York",
+      "Indiana (East)"               => "America/Indiana/Indianapolis",
+      "Bogota"                       => "America/Bogota",
+      "Lima"                         => "America/Lima",
+      "Quito"                        => "America/Lima",
+      "Atlantic Time (Canada)"       => "America/Halifax",
+      "Caracas"                      => "America/Caracas",
+      "La Paz"                       => "America/La_Paz",
+      "Santiago"                     => "America/Santiago",
+      "Newfoundland"                 => "America/St_Johns",
+      "Brasilia"                     => "America/Sao_Paulo",
+      "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
+      "Georgetown"                   => "America/Guyana",
+      "Greenland"                    => "America/Godthab",
+      "Mid-Atlantic"                 => "Atlantic/South_Georgia",
+      "Azores"                       => "Atlantic/Azores",
+      "Cape Verde Is."               => "Atlantic/Cape_Verde",
+      "Dublin"                       => "Europe/Dublin",
+      "Edinburgh"                    => "Europe/London",
+      "Lisbon"                       => "Europe/Lisbon",
+      "London"                       => "Europe/London",
+      "Casablanca"                   => "Africa/Casablanca",
+      "Monrovia"                     => "Africa/Monrovia",
+      "UTC"                          => "Etc/UTC",
+      "Belgrade"                     => "Europe/Belgrade",
+      "Bratislava"                   => "Europe/Bratislava",
+      "Budapest"                     => "Europe/Budapest",
+      "Ljubljana"                    => "Europe/Ljubljana",
+      "Prague"                       => "Europe/Prague",
+      "Sarajevo"                     => "Europe/Sarajevo",
+      "Skopje"                       => "Europe/Skopje",
+      "Warsaw"                       => "Europe/Warsaw",
+      "Zagreb"                       => "Europe/Zagreb",
+      "Brussels"                     => "Europe/Brussels",
+      "Copenhagen"                   => "Europe/Copenhagen",
+      "Madrid"                       => "Europe/Madrid",
+      "Paris"                        => "Europe/Paris",
+      "Amsterdam"                    => "Europe/Amsterdam",
+      "Berlin"                       => "Europe/Berlin",
+      "Bern"                         => "Europe/Berlin",
+      "Rome"                         => "Europe/Rome",
+      "Stockholm"                    => "Europe/Stockholm",
+      "Vienna"                       => "Europe/Vienna",
+      "West Central Africa"          => "Africa/Algiers",
+      "Bucharest"                    => "Europe/Bucharest",
+      "Cairo"                        => "Africa/Cairo",
+      "Helsinki"                     => "Europe/Helsinki",
+      "Kyiv"                         => "Europe/Kiev",
+      "Riga"                         => "Europe/Riga",
+      "Sofia"                        => "Europe/Sofia",
+      "Tallinn"                      => "Europe/Tallinn",
+      "Vilnius"                      => "Europe/Vilnius",
+      "Athens"                       => "Europe/Athens",
+      "Istanbul"                     => "Europe/Istanbul",
+      "Minsk"                        => "Europe/Minsk",
+      "Jerusalem"                    => "Asia/Jerusalem",
+      "Harare"                       => "Africa/Harare",
+      "Pretoria"                     => "Africa/Johannesburg",
+      "Moscow"                       => "Europe/Moscow",
+      "St. Petersburg"               => "Europe/Moscow",
+      "Volgograd"                    => "Europe/Moscow",
+      "Kuwait"                       => "Asia/Kuwait",
+      "Riyadh"                       => "Asia/Riyadh",
+      "Nairobi"                      => "Africa/Nairobi",
+      "Baghdad"                      => "Asia/Baghdad",
+      "Tehran"                       => "Asia/Tehran",
+      "Abu Dhabi"                    => "Asia/Muscat",
+      "Muscat"                       => "Asia/Muscat",
+      "Baku"                         => "Asia/Baku",
+      "Tbilisi"                      => "Asia/Tbilisi",
+      "Yerevan"                      => "Asia/Yerevan",
+      "Kabul"                        => "Asia/Kabul",
+      "Ekaterinburg"                 => "Asia/Yekaterinburg",
+      "Islamabad"                    => "Asia/Karachi",
+      "Karachi"                      => "Asia/Karachi",
+      "Tashkent"                     => "Asia/Tashkent",
+      "Chennai"                      => "Asia/Kolkata",
+      "Kolkata"                      => "Asia/Kolkata",
+      "Mumbai"                       => "Asia/Kolkata",
+      "New Delhi"                    => "Asia/Kolkata",
+      "Kathmandu"                    => "Asia/Kathmandu",
+      "Astana"                       => "Asia/Dhaka",
+      "Dhaka"                        => "Asia/Dhaka",
+      "Sri Jayawardenepura"          => "Asia/Colombo",
+      "Almaty"                       => "Asia/Almaty",
+      "Novosibirsk"                  => "Asia/Novosibirsk",
+      "Rangoon"                      => "Asia/Rangoon",
+      "Bangkok"                      => "Asia/Bangkok",
+      "Hanoi"                        => "Asia/Bangkok",
+      "Jakarta"                      => "Asia/Jakarta",
+      "Krasnoyarsk"                  => "Asia/Krasnoyarsk",
+      "Beijing"                      => "Asia/Shanghai",
+      "Chongqing"                    => "Asia/Chongqing",
+      "Hong Kong"                    => "Asia/Hong_Kong",
+      "Urumqi"                       => "Asia/Urumqi",
+      "Kuala Lumpur"                 => "Asia/Kuala_Lumpur",
+      "Singapore"                    => "Asia/Singapore",
+      "Taipei"                       => "Asia/Taipei",
+      "Perth"                        => "Australia/Perth",
+      "Irkutsk"                      => "Asia/Irkutsk",
+      "Ulaan Bataar"                 => "Asia/Ulaanbaatar",
+      "Seoul"                        => "Asia/Seoul",
+      "Osaka"                        => "Asia/Tokyo",
+      "Sapporo"                      => "Asia/Tokyo",
+      "Tokyo"                        => "Asia/Tokyo",
+      "Yakutsk"                      => "Asia/Yakutsk",
+      "Darwin"                       => "Australia/Darwin",
+      "Adelaide"                     => "Australia/Adelaide",
+      "Canberra"                     => "Australia/Melbourne",
+      "Melbourne"                    => "Australia/Melbourne",
+      "Sydney"                       => "Australia/Sydney",
+      "Brisbane"                     => "Australia/Brisbane",
+      "Hobart"                       => "Australia/Hobart",
+      "Vladivostok"                  => "Asia/Vladivostok",
+      "Guam"                         => "Pacific/Guam",
+      "Port Moresby"                 => "Pacific/Port_Moresby",
+      "Magadan"                      => "Asia/Magadan",
+      "Solomon Is."                  => "Asia/Magadan",
+      "New Caledonia"                => "Pacific/Noumea",
+      "Fiji"                         => "Pacific/Fiji",
+      "Kamchatka"                    => "Asia/Kamchatka",
+      "Marshall Is."                 => "Pacific/Majuro",
+      "Auckland"                     => "Pacific/Auckland",
+      "Wellington"                   => "Pacific/Auckland",
+      "Nuku'alofa"                   => "Pacific/Tongatapu"
+    }.each { |name, zone| name.freeze; zone.freeze }
+    MAPPING.freeze
 
     UTC_OFFSET_WITH_COLON = '%s%02d:%02d'
     UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.sub(':', '')