mapbox-sdk 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672927337ebb6e2225839694318310798e63a8f4cc64100d96a67d67a2cde23e
-  data.tar.gz: 4fea4ca533cf9e8b6b9ff7118e2abffe36ff8d9b72758adabc21391e279dead0
+  metadata.gz: 485c58289f4baee1dc8d98e0c63642a77abc2b9290bda6f15afb20e8d8157bc3
+  data.tar.gz: 4aab789f653d516d1ae88811f598fd8190c7bfa6e6e3122b558eaa442144e677
 SHA512:
-  metadata.gz: 8a271a83fcb6f562421aceb5c45c0d66bef03fe6d59ef171f3d325936dd9cd01a935e29fd51404a40e39b59d5a9b43d40c9f1fd1d48054d7befff0588e66a43e
-  data.tar.gz: a016890aca123c692ec7a72b03cb3bf7395551c958775affde6feed96ad7d25428aa108118cc99615463d94049a1fec7d2b97f814054a6b2bdab9025b81dca75
+  metadata.gz: 33e2264dda2cdc27b191b1efe999db0596da3d5e861d6de00ab576e400764a2b0d23f9efed98a38cce292aa39ce0b73e4f837fb6c155cf6f54ca7a285078c51e
+  data.tar.gz: ebec6b814a78b45bb9517e3e66ae2c0edea63d91cae279ac328fd2de49b0cf5760c0b6e5f697095b9b563094a554777ad53072689a62bfe97b1377ac3243d3a8

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.3.3] - 2021-09-08
+### Changed
+- See https://github.com/mapbox/mapbox-sdk-rb/pull/55 / https://github.com/mapbox/mapbox-sdk-rb/issues/54
+  
 ## [2.3.2] - 2020-11-23
 ### Changed
 - Fixed URI.encode obsolete warnings in Ruby 2.7

data/lib/mapbox.rb

@@ -11,7 +11,7 @@ module Mapbox
   LONGITUDE_KEY = 'longitude'.freeze
 
   class << self
-    attr_accessor :access_token, :api_base, :request_opts
+    attr_accessor :access_token, :api_base, :request_opts, :request_timeout, :request_open_timeout
   end
 
   def self.request(method, url, api_key, params={}, headers={}, api_base_url=nil)
@@ -42,10 +42,10 @@ module Mapbox
 
     @request_opts.update(
       :method => method,
-      :open_timeout => 30,
+      :open_timeout => @request_open_timeout || 30,
       :payload => payload,
       :url => url,
-      :timeout => 80)
+      :timeout => @request_timeout || 80)
 
     begin
       response = execute_request(@request_opts)
@@ -184,4 +184,4 @@ require 'mapbox/tilequery'
 require 'mapbox/isochrone'
 require 'mapbox/matrix'
 require 'mapbox/map_matching'
-require 'mapbox/optimization'
+require 'mapbox/optimization'

data/mapbox-sdk.gemspec

@@ -2,7 +2,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 spec = Gem::Specification.new do |s|
   s.name = 'mapbox-sdk'
-  s.version = '2.3.2'
+  s.version = '2.3.3'
   s.summary = 'Ruby bindings for the Mapbox API'
   s.description = ''
   s.authors = ['Tom MacWright']

data/test/geocoding_test.rb

@@ -5,49 +5,58 @@ require 'shoulda'
 
 module Mapbox
   class GeocodingTest < Test::Unit::TestCase
-    should "#geocode_forward" do
+
+    def setup
       Mapbox.access_token = ENV["MapboxAccessToken"]
+    end
+
+    def teardown
+      Mapbox.request_open_timeout = nil
+      Mapbox.request_timeout = nil
+    end
+
+    should "#geocode_forward" do
       result = Mapbox::Geocoder.geocode_forward("Chester, NJ")
       assert result
     end
 
+    should "set_default_timeouts" do
+      result = Mapbox::Geocoder.geocode_forward("Chester, NJ")
+      assert Mapbox.request_opts[:timeout] = 80
+      assert Mapbox.request_opts[:open_timeout] = 30
+    end
+
     should "#geocode_forward (rounded proximity to 3 decimal places)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_forward("Chester, NJ", {:proximity => {:longitude => 0.1234567, :latitude => -10.987654}})
       assert result
       assert Mapbox.request_opts[:url].include? '?proximity=0.123%2C-10.988&'
     end
 
     should "#geocode_forward (include bbox param)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_forward("Washington", {:bbox => [-78.3284,38.6039,-78.0428,38.7841]})
       assert result
       assert Mapbox.request_opts[:url].include? '?bbox=-78.3284%2C38.6039%2C-78.0428%2C38.7841';
     end
 
     should "#geocode_forward (include extra param)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_forward("Washington", {:bbox => [-78.3284,38.6039,-78.0428,38.7841], :foo_key => "foo_val", :bar_key => "bar_val"})
       assert result
       assert Mapbox.request_opts[:url].include? '?foo_key=foo_val&bar_key=bar_val';
     end
 
     should "#geocode_forward (include country param)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_forward("Washington", {:country => "ca"})
       assert result
       assert Mapbox.request_opts[:url].include? '?country=ca';
     end
 
     should "#geocode_forward (include types param)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_forward("Washington", {:types => ['poi.landmark', 'address'], :foo_key => "foo_val", :bar_key => "bar_val"})
       assert result
       assert Mapbox.request_opts[:url].include? '?foo_key=foo_val&bar_key=bar_val&types=poi.landmark%2Caddress';
     end
 
     should "#geocode_reverse" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_reverse({
         :latitude => 38,
         :longitude => -100
@@ -56,7 +65,6 @@ module Mapbox
     end
 
     should "#geocode_reverse (rounded coordinates to 5 decimal places)" do
-      Mapbox.access_token = ENV["MapboxAccessToken"]
       result = Mapbox::Geocoder.geocode_reverse({
         :latitude => 1.23456789,
         :longitude => -99.8765432
@@ -66,5 +74,12 @@ module Mapbox
       end
     end
 
+    should "set_custom_timeouts" do
+      Mapbox.request_timeout = 10
+      Mapbox.request_open_timeout = 5
+      result = Mapbox::Geocoder.geocode_forward("Chester, NJ", {:proximity => {:longitude => 0.1234567, :latitude => -10.987654}})
+      assert Mapbox.request_opts[:timeout] == 10
+      assert Mapbox.request_opts[:open_timeout] == 5
+    end
   end
 end

data/test/mapbox_test.rb

@@ -14,6 +14,14 @@ module Mapbox
     should "allow access token to be set" do
       Mapbox.access_token = "foo"
     end
+
+    should "allow request_timeout to be set" do
+      Mapbox.request_timeout = 5
+    end
+
+    should "allow request_open_timeout to be set" do
+      Mapbox.request_open_timeout = 5
+    end
   end
 
   class HashUtilTest < Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mapbox-sdk
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Tom MacWright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Mapbox API