gistance 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb92df92ed4fea89666a41d5c2c2f022ffe7c38
-  data.tar.gz: d291398fbabe94d12d404dbf431a80ca4bb7070f
+  metadata.gz: 19bd9d56947e3ca6c8928a676f133748aac382ed
+  data.tar.gz: 6e17c917f886d710220754edd936bbf586ccf9c3
 SHA512:
-  metadata.gz: 45793bb6bcb381a7ef454c1173d09272c4886a6b6d59e5354d4b99814d994fc0b7ac95026c88823897cd0e6f04e51fff00b14bd06a72ed4e85d4c0548126fa1d
-  data.tar.gz: 65720f0ad44376ed8813d97d6bfbbebc65008c2db59e21b611adb997110f5360a28e511d7d95c538c7d7d561a4027e85d090f0877ba7ad36352ce47293334e28
+  metadata.gz: 2c24751f2975401787661da72216a95ca9c8770768b742c3c8ba525920cd5ea4872c41f22de23d3cfe848cfd6c32f5f0a9f2ab3d81768c845d1f45ffd8311932
+  data.tar.gz: 778c86fec5a8e26cba1cdb898d00e6a839fcec26b1ef1ceb6f8c5afe35e6a6204ef72399f3e45730d9613a1f8194ce9ed7b091c4adf40ec5a7751e621407384e

data/README.md

@@ -33,7 +33,7 @@ API methods are available as module methods
 ```ruby
 Gistance.configure do |c|
   c.api_key = 'YOUR_API_KEY'
-  c.unit = 'imperial' # default to metric
+  c.units = 'imperial' # default to metric
   c.language = 'fr' # default to en
   c.sensor = true # default to false
 end
@@ -44,13 +44,13 @@ or as client instance methods
 ```ruby
 Gistance::Client.new(
   api_key: 'YOUR_API_KEY',
-  unit: 'imperial',
+  units: 'imperial',
   language: 'fr',
   sensor: true
 )
 ```
 
-The `unit`, `language` and `sensor` parameters can be set globally or can be provided for every request if passed as parameters.
+The `units`, `language` and `sensor` parameters can be set globally or can be provided for every request if passed as parameters.
 
 ## Authentication
 

data/gistance.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.test_files = Dir.glob('spec/**/*')
 
-  gem.add_dependency 'faraday', '~> 0.8.9'
-  gem.add_dependency 'faraday_middleware', '~> 0.9.0'
+  gem.add_dependency 'faraday', '~>0.9.1'
+  gem.add_dependency 'faraday_middleware', '~> 0.9.1'
   gem.add_dependency 'hashie', '~>2.0.5'
   gem.add_dependency 'json', '~>1.8.1'
-  gem.add_dependency 'multi_json', '~>1.9.2'
+  gem.add_dependency 'multi_json', '~>1.11.0'
 end

data/lib/gistance/configuration.rb

@@ -6,7 +6,7 @@ module Gistance
       :api_endpoint,
       :api_key,
       :language,
-      :unit,
+      :units,
       :sensor,
       :business
     ].freeze
@@ -36,7 +36,7 @@ module Gistance
       self.api_endpoint = DEFAULT_API_ENDPOINT
       self.api_key = nil
       self.language = 'en'
-      self.unit = 'metric'
+      self.units = 'metric'
       self.sensor = false
       self.business = nil
     end

data/lib/gistance/request.rb

@@ -17,7 +17,7 @@ module Gistance
 
     def request(method, options)
       response = connection.send(method) do |request|
-        [:language, :unit, :sensor].each do |option|
+        [:language, :units, :sensor].each do |option|
           request.params[option] = options.delete(option) || self.public_send(option)
         end
 

data/lib/gistance/version.rb

@@ -1,5 +1,5 @@
 module Gistance
   # Current version
   # @return [String]
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_an_array_of_destination_addresses.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:10 GMT
 recorded_with: VCR 2.9.0

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_an_array_of_origin_addresses.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:10 GMT
 recorded_with: VCR 2.9.0

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_the_destination_address.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:11 GMT
 recorded_with: VCR 2.9.0

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_the_distance_between_origin_and_destination.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:10 GMT
 recorded_with: VCR 2.9.0

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_the_origin_address.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:09 GMT
 recorded_with: VCR 2.9.0

data/spec/cassettes/Gistance_Client_DistanceMatrix/_distance_matrix/returns_the_travel_duration_between_origin_and_destination.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&unit=metric
+    uri: https://maps.googleapis.com/maps/api/distancematrix/json?destinations=48.857066,%202.341138&language=en&origins=10%2BPlace%2Bde%2Bla%2BConcorde,%2B75008%2BParis,%2BFrance&sensor=false&units=metric
     body:
       encoding: US-ASCII
       string: ''
@@ -61,6 +61,6 @@ http_interactions:
            ],
            "status" : "OK"
         }
-    http_version: 
+    http_version:
   recorded_at: Wed, 02 Apr 2014 22:24:11 GMT
 recorded_with: VCR 2.9.0

data/spec/lib/gistance/client_spec.rb

@@ -52,17 +52,17 @@ describe Gistance::Client do
       end
     end
 
-    describe 'unit' do
-      it 'sets unit'  do
+    describe 'units' do
+      it 'sets units'  do
         client = Gistance::Client.new
 
-        expect(client.unit).to eql 'metric'
+        expect(client.units).to eql 'metric'
       end
 
       it 'overrides module configuration' do
-        client = Gistance::Client.new(unit: 'imperial')
+        client = Gistance::Client.new(units: 'imperial')
 
-        expect(client.unit).to eql 'imperial'
+        expect(client.units).to eql 'imperial'
       end
     end
 

data/spec/lib/gistance/request_spec.rb

@@ -23,13 +23,28 @@ describe Gistance::Request do
 
       assert_requested :get, 'https://maps.googleapis.com/maps/api/distancematrix/json?'\
         'language=en&'\
-        'unit=metric&'\
+        'units=metric&'\
         'sensor=false&'\
         'client=gme-fuubar&'\
         'channel=test&'\
-        'signature=wA6neJ6IkHTs6BxFt6ves7hxsZI%3D'
+        'signature=JlBk9pESGAhVTtCZbidG8Ss2fbM%3D'
 
       VCR.turn_on!
     end
+
+    it 'respects overridden options' do
+      stub_request(:get, /.*maps.*/).to_return(body: { status: 'ok' }.to_json)
+
+      business_client.units = 'imperial'
+
+      business_client.get
+
+      expect(
+        a_request(:get, 'https://maps.googleapis.com/maps/api/distancematrix/json').
+        with(:query => hash_including("units" => "imperial"))
+      ).
+      to have_been_made
+
+    end
   end
 end

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ RSpec.configure do |c|
 end
 
 def google_distance_matrix_url
-  "#{Gistance.api_endpoint}?language=en&sensor=false&unit=metric"
+  "#{Gistance.api_endpoint}?language=en&sensor=false&units=metric"
 end
 
 def client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gistance
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aylic Petit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.11.0
 description: Simple Ruby wrapper for the Google Distance Matrix API.
 email:
 - sush@users.noreply.github.com
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Google Distance Matrix API Ruby wrapper