timezone 1.0.0 → 1.1.0

data/data/Indian/Kerguelen

@@ -1,2 +1,2 @@
--631152001:zzz:0:0
+-631152001:-00:0:0
 2066860801:TFT:0:18000

data/lib/timezone/lookup/geonames.rb

@@ -25,7 +25,8 @@ module Timezone
 
         data = JSON.parse(response.body)
 
-        return data['timezoneId'] if data['timezoneId']
+        timezone_id = get_timezone_id(data)
+        return timezone_id if timezone_id
 
         return unless data['status']
 
@@ -36,6 +37,16 @@ module Timezone
 
       private
 
+      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
+      end
+
       def url(lat, long)
         query = URI.encode_www_form(
           'lat' => lat,

data/lib/timezone/lookup/test.rb

@@ -7,15 +7,20 @@ module Timezone
     class Test < ::Timezone::Lookup::Basic
       def initialize(_config)
         @stubs = {}
+        @default_stub = nil
       end
 
       def stub(lat, long, timezone)
         @stubs[key(lat, long)] = timezone
       end
 
+      def default(timezone)
+        @default_stub = timezone
+      end
+
       def lookup(lat, long)
         @stubs.fetch(key(lat, long)) do
-          raise ::Timezone::Error::Test, 'missing stub'
+          @default_stub || raise(::Timezone::Error::Test, 'missing stub')
         end
       end
 

data/lib/timezone/version.rb

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

data/lib/timezone/zone.rb

@@ -236,7 +236,7 @@ module Timezone
 
       return from if from == to
 
-      mid = (from + to) / 2
+      mid = (from + to).div(2)
 
       if yield(time, private_rules[mid])
         return mid if mid == 0

data/test/mocks/lat_lon_coords_arctic.txt

@@ -0,0 +1 @@
+{"rawOffset":3,"dstOffset":0,"gmtOffset":3,"lng":40,"lat":89}

data/test/mocks/lat_lon_coords_atlantic.txt

@@ -0,0 +1 @@
+{"rawOffset":0,"dstOffset":0,"gmtOffset":0,"lng":0,"lat":0}

data/test/mocks/lat_lon_coords_norfolk.txt

@@ -0,0 +1 @@
+{"rawOffset":11.5,"dstOffset":0,"gmtOffset":11.5,"lng":167,"lat":-29}

data/test/mocks/lat_lon_coords_wrong_offset.txt

@@ -0,0 +1 @@
+{"rawOffset":11.5,"dstOffset":0,"gmtOffset":"n/a","lng":167,"lat":-29}

data/test/timezone/lookup/test_geonames.rb

@@ -9,10 +9,19 @@ class TestGeonames < ::Minitest::Test
     [-34.92771808058, 138.477041423321]
   end
 
-  def lookup
+  def etc_data
+    {
+      arctic: { coordinates: [89, 40], name: 'Etc/GMT-3' },
+      atlantic: { coordinates: [0, 0], name: 'Etc/UTC' },
+      norfolk: { coordinates: [-29, 167], name: 'Etc/GMT-11' }
+    }
+  end
+
+  def lookup(&_block)
     config = OpenStruct.new
     config.username = 'timezone'
     config.request_handler = HTTPTestClient
+    yield config if block_given?
 
     Timezone::Lookup::Geonames.new(config)
   end
@@ -35,6 +44,31 @@ class TestGeonames < ::Minitest::Test
     assert_equal 'Australia/Adelaide', mine.lookup(*coordinates)
   end
 
+  def test_lookup_with_etc
+    etc_data.each do |key, data|
+      mine = lookup { |c| c.offset_etc_zones = true }
+      mine.client.body = File.open(
+        mock_path + "/lat_lon_coords_#{key}.txt"
+      ).read
+
+      assert_equal data[:name], mine.lookup(*data[:coordinates])
+    end
+  end
+
+  def test_wrong_offset
+    mine = lookup { |c| c.offset_etc_zones = true }
+    mine.client.body = File.open(
+      mock_path + '/lat_lon_coords_wrong_offset.txt'
+    ).read
+
+    assert_nil mine.lookup(*coordinates)
+  end
+
+  def test_lookup_etc_without_option
+    mine = lookup
+    assert_nil mine.lookup(*etc_data[:atlantic][:coordinates])
+  end
+
   def assert_exception(lookup, message)
     exception = false
 

data/test/timezone/lookup/test_test.rb

@@ -21,4 +21,11 @@ class TestTest < ::Minitest::Test
       lookup.lookup(100, 100)
     end
   end
+
+  def test_default_stub
+    mine = lookup
+    mine.default('America/Toronto')
+
+    assert_equal 'America/Toronto', mine.lookup(-12, 12)
+  end
 end

data/test/timezone/test_mathn_compatibility.rb

@@ -0,0 +1,11 @@
+require 'timezone'
+require 'minitest/autorun'
+require 'mathn'
+
+class TestTimezone < ::Minitest::Test
+  parallelize_me!
+
+  def test_lookup_mathn_compatibility
+    Timezone['America/Regina'].utc_offset
+  end
+end

data/timezone.gemspec

@@ -3,27 +3,27 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'timezone/version'
 
 Gem::Specification.new do |s|
-  s.name = 'timezone'
-  s.version = Timezone::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.authors = ['Pan Thomakos']
-  s.email = ['pan.thomakos@gmail.com']
-  s.homepage =
-    "http://github.com/panthomakos/timezone/tree/#{Timezone::VERSION}"
-  s.summary = "timezone-#{Timezone::VERSION}"
-  s.license = 'MIT'
+  s.name        = 'timezone'
+  s.version     = Timezone::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Pan Thomakos']
+  s.email       = ['pan.thomakos@gmail.com']
+  s.homepage    = 'https://github.com/panthomakos/timezone'
+  s.summary     = "timezone-#{Timezone::VERSION}"
+  s.license     = 'MIT'
   s.description = 'Accurate current and historical timezones for Ruby with ' \
     'support for Geonames and Google latitude - longitude lookups.'
 
   s.rubyforge_project = 'timezone'
 
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files       = `git ls-files`.split("\n")
+  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`
     .split("\n").map { |f| File.basename(f) }
+
   s.extra_rdoc_files = ['README.markdown', 'License.txt']
-  s.rdoc_options = ['--charset=UTF-8']
-  s.require_paths = ['lib']
+  s.rdoc_options     = ['--charset=UTF-8']
+  s.require_paths    = ['lib']
 
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest', '~> 5.8')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -698,6 +698,10 @@ files:
 - test/mocks/invalid_latlong.json
 - test/mocks/invalid_parameter.json
 - test/mocks/lat_lon_coords.txt
+- test/mocks/lat_lon_coords_arctic.txt
+- test/mocks/lat_lon_coords_atlantic.txt
+- test/mocks/lat_lon_coords_norfolk.txt
+- test/mocks/lat_lon_coords_wrong_offset.txt
 - test/test_timezone.rb
 - test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
@@ -706,10 +710,11 @@ files:
 - test/timezone/test_deprecate.rb
 - test/timezone/test_loader.rb
 - test/timezone/test_lookup.rb
+- test/timezone/test_mathn_compatibility.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
 - timezone.gemspec
-homepage: http://github.com/panthomakos/timezone/tree/1.0.0
+homepage: https://github.com/panthomakos/timezone
 licenses:
 - MIT
 metadata: {}
@@ -733,7 +738,7 @@ rubyforge_project: timezone
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-1.0.0
+summary: timezone-1.1.0
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
@@ -744,6 +749,10 @@ test_files:
 - test/mocks/invalid_latlong.json
 - test/mocks/invalid_parameter.json
 - test/mocks/lat_lon_coords.txt
+- test/mocks/lat_lon_coords_arctic.txt
+- test/mocks/lat_lon_coords_atlantic.txt
+- test/mocks/lat_lon_coords_norfolk.txt
+- test/mocks/lat_lon_coords_wrong_offset.txt
 - test/test_timezone.rb
 - test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
@@ -752,6 +761,7 @@ test_files:
 - test/timezone/test_deprecate.rb
 - test/timezone/test_loader.rb
 - test/timezone/test_lookup.rb
+- test/timezone/test_mathn_compatibility.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
 has_rdoc: