timezone 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e67f5f5b2a7f199d1d9c639db1b1684cb154b4d
-  data.tar.gz: cb3c97f023a8a73a975c45d198825826416da358
+  metadata.gz: 8a63e375d390532b48a5893acc6b5cae503327d8
+  data.tar.gz: 027d0d641967c2d31819c1ae08474119e037e03f
 SHA512:
-  metadata.gz: 2738b0e271a9d7e18972d30ec5d59cdd25c9d7b70aac9485bbcc52b73ecd17e767979ef7ac390245ee87dd05f347d32de84c050f22baded4acfca0faf8d78820
-  data.tar.gz: 6da76970b046a2c8b333ae02f0f48e1c9ed8e22eb697f0c8b3878edf110fe4fc1c63452696fa00c567be76ff3de6562bf6c5b5e90ab2f5675ed9243f9c9a099d
+  metadata.gz: a6ab4ce56850408b116810372db3a249d7350e77ce7f2262aa1e5e24ef989deea3b00aafedcbd21d8ad4737b2c7776d779af12b0807068c769b4a9fe478a3745
+  data.tar.gz: 629551995f3b72c874c0403bbf600141b2af662be10a2eabc880c2b23cf6f5312ad0a997f2d10d7bb1f173deb7d169b4e630535d788421f16f5d61c797fadfff

data/CHANGES.markdown

@@ -1,5 +1,9 @@
 # master (unreleased)
 
+# 1.2.8
+
+* Handle `ZERO_RESULTS` response from Google API. (zhublik)
+
 # 1.2.7
 
 * Updated with `tzdata-2017b-1`. (panthomakos)

data/README.markdown

@@ -170,6 +170,21 @@ Latitude - longitude lookups can raise `::Timezone::Error::Lookup` exceptions wh
     Timezone.lookup(10, 100000){ |name| "#{name} is invalid" }
     => " is invalid"
 
+## Using Geonames and Google Lookups
+
+`timezone` can be configured to use both Google and Geonames lookups. For instance, you may choose to fallback to Google if a Geonames lookup fails. The return value from a `::Timezone::Lookup.config` call can be stored and re-used to trigger lookups for the configured service. For instance:
+
+    GEONAMES_LOOKUP = Timezone::Lookup.config(:geonames) { |c| c.username = ... }
+    GOOGLE_LOOKUP = Timezone::Lookup.config(:google) { |c| c.api_key = ... }
+
+    lat, lon = 89, 40
+
+    begin
+      GEONAMES_LOOKUP.lookup(lat, lon)
+    rescue ::Timezone::Error::Lookup
+      GOOGLE_LOOKUP.lookup(lat, lon)
+    end
+
 ## Listing Timezones
 
 Retrieving the complete list of timezones can be accomplished using the `::Timezone::names` function. NOTE: the list is not ordered.

data/lib/timezone/lookup/google.rb

@@ -10,6 +10,10 @@ module Timezone
   module Lookup
     # @!visibility private
     class Google < ::Timezone::Lookup::Basic
+      # Indicates that no time zone data could be found for the specified
+      # <lat, lng>. This can occur if the query is incomplete or ambiguous.
+      NO_TIMEZONE_INFORMATION = 'ZERO_RESULTS'.freeze
+
       def initialize(config)
         if config.api_key.nil?
           raise(::Timezone::Error::InvalidConfig, 'missing api key'.freeze)
@@ -31,6 +35,8 @@ module Timezone
         return unless response.code =~ /^2\d\d$/
         data = JSON.parse(response.body)
 
+        return if data['status'.freeze] == NO_TIMEZONE_INFORMATION
+
         if data['status'.freeze] != 'OK'.freeze
           raise(Timezone::Error::Google, data['errorMessage'])
         end

data/lib/timezone/version.rb

@@ -1,3 +1,3 @@
 module Timezone
-  VERSION = '1.2.7'.freeze
+  VERSION = '1.2.8'.freeze
 end

data/test/mocks/google_no_result_found.json

@@ -0,0 +1 @@
+{ "status" : "ZERO_RESULTS" }

data/test/timezone/lookup/test_google.rb

@@ -73,6 +73,12 @@ class TestGoogle < ::Minitest::Test
     end
   end
 
+  def test_no_result_found
+    mine = lookup(File.open(mock_path + '/google_no_result_found.json').read)
+
+    assert_nil(mine.lookup(26.188703, -78.987053))
+  end
+
   private
 
   def mock_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -699,6 +699,7 @@ files:
 - test/http_test_client.rb
 - test/mocks/api_limit_reached.json
 - test/mocks/google_lat_lon_coords.txt
+- test/mocks/google_no_result_found.json
 - test/mocks/google_request_denied.txt
 - test/mocks/invalid_latlong.json
 - test/mocks/invalid_parameter.json
@@ -745,13 +746,14 @@ rubyforge_project: timezone
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: timezone-1.2.7
+summary: timezone-1.2.8
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia
 - test/http_test_client.rb
 - test/mocks/api_limit_reached.json
 - test/mocks/google_lat_lon_coords.txt
+- test/mocks/google_no_result_found.json
 - test/mocks/google_request_denied.txt
 - test/mocks/invalid_latlong.json
 - test/mocks/invalid_parameter.json