timezone 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3528575f40e59aefc08f078763424fd3f887a74
-  data.tar.gz: d7ffa64333e9109858fb805d48e2a089f714db77
+  metadata.gz: f425df08238312c541ca6f27ec918e93839d3b71
+  data.tar.gz: 63d02b58ca7ef733860dfa69c63817ef4813b34c
 SHA512:
-  metadata.gz: a59be63bf839ab0cddd7659c89085daba773412240f113af303c1b3c613ffa6b664b015902660be9284bbbb6b7fe4bdde1d3811104bb93793d6c2caec8564fd1
-  data.tar.gz: b92c0bfa5b17550fb700d4194c2d73875212d2545311c49d19b1e3fd93f108421a3729b35c40b15f50d442cfd994396360da42a754a9230798d7cae84bb98f48
+  metadata.gz: d77400308229dfa26cb85efa32d6fdfd3e47b9adaced3bb35e9767e89ce1f7988740355e5bcc2b111169214276d385278bbf39dd0a88e7e4c698ab5b23bf8bbf
+  data.tar.gz: db2044e5927331b314654d961e85f77aa6e9883fd48c3fe417690d59415574688c919919cd2f23fb2ef7b3a078fd99eafbc0f8dfc46b7cd097c262a09634270b

data/CHANGES.markdown

@@ -1,5 +1,9 @@
 # master (unreleased)
 
+# 1.2.5
+
+* Fix [#71](https://github.com/panthomakos/timezone/issues/71): make lookups thread-safe. (panthomakos)
+
 # 1.2.4
 
 * Updated with `tzdata-2016j-1`. (panthomakos)

data/lib/timezone/lookup/basic.rb

@@ -18,6 +18,8 @@ module Timezone
           raise(::Timezone::Error::InvalidConfig, 'missing url')
         end
 
+        config.uri ||= URI.parse("#{config.protocol}://#{config.url}")
+
         @config = config
       end
 
@@ -25,7 +27,7 @@ module Timezone
       #
       # @return [#get] an instance of a request handler
       def client
-        @client ||= config.request_handler.new(config)
+        config.request_handler.new(config)
       end
 
       # Returns a timezone name for a given lat, long pair.

data/lib/timezone/net_http_client.rb

@@ -16,8 +16,7 @@ module Timezone
   #
   class NetHTTPClient
     def initialize(config)
-      uri = URI.parse("#{config.protocol}://#{config.url}")
-      @http = Net::HTTP.new(uri.host, uri.port)
+      @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)

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

data/test/http_test_client.rb

@@ -12,3 +12,13 @@ class HTTPTestClient
     HTTPTestClient::Response.new(body)
   end
 end
+
+class HTTPTestClientFactory
+  def initialize(body)
+    @body = body
+  end
+
+  def new(config)
+    HTTPTestClient.new(config).tap { |c| c.body = @body }
+  end
+end

data/test/threadsafe_lookup.rb

@@ -0,0 +1,17 @@
+require 'timezone'
+
+# Simple script to validate that lookups are threadsafe.
+#
+# Usage: bundle exec ruby -Ilib test/threadsafe_lookup.rb USERNAME
+
+raise 'You must specify a geonames username' unless ARGV.first
+
+Timezone::Lookup.config(:geonames) do |c|
+  c.username = ARGV.first
+end
+
+threads = Array.new(5).map do
+  Thread.new { p Timezone.lookup(33.7489954, -84.3879824).name }
+end
+
+threads.map(&:join)

data/test/timezone/lookup/test_basic.rb

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

data/test/timezone/lookup/test_geonames.rb

@@ -17,10 +17,10 @@ class TestGeonames < ::Minitest::Test
     }
   end
 
-  def lookup(&_block)
+  def lookup(body = nil, &_block)
     config = OpenStruct.new
     config.username = 'timezone'
-    config.request_handler = HTTPTestClient
+    config.request_handler = HTTPTestClientFactory.new(body)
     yield config if block_given?
 
     Timezone::Lookup::Geonames.new(config)
@@ -38,28 +38,23 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_lookup
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/lat_lon_coords.txt').read
+    mine = lookup(File.open(mock_path + '/lat_lon_coords.txt').read)
 
     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
+      body = File.open(mock_path + "/lat_lon_coords_#{key}.txt").read
+      mine = lookup(body) { |c| c.offset_etc_zones = true }
 
       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
+    body = File.open(mock_path + '/lat_lon_coords_wrong_offset.txt').read
+    mine = lookup(body) { |c| c.offset_etc_zones = true }
 
     assert_nil mine.lookup(*coordinates)
   end
@@ -83,8 +78,7 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_api_limit
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/api_limit_reached.json').read
+    mine = lookup(File.open(mock_path + '/api_limit_reached.json').read)
 
     assert_exception(
       mine,
@@ -94,22 +88,19 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_invalid_latlong
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/invalid_latlong.json').read
+    mine = lookup(File.open(mock_path + '/invalid_latlong.json').read)
 
     assert_exception(mine, 'invalid lat/lng')
   end
 
   def test_no_result_found
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/no_result_found.json').read
+    mine = lookup(File.open(mock_path + '/no_result_found.json').read)
 
     assert_nil(mine.lookup(10, 10))
   end
 
   def test_invalid_parameter
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/invalid_parameter.json').read
+    mine = lookup(File.open(mock_path + '/invalid_parameter.json').read)
 
     assert_exception(mine, 'error parsing parameter')
   end

data/test/timezone/lookup/test_google.rb

@@ -10,14 +10,12 @@ class TestGoogle < ::Minitest::Test
     [-34.92771808058, 138.477041423321]
   end
 
-  def config
+  def lookup(body = nil, &_block)
     config = OpenStruct.new
-    config.request_handler = HTTPTestClient
     config.api_key = 'MTIzYWJj'
-    config
-  end
+    config.request_handler = HTTPTestClientFactory.new(body)
+    yield config if block_given?
 
-  def lookup
     Timezone::Lookup::Google.new(config)
   end
 
@@ -33,15 +31,14 @@ class TestGoogle < ::Minitest::Test
   end
 
   def test_google_using_lat_long_coordinates
-    mine = lookup
-    mine.client.body = File.open(mock_path + '/google_lat_lon_coords.txt').read
+    mine = lookup(File.open(mock_path + '/google_lat_lon_coords.txt').read)
 
     assert_equal 'Australia/Adelaide', mine.lookup(*coordinates)
   end
 
   def test_google_request_denied_read_lat_long_coordinates
-    mine = lookup
-    mine.client.body = nil
+    mine = lookup(nil)
+
     assert_raises Timezone::Error::Google, 'The provided API key is invalid.' do
       mine.lookup(*coordinates)
     end
@@ -61,13 +58,10 @@ class TestGoogle < ::Minitest::Test
   end
 
   def test_url_enterprise
-    econfig = config
-    econfig.client_id = '123&asdf'
-
-    enterprise = Timezone::Lookup::Google.new(econfig)
+    mine = lookup { |c| c.client_id = '123&asdf' }
 
     Timecop.freeze(Time.at(1_433_347_661)) do
-      result = enterprise.send(:url, '123', '123')
+      result = mine.send(:url, '123', '123')
       params = {
         'location' => '123%2C123',
         'timestamp' => '1433347661',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -708,6 +708,7 @@ files:
 - test/mocks/lat_lon_coords_wrong_offset.txt
 - test/mocks/no_result_found.json
 - test/test_timezone.rb
+- test/threadsafe_lookup.rb
 - test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
 - test/timezone/lookup/test_google.rb
@@ -743,7 +744,7 @@ rubyforge_project: timezone
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-1.2.4
+summary: timezone-1.2.5
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
@@ -760,6 +761,7 @@ test_files:
 - test/mocks/lat_lon_coords_wrong_offset.txt
 - test/mocks/no_result_found.json
 - test/test_timezone.rb
+- test/threadsafe_lookup.rb
 - test/timezone/lookup/test_basic.rb
 - test/timezone/lookup/test_geonames.rb
 - test/timezone/lookup/test_google.rb
@@ -770,4 +772,3 @@ test_files:
 - test/timezone/test_mathn_compatibility.rb
 - test/timezone/test_nil_zone.rb
 - test/timezone/test_zone.rb
-has_rdoc: