timezone 0.99.2 → 1.0.0

data/data/Europe/Astrakhan

@@ -22,8 +22,8 @@
 16329600:+04:1:14400
 15724800:+03:0:10800
 31446000:+04:0:14400
-15714000:+04:1:14400
-15739200:+03:0:10800
+15728400:+04:1:14400
+15724800:+03:0:10800
 15724800:+04:1:14400
 15724800:+03:0:10800
 15724800:+04:1:14400

data/data/Europe/Kaliningrad

@@ -37,9 +37,9 @@
 16329600:EEST:1:10800
 15724800:EET:0:7200
 15724800:EEST:1:10800
-15714000:EET:0:7200
-15721200:EEST:1:10800
-15739200:EET:0:7200
+15724800:EET:0:7200
+15724800:EEST:1:10800
+15724800:EET:0:7200
 15724800:EEST:1:10800
 15724800:EET:0:7200
 15724800:EEST:1:10800

data/data/Europe/Kirov

@@ -0,0 +1,64 @@
+-1593825529:LMT:0:11928
+346285128:+03:0:10800
+1602457200:+04:0:14400
+15807600:+05:1:18000
+15728400:+04:0:14400
+15807600:+05:1:18000
+15728400:+04:0:14400
+15807600:+05:1:18000
+15814800:+04:0:14400
+15732000:+05:1:18000
+15724800:+04:0:14400
+15724800:+05:1:18000
+15724800:+04:0:14400
+15724800:+05:1:18000
+15724800:+04:0:14400
+15724800:+05:1:18000
+15724800:+04:0:14400
+15724800:+05:1:18000
+15724800:+04:0:14400
+15728400:+04:1:14400
+15724800:+03:0:10800
+16329600:+04:1:14400
+15724800:+03:0:10800
+31446000:+04:0:14400
+15728400:+04:1:14400
+15724800:+03:0:10800
+15724800:+04:1:14400
+15724800:+03:0:10800
+15724800:+04:1:14400
+15724800:+03:0:10800
+15724800:+04:1:14400
+16329600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+18748800:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+18748800:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18144000:+04:1:14400
+13305600:+03:0:10800
+18748800:+04:1:14400
+12700800:+03:0:10800
+113094000:+04:0:14400
+21434401:+03:0:10800

data/data/Europe/Minsk

@@ -28,8 +28,8 @@
 47779200:MSK:0:10800
 15728400:EEST:1:10800
 15717600:EET:0:7200
-15724800:EEST:1:10800
-15732000:EET:0:7200
+15732000:EEST:1:10800
+15724800:EET:0:7200
 15724800:EEST:1:10800
 15724800:EET:0:7200
 15724800:EEST:1:10800

data/data/Europe/Moscow

@@ -36,9 +36,9 @@
 15724800:MSK:0:10800
 15728400:EEST:1:10800
 9676800:EET:0:7200
-6033600:MSK:0:10800
-15721200:MSD:1:14400
-15739200:MSK:0:10800
+6044400:MSK:0:10800
+15724800:MSD:1:14400
+15724800:MSK:0:10800
 15724800:MSD:1:14400
 15724800:MSK:0:10800
 15724800:MSD:1:14400

data/data/Europe/Samara

@@ -24,9 +24,9 @@
 15724800:MSK:0:10800
 15728400:EEST:1:10800
 1814400:SAMT:0:10800
-13892400:SAMT:0:14400
-15721200:SAMST:1:18000
-15739200:SAMT:0:14400
+13903200:SAMT:0:14400
+15724800:SAMST:1:18000
+15724800:SAMT:0:14400
 15724800:SAMST:1:18000
 15724800:SAMT:0:14400
 15724800:SAMST:1:18000

data/data/Europe/Ulyanovsk

@@ -23,9 +23,9 @@
 15724800:+03:0:10800
 15728400:+03:1:10800
 9676800:+02:0:7200
-6033600:+03:0:10800
-15721200:+04:1:14400
-15739200:+03:0:10800
+6044400:+03:0:10800
+15724800:+04:1:14400
+15724800:+03:0:10800
 15724800:+04:1:14400
 15724800:+03:0:10800
 15724800:+04:1:14400

data/data/Europe/Volgograd

@@ -24,8 +24,8 @@
 16329600:VOLST:1:14400
 15724800:VOLT:0:10800
 31446000:VOLT:0:14400
-15714000:MSD:1:14400
-15739200:MSK:0:10800
+15728400:MSD:1:14400
+15724800:MSK:0:10800
 15724800:MSD:1:14400
 15724800:MSK:0:10800
 15724800:MSD:1:14400

data/data/W-SU

@@ -36,9 +36,9 @@
 15724800:MSK:0:10800
 15728400:EEST:1:10800
 9676800:EET:0:7200
-6033600:MSK:0:10800
-15721200:MSD:1:14400
-15739200:MSK:0:10800
+6044400:MSK:0:10800
+15724800:MSD:1:14400
+15724800:MSK:0:10800
 15724800:MSD:1:14400
 15724800:MSK:0:10800
 15724800:MSD:1:14400

data/lib/timezone/error.rb

@@ -12,16 +12,12 @@ module Timezone
     class Base < StandardError; end
     # Indicates an invalid timezone name.
     class InvalidZone < Base; end
-    # @deprecated this class will be removed in the next release of the gem.
-    class NilZone < Base; end
     # Indicates a lookup failure.
     class Lookup < Base; end
     # Indicates an error during lookup using the geonames API.
     class GeoNames < Lookup; end
     # Indicates an error during lookup using the google API.
     class Google < Lookup; end
-    # @deprecated this class will be removed in the next release of the gem.
-    class ParseTime < Base; end
     # Indicates a missing stub during a test lookup.
     class Test < Lookup; end
     # Indicates an invalid configuration.

data/lib/timezone/lookup/basic.rb

@@ -25,13 +25,7 @@ module Timezone
       #
       # @return [#get] an instance of a request handler
       def client
-        # TODO: Remove http_client once on 1.0.0
-        @client ||=
-          if !config.request_handler.nil?
-            config.request_handler.new(config)
-          else
-            config.http_client.new(config.protocol, config.url)
-          end
+        @client ||= config.request_handler.new(config)
       end
 
       # Returns a timezone name for a given lat, long pair.

data/lib/timezone/lookup/geonames.rb

@@ -21,15 +21,15 @@ module Timezone
       def lookup(lat, long)
         response = client.get(url(lat, long))
 
-        return unless response.code =~ /^2\d\d$/
+        return unless response.body
 
         data = JSON.parse(response.body)
 
-        if data['status'] && data['status']['value'] == 18
-          raise(Timezone::Error::GeoNames, 'api limit reached')
-        end
+        return data['timezoneId'] if data['timezoneId']
+
+        return unless data['status']
 
-        data['timezoneId']
+        raise(Timezone::Error::GeoNames, data['status']['message'])
       rescue => e
         raise(Timezone::Error::GeoNames, e.message)
       end
@@ -40,7 +40,8 @@ module Timezone
         query = URI.encode_www_form(
           'lat' => lat,
           'lng' => long,
-          'username' => config.username)
+          'username' => config.username
+        )
         "/timezoneJSON?#{query}"
       end
     end

data/lib/timezone/lookup/google.rb

@@ -64,7 +64,8 @@ module Timezone
       def url(lat, long)
         query = URI.encode_www_form(
           'location' => "#{lat},#{long}",
-          'timestamp' => Time.now.to_i)
+          'timestamp' => Time.now.to_i
+        )
 
         authorize("/maps/api/timezone/json?#{query}")
       end

data/lib/timezone/net_http_client.rb

@@ -15,16 +15,7 @@ module Timezone
   #     end
   #
   class NetHTTPClient
-    def initialize(protocol, url = nil)
-      # TODO: Remove once on 1.0.0 #initialize(config)
-      config = protocol
-
-      if url
-        config = OpenStruct.new
-        config.protocol = protocol
-        config.url = url
-      end
-
+    def initialize(config)
       uri = URI.parse("#{config.protocol}://#{config.url}")
       @http = Net::HTTP.new(uri.host, uri.port)
       @http.open_timeout = config.open_timeout || 5

data/lib/timezone/version.rb

@@ -1,4 +1,4 @@
 module Timezone
   # The current gem version.
-  VERSION = '0.99.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/timezone/zone.rb

@@ -4,10 +4,7 @@ require 'time'
 
 require 'timezone/loader'
 require 'timezone/error'
-require 'timezone/configure'
-require 'timezone/active_support'
 require 'timezone/loader'
-require 'timezone/deprecate'
 
 module Timezone
   # This object represents a real-world timezone. Each instance provides
@@ -47,77 +44,7 @@ module Timezone
     # @param name [String] the timezone name
     # @return [Timezone::Zone]
     def initialize(name)
-      if name.is_a?(Hash)
-        legacy_initialize(name)
-      else
-        @name = name
-      end
-    end
-
-    # @deprecated This method will be replaced with `Zone#name` in
-    #   future versions of this gem.
-    def zone
-      Deprecate.call(
-        self.class,
-        :zone,
-        '[DEPRECATED] `Zone#zone` will not be available in ' \
-          'the next release of the `timezone` gem. Use `Zone#name` ' \
-          'instead.'.freeze
-      )
-
-      name
-    end
-
-    # @deprecated This method will be removed in the next release.
-    def rules
-      Deprecate.call(
-        self.class,
-        :rules,
-        '[DEPRECATED] `Zone#rules` will not be available in ' \
-          'the next release of the `timezone` gem.'.freeze
-      )
-
-      private_rules
-    end
-
-    # @deprecated This functionality only exists for migration purposes.
-    def legacy_initialize(options)
-      Deprecate.call(
-        self.class,
-        :initialize,
-        '[DEPRECATED] Creating Zone objects using an options hash ' \
-          'will be deprecated in the next release of the `timezone` ' \
-          'gem. Use `Timezone::[]`, `Timezone::fetch` or ' \
-          '`Timezone::lookup` instead.'.freeze
-      )
-
-      if options.key?(:lat) && options.key?(:lon)
-        options[:zone] = timezone_id options[:lat], options[:lon]
-      elsif options.key?(:latlon)
-        options[:zone] = timezone_id(*options[:latlon])
-      end
-
-      if options[:zone].nil?
-        raise Timezone::Error::NilZone,
-          'No zone was found. Please specify a zone.'.freeze
-      end
-
-      @name = options[:zone]
-      private_rules
-    end
-
-    # @deprecated This functionality will be removed in the next release.
-    def active_support_time_zone
-      Deprecate.call(
-        self.class,
-        :active_support_time_zone,
-        '[DEPRECATED] `Zone#active_support_time_zone` will be ' \
-          'deprecated in the next release of the `timezone` gem. There ' \
-          'will be no replacement.'.freeze
-      )
-
-      @active_support_time_zone ||=
-        Timezone::ActiveSupport.format(name, :internal)
+      @name = name
     end
 
     # Converts the given time to the local timezone and does not include
@@ -229,50 +156,6 @@ module Timezone
       utc_offset <=> other.utc_offset
     end
 
-    class << self
-      # @deprecated This method will be replaced with `Timezone.names`
-      #   in future versions of this gem.
-      def names
-        Deprecate.call(
-          self,
-          :names,
-          '[DEPRECATED] `::Timezone::Zone.names` will be removed in ' \
-            'the next gem release. Use `::Timezone.names` instead.'.freeze
-        )
-
-        Loader.names
-      end
-
-      # @deprecated This functionality will be removed in the next release.
-      def list(*args)
-        Deprecate.call(
-          self,
-          :list,
-          '[DEPRECATED] `Zone::list` will be deprecated in the ' \
-            'next release of the `timezone` gem. There will be no ' \
-            'replacement.'.freeze
-        )
-
-        args = nil if args.empty? # set to nil if no args are provided
-        zones = args || Configure.default_for_list || names
-        list = names.select { |name| zones.include? name }
-
-        @zones = []
-        now = Time.now
-        list.each do |name|
-          item = new(name)
-          @zones << {
-            zone: item.name,
-            title: Configure.replacements[item.name] || item.name,
-            offset: item.utc_offset,
-            utc_offset: (item.utc_offset / (60 * 60)),
-            dst: item.dst?(now)
-          }
-        end
-        @zones.sort_by! { |zone| zone[Configure.order_list_by] }
-      end
-    end
-
     private
 
     def private_rules
@@ -365,9 +248,5 @@ module Timezone
         return binary_search(time, mid + 1, to, &block)
       end
     end
-
-    def timezone_id(lat, lon)
-      Timezone::Configure.lookup.lookup(lat, lon)
-    end
   end
 end

data/test/http_test_client.rb

@@ -5,8 +5,7 @@ class HTTPTestClient
 
   attr_accessor :body
 
-  # TODO: Modify once on 1.0.0
-  def initialize(_protocol, _url = nil)
+  def initialize(_config)
   end
 
   def get(_url)

data/test/mocks/invalid_latlong.json

@@ -0,0 +1 @@
+{"status":{"message":"invalid lat/lng", "value":12}}

data/test/mocks/invalid_parameter.json

@@ -0,0 +1 @@
+{"status":{"message":"error parsing parameter","value":14}}

data/test/{basic_lookup_test.rb → timezone/lookup/test_basic.rb}

@@ -1,7 +1,9 @@
 require 'timezone/lookup/basic'
 require 'minitest/autorun'
 
-class BasicLookupTest < ::Minitest::Unit::TestCase
+class BasicLookupTest < ::Minitest::Test
+  parallelize_me!
+
   def config
     @config ||= Struct.new(:protocol, :url).new('http', 'example.com')
   end