mapbox-sdk 2.3.0 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e37005101fa7cc0a72f5711254531e13574ddd14d470a8e115b278e62c4297f3
-  data.tar.gz: ff3a2679ed83dc2df5f1fba7474d59cf0489adaa6b303f0f45072a579f2714d4
+  metadata.gz: 485c58289f4baee1dc8d98e0c63642a77abc2b9290bda6f15afb20e8d8157bc3
+  data.tar.gz: 4aab789f653d516d1ae88811f598fd8190c7bfa6e6e3122b558eaa442144e677
 SHA512:
-  metadata.gz: 5e0d69f2d9f8920ef0ab08505156e1498dd579df3cedfc706444065d9d1ead993dab7abf9ab5451c5c22e0c0078e1a701f2f3eb5cb3a7dd29ee01ffb264f25d6
-  data.tar.gz: 1b7b0370797210b16210060bbc92c52a9fa14add842fc2d4b7adb57e66aa0f951143012508084cde4ecc6d6c5e6fa91d53b2f8735c0a24b9a05849de9eb179e8
+  metadata.gz: 33e2264dda2cdc27b191b1efe999db0596da3d5e861d6de00ab576e400764a2b0d23f9efed98a38cce292aa39ce0b73e4f837fb6c155cf6f54ca7a285078c51e
+  data.tar.gz: ebec6b814a78b45bb9517e3e66ae2c0edea63d91cae279ac328fd2de49b0cf5760c0b6e5f697095b9b563094a554777ad53072689a62bfe97b1377ac3243d3a8

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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
+  
+## [2.3.1] - 2020-11-07
+### Changed
+- Update to restclient 2.1.0
+
 ## [2.3.0] - 2019-01-16
 ### Added
 - Matrix endpoint, docs, and tests

data/Gemfile

@@ -3,11 +3,11 @@ gemspec
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9.3')
   gem 'i18n', '< 0.7'
-  gem 'rest-client', '~> 2.0.1'
+  gem 'rest-client', '~> 2.1.0'
   gem "activesupport", ">= 4.1.11"
   gem 'rake', '10.1.0'
 end
 
 group :development, :test do
   gem "coveralls", :require => false
-end
+end

data/README.md

@@ -25,10 +25,16 @@ gem install mapbox-sdk
 * [Map Matching](https://docs.mapbox.com/api/navigation/#map-matching): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/mapmatching.md)]
   * Profiles for driving, driving-traffic, walking, and cycling
 * [Optimization](https://docs.mapbox.com/api/navigation/#optimization): [[docs](https://github.com/mapbox/mapbox-sdk-rb/blob/master/docs/optimization.md)]
-* Profiles for driving, driving-traffic, walking, and cycling
+  * Profiles for driving, driving-traffic, walking, and cycling
 
 ## Testing
 
-Run `bundle exec ruby -Itest test/all_tests.rb` or individual tests as needed.
+You'll need to [create an access token](https://account.mapbox.com/access-tokens/create) in order to run tests.
+
+Then you can run the entire test suite with the following command:
+
+```
+MapboxAccessToken=<YOUR_ACCESS_TOKEN> bundle exec ruby -Itest test/all_tests.rb
+```
 
 Heavily influenced by Stripe's Ruby client, and includes its MIT license.

data/lib/mapbox/geocoder.rb

@@ -39,7 +39,7 @@ module Mapbox
 
       return request(
         :get,
-        "/geocoding/v5/#{dataset}/#{URI.escape(query)}.json#{params}",
+        "/geocoding/v5/#{dataset}/#{URI.encode_www_form_component(query)}.json#{params}",
         nil)
     end
 

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)
@@ -33,7 +33,7 @@ module Mapbox
     case method.to_s.downcase.to_sym
     when :get, :head, :delete
       # Make params into GET parameters
-      url += "#{URI.parse(url).query ? '&' : '?'}#{uri_encode(params)}" if params && params.any?
+      url += "#{URI.parse(url).query ? '&' : '?'}#{URI.encode_www_form(params)}" if params && params.any?
       payload = nil
     end
 
@@ -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)
@@ -78,7 +78,7 @@ module Mapbox
   end
 
   def self.url_encode(key)
-    URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+    URI.encode_www_form_component(key.to_s)
   end
 
   def self.execute_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.0'
+  s.version = '2.3.3'
   s.summary = 'Ruby bindings for the Mapbox API'
   s.description = ''
   s.authors = ['Tom MacWright']
@@ -10,7 +10,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'https://mapbox.com/developers'
   s.license = 'MIT'
 
-  s.add_dependency('rest-client', '~> 2.0.1')
+  s.add_dependency('rest-client', '~> 2.1.0')
 
   s.add_development_dependency('mocha', '~> 0.13.2')
   s.add_development_dependency('shoulda', '~> 3.4.0')

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.0
+  version: 2.3.3
 platform: ruby
 authors:
 - Tom MacWright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Mapbox API