timezone 1.2.8 → 1.2.9

data/lib/timezone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/zone'
 require 'timezone/nil_zone'
 require 'timezone/lookup'
@@ -41,7 +43,7 @@ module Timezone
     return ::Timezone::Zone.new(name) if Loader.valid?(name)
 
     if block_given? && default != :__block
-      warn('warning: block supersedes default value argument'.freeze)
+      warn('warning: block supersedes default value argument')
     end
 
     return block.call(name) if block_given?

data/lib/timezone/deprecate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timezone
   # This class provides a way to set a custom hook for deprecations.
   module Deprecate

data/lib/timezone/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timezone
   # Error messages that can be raised by this gem. To catch any
   # related error message, use Error::Base.

data/lib/timezone/loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/error'
 
 module Timezone # rubocop:disable Style/Documentation

data/lib/timezone/lookup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/geonames'
 require 'timezone/lookup/google'
 require 'timezone/lookup/test'

data/lib/timezone/lookup/basic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/error'
 
 module Timezone

data/lib/timezone/lookup/geonames.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/basic'
 require 'timezone/error'
 require 'json'
@@ -15,11 +17,11 @@ module Timezone
 
       def initialize(config)
         if config.username.nil?
-          raise(::Timezone::Error::InvalidConfig, 'missing username'.freeze)
+          raise(::Timezone::Error::InvalidConfig, 'missing username')
         end
 
-        config.protocol ||= 'http'.freeze
-        config.url ||= 'api.geonames.org'.freeze
+        config.protocol ||= 'http'
+        config.url ||= 'api.geonames.org'
 
         super
       end
@@ -48,11 +50,12 @@ module Timezone
       def get_timezone_id(data)
         return data['timezoneId'] if data['timezoneId']
 
-        if config.offset_etc_zones && data['gmtOffset']
-          return unless data['gmtOffset'].is_a? Numeric
-          return 'Etc/UTC' if data['gmtOffset'] == 0
-          "Etc/GMT#{format('%+d', -data['gmtOffset'])}"
-        end
+        return unless config.offset_etc_zones
+        return unless data['gmtOffset']
+        return unless data['gmtOffset'].is_a? Numeric
+
+        return 'Etc/UTC' if data['gmtOffset'].zero?
+        "Etc/GMT#{format('%+d', -data['gmtOffset'])}"
       end
 
       def url(lat, long)

data/lib/timezone/lookup/google.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/basic'
 require 'timezone/error'
 require 'json'
@@ -16,11 +18,11 @@ module Timezone
 
       def initialize(config)
         if config.api_key.nil?
-          raise(::Timezone::Error::InvalidConfig, 'missing api key'.freeze)
+          raise(::Timezone::Error::InvalidConfig, 'missing api key')
         end
 
-        config.protocol ||= 'https'.freeze
-        config.url ||= 'maps.googleapis.com'.freeze
+        config.protocol ||= 'https'
+        config.url ||= 'maps.googleapis.com'
 
         super
       end
@@ -28,20 +30,20 @@ module Timezone
       def lookup(lat, long)
         response = client.get(url(lat, long))
 
-        if response.code == '403'.freeze
-          raise(Timezone::Error::Google, '403 Forbidden'.freeze)
+        if response.code == '403'
+          raise(Timezone::Error::Google, '403 Forbidden')
         end
 
         return unless response.code =~ /^2\d\d$/
         data = JSON.parse(response.body)
 
-        return if data['status'.freeze] == NO_TIMEZONE_INFORMATION
+        return if data['status'] == NO_TIMEZONE_INFORMATION
 
-        if data['status'.freeze] != 'OK'.freeze
+        if data['status'] != 'OK'
           raise(Timezone::Error::Google, data['errorMessage'])
         end
 
-        data['timeZoneId'.freeze]
+        data['timeZoneId']
       rescue => e
         raise(Timezone::Error::Google, e.message)
       end

data/lib/timezone/lookup/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/basic'
 require 'timezone/error'
 

data/lib/timezone/net_http_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'net/http'
 
@@ -19,7 +21,7 @@ module Timezone
       @http = Net::HTTP.new(config.uri.host, config.uri.port)
       @http.open_timeout = config.open_timeout || 5
       @http.read_timeout = config.read_timeout || 5
-      @http.use_ssl = (config.protocol == 'https'.freeze)
+      @http.use_ssl = (config.protocol == 'https')
     end
 
     def get(url)

data/lib/timezone/nil_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timezone
   # A "nil" timezone object - representative of a missing timezone.
   class NilZone
@@ -12,14 +14,14 @@ module Timezone
     #
     # @return [String]
     def to_s
-      'NilZone'.freeze
+      'NilZone'
     end
 
     # A stubbed timezone debug string.
     #
     # @return [String]
     def inspect
-      '#<Timezone::NilZone>'.freeze
+      '#<Timezone::NilZone>'
     end
 
     # If this is a valid timezone.

data/lib/timezone/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module Timezone

data/lib/timezone/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timezone
-  VERSION = '1.2.8'.freeze
+  VERSION = '1.2.9'.freeze
 end

data/lib/timezone/zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'date'
 require 'time'
@@ -120,7 +122,16 @@ module Timezone
 
       utc = utc_to_local(time)
       offset = utc_offset(time)
-      Time.new(utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec, offset)
+
+      Time.new(
+        utc.year,
+        utc.month,
+        utc.day,
+        utc.hour,
+        utc.min,
+        utc.sec + utc.subsec,
+        offset
+      )
     end
 
     # The timezone abbreviation, at the given time.
@@ -248,15 +259,15 @@ module Timezone
 
       mid = (from + to).div(2)
 
-      if yield(time, private_rules[mid])
-        return mid if mid == 0
-
-        return mid unless yield(time, private_rules[mid - 1])
-
-        binary_search(time, from, mid - 1, &block)
-      else
+      unless yield(time, private_rules[mid])
         return binary_search(time, mid + 1, to, &block)
       end
+
+      return mid if mid.zero?
+
+      return mid unless yield(time, private_rules[mid - 1])
+
+      binary_search(time, from, mid - 1, &block)
     end
   end
 end

data/test/http_test_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HTTPTestClient
   Response = Struct.new(:body) do
     def code; '200'; end
@@ -5,8 +7,7 @@ class HTTPTestClient
 
   attr_accessor :body
 
-  def initialize(_config)
-  end
+  def initialize(_config); end
 
   def get(_url)
     HTTPTestClient::Response.new(body)

data/test/test_timezone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone'
 require 'minitest/autorun'
 

data/test/threadsafe_lookup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone'
 
 # Simple script to validate that lookups are threadsafe.

data/test/timezone/lookup/test_basic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/basic'
 require 'minitest/autorun'
 require 'ostruct'

data/test/timezone/lookup/test_geonames.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/geonames'
 require 'minitest/autorun'
 require_relative '../../http_test_client'

data/test/timezone/lookup/test_google.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/google'
 require 'minitest/autorun'
 require 'timecop'

data/test/timezone/lookup/test_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup/test'
 require 'timezone'
 require 'minitest/autorun'

data/test/timezone/test_deprecate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/deprecate'
 require 'minitest/autorun'
 

data/test/timezone/test_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/loader'
 require 'minitest/autorun'
 

data/test/timezone/test_lookup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/lookup'
 require 'minitest/autorun'
 

data/test/timezone/test_mathn_compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone'
 require 'minitest/autorun'
 require 'mathn'

data/test/timezone/test_nil_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timezone/nil_zone'
 require 'minitest/autorun'
 

data/test/timezone/test_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timecop'
 require 'timezone/zone'
 require 'minitest/autorun'
@@ -31,7 +33,7 @@ class TestZone < ::Minitest::Test
   end
 
   def test_abbr
-    assert_equal 'PDT', la.abbr(Time.new(2011, 6, 05))
+    assert_equal 'PDT', la.abbr(Time.new(2011, 6, 5))
     assert_equal 'PST', la.abbr(Time.new(2011, 11, 20))
   end
 
@@ -75,20 +77,20 @@ class TestZone < ::Minitest::Test
   end
 
   def test_utc_offsets
-    assert_equal(36_000, utc_offset('Australia/Sydney', 2011, 06, 05))
-    assert_equal(-25_200, utc_offset('America/Los_Angeles', 2011, 06, 05))
-    assert_equal(20_700, utc_offset('Asia/Kathmandu', 2011, 06, 05))
-    assert_equal(-18_000, utc_offset('America/New_York', 2011, 01, 11))
-    assert_equal(-14_400, utc_offset('America/New_York', 2011, 06, 11))
+    assert_equal(36_000, utc_offset('Australia/Sydney', 2011, 6, 5))
+    assert_equal(-25_200, utc_offset('America/Los_Angeles', 2011, 6, 5))
+    assert_equal(20_700, utc_offset('Asia/Kathmandu', 2011, 6, 5))
+    assert_equal(-18_000, utc_offset('America/New_York', 2011, 1, 11))
+    assert_equal(-14_400, utc_offset('America/New_York', 2011, 6, 11))
   end
 
   def test_dst
-    refute dst?('Australia/Sydney', 2011, 06, 05)
-    assert dst?('America/Los_Angeles', 2011, 06, 05)
-    refute dst?('Asia/Kathmandu', 2011, 06, 05)
+    refute dst?('Australia/Sydney', 2011, 6, 5)
+    assert dst?('America/Los_Angeles', 2011, 6, 5)
+    refute dst?('Asia/Kathmandu', 2011, 6, 5)
 
-    refute dst?('America/New_York', 2011, 01, 11)
-    assert dst?('America/New_York', 2011, 06, 11)
+    refute dst?('America/New_York', 2011, 1, 11)
+    assert dst?('America/New_York', 2011, 6, 11)
   end
 
   def test_gmt_timezone
@@ -150,21 +152,31 @@ class TestZone < ::Minitest::Test
     local = Time.new(2011, 1, 4, 9, 36, 29, 20_700)
     assert_equal local.to_s, zone('Asia/Kathmandu').time_with_offset(utc).to_s
 
-    utc = Time.utc(2014, 12, 15, 22, 00, 00)
-    local = Time.new(2014, 12, 15, 14, 00, 00, '-08:00')
+    utc = Time.utc(2014, 12, 15, 22, 0, 0)
+    local = Time.new(2014, 12, 15, 14, 0, 0, '-08:00')
     assert_equal(
       local.to_s,
       zone('America/Los_Angeles').time_with_offset(utc).to_s
     )
 
-    utc = Time.utc(2014, 4, 5, 22, 00, 00)
-    local = Time.new(2014, 4, 5, 15, 00, 00, '-07:00')
+    utc = Time.utc(2014, 4, 5, 22, 0, 0)
+    local = Time.new(2014, 4, 5, 15, 0, 0, '-07:00')
     assert_equal(
       local.to_s,
       zone('America/Los_Angeles').time_with_offset(utc).to_s
     )
   end
 
+  def test_time_with_offset_and_fractional_seconds
+    utc = Time.utc(2011, 1, 4, 3, 51, 29.123)
+    time_with_offset = zone('Asia/Kathmandu').time_with_offset(utc)
+    assert_equal 123_000, time_with_offset.usec
+
+    utc = Time.utc(2011, 1, 4, 3, 51, 29, 123_456)
+    time_with_offset = zone('Asia/Kathmandu').time_with_offset(utc)
+    assert_equal 123_456, time_with_offset.usec
+  end
+
   def test_australian_timezone_with_dst
     utc = Time.utc(2010, 12, 23, 19, 37, 15)
     local = Time.utc(2010, 12, 24, 6, 7, 15)
@@ -218,12 +230,12 @@ class TestZone < ::Minitest::Test
     assert_equal timezone.utc_offset(utc), 10_800
   end
 
-  EQUIVALENCE_METHODS = [
-    :time,
-    :local_to_utc,
-    :time_with_offset,
-    :dst?,
-    :utc_offset
+  EQUIVALENCE_METHODS = %i[
+    time
+    local_to_utc
+    time_with_offset
+    dst?
+    utc_offset
   ].freeze
 
   def check_equivalence(name, time, other)

data/timezone.gemspec

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # -*- encoding: utf-8 -*-
+
 $:.push File.expand_path('../lib', __FILE__)
 require 'timezone/version'
 
@@ -27,6 +29,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest', '~> 5.8')
-  s.add_development_dependency('rubocop', '= 0.40')
+  s.add_development_dependency('rubocop', '= 0.49.1')
   s.add_development_dependency('timecop', '~> 0.8')
 end