google-maps 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4daaeaea85dad0ecfd2ed66cac2509ec167f3529e95d9d219818544ef097c28
-  data.tar.gz: 197b0d42d71e4b6c536da5c5a1a828640e377cd052648fe6f53b3a5d1458a21e
+  metadata.gz: 63fbd8b11238001389fff8a0e84bb1fa0c9fea0f674792ca4fd5a6d7fcb1b8a5
+  data.tar.gz: 2dd65ff3cccabe859ac5cd12689ff2e0c039020e3ee631539e46ba22163e4124
 SHA512:
-  metadata.gz: 20c66bd8480bb08e67e9926a493944a76d04a34086b6ad313eafcb6efbbbe3d2b8f77d69be10c1da82e4cdaf93dc81e3becf6bb9c586e863819cfc82e3469041
-  data.tar.gz: 531cc41b79b18c66e6854c49b4fb77cfd91e6440f88ab29c8c8ebb3255a27f16e7431525b2ebef0638b8ee3daea058877f3aeb3152a7a9bfc491c7c283cd36e0
+  metadata.gz: e58d772e216fb6a200a74e10391550e14f57d81e8854b5e3e97ac409c0d4d057428656413e49718381077ca9589b640a6f7728a5f2ec7abb5263243c3712cb00
+  data.tar.gz: 3993629575a01844bfc9164bffa6015577a029549da06f7bb256ed84ec429fa718615ba78743c4c31ab0f149aa3af3fd19fbf17f7d00ecac8783ff24062ab3f9

data/.rubocop.yml

@@ -7,7 +7,7 @@ Metrics/BlockLength:
     - "spec/**/*.rb"
   Max: 80
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 130
 
 Metrics/MethodLength:
@@ -22,3 +22,6 @@ Naming/FileName:
 
 Style/Documentation:
   Enabled: false
+
+Style/MethodMissingSuper:
+  Enabled: false

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.2
   - 2.5.3
+  - 2.7.0
 before_install:
-  - gem install bundler -v 1.17.3
+  - gem install bundler -v 2.1.2
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/README.md

@@ -66,6 +66,15 @@ end
   #=> "1 hour 12 mins"
 ```
 
+## Distance matrix
+
+```ruby
+Google::Maps.distance_matrix("Science Park, Amsterdam", "Deventer").distance
+#=> 104478
+Google::Maps.distance_matrix("Science Park, Amsterdam", "Deventer").duration
+#=> 4374
+```
+
 ### Route
 
 ```ruby

data/google-maps.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'google_maps/version'
 
 Gem::Specification.new do |s|
@@ -13,21 +13,19 @@ Gem::Specification.new do |s|
   s.summary     = 'Ruby wrapper for the Google Maps API'
   s.description = 'This is a ruby wrapper for the Google Maps api'
 
-  s.rubyforge_project = 'google-maps'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency('bundler', '~> 1.0')
+  s.add_development_dependency('bundler', '> 1.0')
   s.add_development_dependency('coveralls', '~> 0.8')
   s.add_development_dependency('mocha', '~> 1.7.0')
   s.add_development_dependency('rake', '~> 12.3.2')
-  s.add_development_dependency('rspec', '~> 3.8.0')
+  s.add_development_dependency('rspec', '~> 3.9.0')
   s.add_development_dependency('rspec-collection_matchers', '~> 1.1')
   s.add_development_dependency('rspec-its', '~> 1.2')
-  s.add_development_dependency('rubocop', '~> 0.61.1')
+  s.add_development_dependency('rubocop', '~> 0.79.0')
   s.add_development_dependency('simplecov', '~> 0.5')
   s.add_development_dependency('yard', '~> 0.9', '>= 0.9.11')
   s.add_dependency('hashie', '~> 3.6', '>= 3.6.0')

data/lib/google-maps.rb

@@ -5,6 +5,7 @@ require File.expand_path('google_maps/logger', __dir__)
 require File.expand_path('google_maps/route', __dir__)
 require File.expand_path('google_maps/place', __dir__)
 require File.expand_path('google_maps/location', __dir__)
+require File.expand_path('google_maps/distance_matrix', __dir__)
 
 module Google
   module Maps
@@ -31,6 +32,10 @@ module Google
       PlaceDetails.find(place_id, language)
     end
 
+    def self.distance_matrix(from, to, options = {})
+      DistanceMatrix.new(from, to, options_with_defaults(options))
+    end
+
     def self.geocode(address, language = default_language)
       Location.find(address, language)
     rescue ZeroResultsException

data/lib/google_maps/api.rb

@@ -17,8 +17,8 @@ module Google
     class ZeroResultsException < InvalidResponseException; end
 
     class API
-      STATUS_OK = 'OK'.freeze
-      STATUS_ZERO_RESULTS = 'ZERO_RESULTS'.freeze
+      STATUS_OK = 'OK'
+      STATUS_ZERO_RESULTS = 'ZERO_RESULTS'
 
       class << self
         def query(service, args = {})
@@ -59,9 +59,9 @@ module Google
         def response(url)
           begin
             result = Google::Maps::Result.new JSON.parse(HTTPClient.new.get_content(url))
-          rescue StandardError => error
-            Google::Maps.logger.error error.message.to_s
-            raise InvalidResponseException, "unknown error: #{error.message}"
+          rescue StandardError => e
+            Google::Maps.logger.error e.message.to_s
+            raise InvalidResponseException, "unknown error: #{e.message}"
           end
           handle_result_status(result.status)
           result

data/lib/google_maps/configuration.rb

@@ -8,22 +8,23 @@ module Google
       # An array of valid keys in the options hash when configuring an {Google::Maps::API}
       VALID_OPTIONS_KEYS = %i[
         end_point authentication_mode client_id client_secret format
-        directions_service places_service geocode_service
+        directions_service places_service geocode_service distance_matrix_service
         api_key default_language place_details_service default_params
       ].freeze
 
-      API_KEY = 'api_key'.freeze
-      DIGITAL_SIGNATURE = 'digital_signature'.freeze
+      API_KEY = 'api_key'
+      DIGITAL_SIGNATURE = 'digital_signature'
 
       # By default, set "https://maps.googleapis.com/maps/api/" as the server
-      DEFAULT_END_POINT = 'https://maps.googleapis.com/maps/api/'.freeze
+      DEFAULT_END_POINT = 'https://maps.googleapis.com/maps/api/'
 
-      DEFAULT_DIRECTIONS_SERVICE = 'directions'.freeze
-      DEFAULT_PLACES_SERVICE = 'place/autocomplete'.freeze
-      DEFAULT_PLACE_DETAILS_SERVICE = 'place/details'.freeze
-      DEFAULT_GEOCODE_SERVICE = 'geocode'.freeze
+      DEFAULT_DIRECTIONS_SERVICE = 'directions'
+      DEFAULT_PLACES_SERVICE = 'place/autocomplete'
+      DEFAULT_PLACE_DETAILS_SERVICE = 'place/details'
+      DEFAULT_GEOCODE_SERVICE = 'geocode'
+      DEFAULT_DISTANCE_MATRIX_SERVICE = 'distancematrix'
 
-      DEFAULT_FORMAT = 'json'.freeze
+      DEFAULT_FORMAT = 'json'
 
       # default language
       DEFAULT_LANGUAGE = :en
@@ -77,6 +78,7 @@ module Google
         self.places_service = DEFAULT_PLACES_SERVICE
         self.place_details_service = DEFAULT_PLACE_DETAILS_SERVICE
         self.geocode_service = DEFAULT_GEOCODE_SERVICE
+        self.distance_matrix_service = DEFAULT_DISTANCE_MATRIX_SERVICE
         self.default_language = DEFAULT_LANGUAGE
         self.default_params = DEFAULT_PARAMS
         self.authentication_mode = nil

data/lib/google_maps/distance_matrix.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require File.expand_path('api', __dir__)
+
+module Google
+  module Maps
+    class DistanceMatrix
+      attr_accessor :from, :to, :options
+
+      def initialize(from, to, options = {})
+        options = { language: options } unless options.is_a? Hash
+        @from = from
+        @to = to
+        @options = { language: :en }.merge(options)
+      end
+
+      def distance
+        element.distance.value
+      end
+
+      def duration
+        element.duration.value
+      end
+
+      private
+
+      def element
+        element = distance_matrix.rows.first.elements.first
+
+        raise Google::Maps::ZeroResultsException if element.status == 'NOT_FOUND'
+
+        element
+      end
+
+      def distance_matrix
+        @distance_matrix ||= API.query(:distance_matrix_service, @options.merge(origins: from, destinations: to))
+      end
+    end
+  end
+end

data/lib/google_maps/place.rb

@@ -93,13 +93,13 @@ module Google
 
           @address_components.find do |component|
             component.types.first == method_name.to_s
-          end || super
+          end
         end
 
-        def respond_to_missing?(method_name, include_private = false)
+        def respond_to_missing?(method_name, _include_private = false)
           @address_components.any? do |component|
             component.types.first == method_name.to_s
-          end || super
+          end
         end
       end
     end

data/lib/google_maps/version.rb

@@ -2,6 +2,6 @@
 
 module Google
   module Maps
-    VERSION = '3.0.5'.freeze
+    VERSION = '3.0.6'
   end
 end

data/spec/fixtures/distance-matrix.json

@@ -0,0 +1,22 @@
+{
+  "destination_addresses" : [ "Amsterdam" ],
+  "origin_addresses" : [ "Utrecht" ],
+  "rows" : [
+    {
+      "elements" : [
+        {
+          "distance" : {
+            "text" : "53,7 km",
+            "value" : 53744
+          },
+          "duration" : {
+            "text" : "54 min.",
+            "value" : 3237
+          },
+          "status" : "OK"
+        }
+      ]
+    }
+  ],
+  "status" : "OK"
+}

data/spec/google_maps/api_spec.rb

@@ -28,8 +28,8 @@ describe Google::Maps::API do
     stub_response('zero-results.json')
     begin
       Google::Maps.distance('Blah blah', 'Jalala')
-    rescue StandardError => error
-      @error = error
+    rescue StandardError => e
+      @error = e
     ensure
       expect(@error).not_to be_nil
       expect(@error).to be_a_kind_of StandardError

data/spec/google_maps/distance_matrix_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require File.expand_path('../spec_helper', __dir__)
+
+describe Google::Maps::DistanceMatrix do
+  describe '.find' do
+    subject { Google::Maps::DistanceMatrix.new('Amsterdam', 'Utrecht') }
+
+    context ':nl' do
+      before { stub_response('distance-matrix.json') }
+
+      its(:distance) { should eq 53_744 }
+      its(:duration) { should eq 3237 }
+    end
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: google-maps
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Daniel van Hoesel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.79.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -160,22 +160,22 @@ dependencies:
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/google-maps.rb
 - lib/google_maps/api.rb
 - lib/google_maps/configuration.rb
+- lib/google_maps/distance_matrix.rb
 - lib/google_maps/location.rb
 - lib/google_maps/logger.rb
 - lib/google_maps/place.rb
@@ -253,6 +254,7 @@ files:
 - spec/fixtures/den-haag-nl.json
 - spec/fixtures/deventer-en.json
 - spec/fixtures/deventer-nl.json
+- spec/fixtures/distance-matrix.json
 - spec/fixtures/geocoder/amsterdam-en.json
 - spec/fixtures/geocoder/science-park-400-amsterdam-en.json
 - spec/fixtures/geocoder/science-park-400-amsterdam-nl.json
@@ -260,6 +262,7 @@ files:
 - spec/fixtures/place_details.json
 - spec/fixtures/zero-results.json
 - spec/google_maps/api_spec.rb
+- spec/google_maps/distance_matrix_spec.rb
 - spec/google_maps/logger_spec.rb
 - spec/google_maps/place_details_spec.rb
 - spec/google_maps/place_spec.rb
@@ -285,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Google Maps API
@@ -295,6 +298,7 @@ test_files:
 - spec/fixtures/den-haag-nl.json
 - spec/fixtures/deventer-en.json
 - spec/fixtures/deventer-nl.json
+- spec/fixtures/distance-matrix.json
 - spec/fixtures/geocoder/amsterdam-en.json
 - spec/fixtures/geocoder/science-park-400-amsterdam-en.json
 - spec/fixtures/geocoder/science-park-400-amsterdam-nl.json
@@ -302,6 +306,7 @@ test_files:
 - spec/fixtures/place_details.json
 - spec/fixtures/zero-results.json
 - spec/google_maps/api_spec.rb
+- spec/google_maps/distance_matrix_spec.rb
 - spec/google_maps/logger_spec.rb
 - spec/google_maps/place_details_spec.rb
 - spec/google_maps/place_spec.rb