timezone 0.99.2 → 1.0.0

data/lib/timezone/active_support.rb

@@ -1,156 +0,0 @@
-require 'timezone/deprecate'
-
-module Timezone
-  # @deprecated Will be removed in the next release of `timezone` gem.
-  class ActiveSupport
-    TIMEZONE_MAPPING = {
-      'Pacific/Midway' => 'Midway Island',
-      'Pacific/Pago_Pago' => 'American Samoa',
-      'Pacific/Honolulu' => 'Hawaii',
-      'America/Juneau' => 'Alaska',
-      'America/Los_Angeles' => 'Pacific Time (US & Canada)',
-      'America/Tijuana' => 'Tijuana',
-      'America/Denver' => 'Mountain Time (US & Canada)',
-      'America/Phoenix' => 'Arizona',
-      'America/Chihuahua' => 'Chihuahua',
-      'America/Mazatlan' => 'Mazatlan',
-      'America/Chicago' => 'Central Time (US & Canada)',
-      'America/Regina' => 'Saskatchewan',
-      'America/Mexico_City' => 'Mexico City',
-      'America/Monterrey' => 'Monterrey',
-      'America/Guatemala' => 'Central America',
-      'America/New_York' => 'Eastern Time (US & Canada)',
-      'America/Indiana/Indianapolis' => 'Indiana (East)',
-      'America/Bogota' => 'Bogota',
-      'America/Lima' => 'Quito',
-      'America/Halifax' => 'Atlantic Time (Canada)',
-      'America/Caracas' => 'Caracas',
-      'America/La_Paz' => 'La Paz',
-      'America/Santiago' => 'Santiago',
-      'America/St_Johns' => 'Newfoundland',
-      'America/Sao_Paulo' => 'Brasilia',
-      'America/Argentina/Buenos_Aires' => 'Buenos Aires',
-      'America/Montevideo' => 'Montevideo',
-      'America/Guyana' => 'Georgetown',
-      'America/Godthab' => 'Greenland',
-      'Atlantic/South_Georgia' => 'Mid-Atlantic',
-      'Atlantic/Azores' => 'Azores',
-      'Atlantic/Cape_Verde' => 'Cape Verde Is.',
-      'Europe/Dublin' => 'Dublin',
-      'Europe/London' => 'London',
-      'Europe/Lisbon' => 'Lisbon',
-      'Africa/Casablanca' => 'Casablanca',
-      'Africa/Monrovia' => 'Monrovia',
-      'Etc/UTC' => 'UTC',
-      'Europe/Belgrade' => 'Belgrade',
-      'Europe/Bratislava' => 'Bratislava',
-      'Europe/Budapest' => 'Budapest',
-      'Europe/Ljubljana' => 'Ljubljana',
-      'Europe/Prague' => 'Prague',
-      'Europe/Sarajevo' => 'Sarajevo',
-      'Europe/Skopje' => 'Skopje',
-      'Europe/Warsaw' => 'Warsaw',
-      'Europe/Zagreb' => 'Zagreb',
-      'Europe/Brussels' => 'Brussels',
-      'Europe/Copenhagen' => 'Copenhagen',
-      'Europe/Madrid' => 'Madrid',
-      'Europe/Paris' => 'Paris',
-      'Europe/Amsterdam' => 'Amsterdam',
-      'Europe/Berlin' => 'Bern',
-      'Europe/Rome' => 'Rome',
-      'Europe/Stockholm' => 'Stockholm',
-      'Europe/Vienna' => 'Vienna',
-      'Africa/Algiers' => 'West Central Africa',
-      'Europe/Bucharest' => 'Bucharest',
-      'Africa/Cairo' => 'Cairo',
-      'Europe/Helsinki' => 'Helsinki',
-      'Europe/Kiev' => 'Kyiv',
-      'Europe/Riga' => 'Riga',
-      'Europe/Sofia' => 'Sofia',
-      'Europe/Tallinn' => 'Tallinn',
-      'Europe/Vilnius' => 'Vilnius',
-      'Europe/Athens' => 'Athens',
-      'Europe/Istanbul' => 'Istanbul',
-      'Europe/Minsk' => 'Minsk',
-      'Asia/Jerusalem' => 'Jerusalem',
-      'Africa/Harare' => 'Harare',
-      'Africa/Johannesburg' => 'Pretoria',
-      'Europe/Kaliningrad' => 'Kaliningrad',
-      'Europe/Moscow' => 'St. Petersburg',
-      'Europe/Volgograd' => 'Volgograd',
-      'Europe/Samara' => 'Samara',
-      'Asia/Kuwait' => 'Kuwait',
-      'Asia/Riyadh' => 'Riyadh',
-      'Africa/Nairobi' => 'Nairobi',
-      'Asia/Baghdad' => 'Baghdad',
-      'Asia/Tehran' => 'Tehran',
-      'Asia/Muscat' => 'Muscat',
-      'Asia/Baku' => 'Baku',
-      'Asia/Tbilisi' => 'Tbilisi',
-      'Asia/Yerevan' => 'Yerevan',
-      'Asia/Kabul' => 'Kabul',
-      'Asia/Yekaterinburg' => 'Ekaterinburg',
-      'Asia/Karachi' => 'Karachi',
-      'Asia/Tashkent' => 'Tashkent',
-      'Asia/Kolkata' => 'New Delhi',
-      'Asia/Kathmandu' => 'Kathmandu',
-      'Asia/Dhaka' => 'Dhaka',
-      'Asia/Colombo' => 'Sri Jayawardenepura',
-      'Asia/Almaty' => 'Almaty',
-      'Asia/Novosibirsk' => 'Novosibirsk',
-      'Asia/Rangoon' => 'Rangoon',
-      'Asia/Bangkok' => 'Hanoi',
-      'Asia/Jakarta' => 'Jakarta',
-      'Asia/Krasnoyarsk' => 'Krasnoyarsk',
-      'Asia/Shanghai' => 'Beijing',
-      'Asia/Chongqing' => 'Chongqing',
-      'Asia/Hong_Kong' => 'Hong Kong',
-      'Asia/Urumqi' => 'Urumqi',
-      'Asia/Kuala_Lumpur' => 'Kuala Lumpur',
-      'Asia/Singapore' => 'Singapore',
-      'Asia/Taipei' => 'Taipei',
-      'Australia/Perth' => 'Perth',
-      'Asia/Irkutsk' => 'Irkutsk',
-      'Asia/Ulaanbaatar' => 'Ulaanbaatar',
-      'Asia/Seoul' => 'Seoul',
-      'Asia/Tokyo' => 'Tokyo',
-      'Asia/Yakutsk' => 'Yakutsk',
-      'Australia/Darwin' => 'Darwin',
-      'Australia/Adelaide' => 'Adelaide',
-      'Australia/Melbourne' => 'Melbourne',
-      'Australia/Sydney' => 'Sydney',
-      'Australia/Brisbane' => 'Brisbane',
-      'Australia/Hobart' => 'Hobart',
-      'Asia/Vladivostok' => 'Vladivostok',
-      'Pacific/Guam' => 'Guam',
-      'Pacific/Port_Moresby' => 'Port Moresby',
-      'Asia/Magadan' => 'Magadan',
-      'Asia/Srednekolymsk' => 'Srednekolymsk',
-      'Pacific/Guadalcanal' => 'Solomon Is.',
-      'Pacific/Noumea' => 'New Caledonia',
-      'Pacific/Fiji' => 'Fiji',
-      'Asia/Kamchatka' => 'Kamchatka',
-      'Pacific/Majuro' => 'Marshall Is.',
-      'Pacific/Auckland' => 'Wellington',
-      'Pacific/Tongatapu' => "Nuku'alofa",
-      'Pacific/Fakaofo' => 'Tokelau Is.',
-      'Pacific/Chatham' => 'Chatham Is.',
-      'Pacific/Apia' => 'Samoa'
-    }.freeze
-
-    # @deprecated Will be removed in the next release of `timezone gem.
-    def self.format(zone, internal = false)
-      unless internal
-        Deprecate.call(
-          self,
-          :format,
-          '[DEPRECATE] `Timezone::ActiveSupport::format` will be ' \
-          'removed in the next release of the `timezone` gem. There ' \
-          'will be no replacement.'.freeze
-        )
-      end
-
-      TIMEZONE_MAPPING[zone] || zone
-    end
-  end
-end

data/lib/timezone/configure.rb

@@ -1,258 +0,0 @@
-require 'timezone/net_http_client'
-require 'timezone/lookup'
-require 'timezone/deprecate'
-
-module Timezone
-  # @deprecated `Timezone::Configure` will be removed in the release
-  #   of the `timezone gem. Use `Timezone::Lookup::config` instead.
-  #
-  # The old way to configure this gem.
-  # rubocop:disable Style/ClassVars
-  class Configure
-    DEPRECATE = '[DEPRECATED] `Timezone::Configure` will be removed ' \
-      'in the release of the `timezone gem. Use `Timezone::Lookup` ' \
-      'instead.'.freeze
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_api_key
-      @@google_api_key ||= nil
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_api_key=(api_key)
-      @@google_api_key = api_key
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_client_id
-      @@google_client_id ||= nil
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_client_id=(client)
-      @@google_client_id = client
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.use_google?
-      !google_api_key.nil?
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.use_google_enterprise?
-      use_google? && !google_client_id.nil?
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.lookup=(lookup)
-      @lookup = lookup && lookup.new(self)
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.lookup
-      return @lookup if @lookup
-
-      use_google? ? google_lookup : geonames_lookup
-    end
-
-    # Responsible for mapping old configuration options to new
-    # configuration style for forwards-compatability with the
-    # updated Google lookup.
-    class GoogleConfigMapper
-      def initialize(config)
-        @config = config
-      end
-
-      def protocol; @config.protocol; end
-
-      def url; @config.url; end
-
-      def http_client; @config.http_client; end
-
-      def api_key; @config.google_api_key; end
-
-      def client_id; @config.google_client_id; end
-
-      def request_handler; nil; end
-    end
-
-    private_constant :GoogleConfigMapper
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_lookup
-      @google_lookup ||=
-        Timezone::Lookup::Google.new(GoogleConfigMapper.new(self))
-    end
-
-    # Responsible for mapping old configuration options to new
-    # configuration style for forwards-compatability with the
-    # updated Geonames lookup.
-    class GeonamesConfigMapper
-      def initialize(config)
-        @config = config
-      end
-
-      def protocol; @config.protocol; end
-
-      def url; @config.url; end
-
-      def username; @config.username; end
-
-      def http_client; @config.http_client; end
-
-      def request_handler; nil; end
-    end
-
-    private_constant :GeonamesConfigMapper
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.geonames_lookup
-      @geonames_lookup ||=
-        Timezone::Lookup::Geonames.new(GeonamesConfigMapper.new(self))
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.geonames_url
-      @@geonames_url ||= 'api.geonames.org'
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.geonames_url=(url)
-      @@geonames_url = url
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.url=(url)
-      self.geonames_url = url
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_url
-      @@google_url ||= 'maps.googleapis.com'
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_url=(url)
-      @@google_url = url
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.url
-      use_google? ? google_url : geonames_url
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.geonames_protocol=(protocol)
-      @@geonames_protocol = protocol
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.geonames_protocol
-      @@geonames_protocol ||= 'http'
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_protocol=(protocol)
-      @@google_protocol = protocol
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.google_protocol
-      @@google_protocol ||= 'https'
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.protocol
-      use_google? ? google_protocol : geonames_protocol
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.http_client
-      @@http_client ||= Timezone::NetHTTPClient
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.http_client=(client)
-      @@http_client = client
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.username
-      @@username ||= nil
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.username=(username)
-      @@username = username
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.begin
-      Deprecate.call(self, :begin, DEPRECATE)
-      yield self
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.replace(what, with = {})
-      replacements # instantiate @@replacements
-      @@replacements[what] = with[:with]
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.replacements
-      @@replacements ||= {}
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.default_for_list
-      @@default_list ||= nil
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.default_for_list=(*list)
-      @@default_list = list.flatten!
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.order_list_by
-      @@order_by ||= :utc_offset
-    end
-
-    # @deprecated `Timezone::Configure` will be removed in the release
-    #   of the `timezone gem. Use `Timezone::Lookup instead.
-    def self.order_list_by=(order)
-      @@order_by = order
-    end
-  end
-end

data/test/geonames_lookup_test.rb

@@ -1,56 +0,0 @@
-require 'timezone/configure'
-require 'timezone/lookup/geonames'
-require 'minitest/autorun'
-require_relative 'http_test_client'
-
-class GeonamesLookupTest < ::Minitest::Unit::TestCase
-  def setup
-    Timezone::Configure.begin do |c|
-      c.google_api_key = nil
-      c.http_client = HTTPTestClient
-      c.username = 'timezone'
-    end
-  end
-
-  def coordinates
-    [-34.92771808058, 138.477041423321]
-  end
-
-  def lookup
-    ::Timezone::Configure.lookup
-  end
-
-  def clear
-    Timezone::Configure.instance_variable_set(:@lookup, nil)
-    Timezone::Configure.instance_variable_set(:@google_lookup, nil)
-    Timezone::Configure.instance_variable_set(:@geonames_lookup, nil)
-  end
-
-  def test_missing_username
-    clear
-    Timezone::Configure.begin { |c| c.username = nil }
-    assert_raises(::Timezone::Error::InvalidConfig) { lookup }
-  ensure
-    Timezone::Configure.begin { |c| c.username = 'timezone' }
-  end
-
-  def test_lookup
-    lookup.client.body = File.open(mock_path + '/lat_lon_coords.txt').read
-
-    assert_equal 'Australia/Adelaide', lookup.lookup(*coordinates)
-  end
-
-  def test_api_limit
-    lookup.client.body = File.open(mock_path + '/api_limit_reached.txt').read
-
-    assert_raises Timezone::Error::GeoNames, 'api limit reached' do
-      lookup.lookup(*coordinates)
-    end
-  end
-
-  private
-
-  def mock_path
-    File.expand_path(File.join(File.dirname(__FILE__), 'mocks'))
-  end
-end