google_distance_matrix 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e2a2232b164549acbd29af07935315c8859dc19c
-  data.tar.gz: 3f29dc7ef98d87e913c1372fabd660766150dc8b
+SHA256:
+  metadata.gz: ec09fa5221e72649dc748457361fd70b8411ef4aaaf149d89cd611fb8283a046
+  data.tar.gz: 835d472137fae8e86ecdfb91355519ad951ae2cad6f476ed810d06258f82fa89
 SHA512:
-  metadata.gz: bead0dcdb680422cac5db6463af54580036dc6fae0f98373eec513e18a3a197ca7981d57db4ca64a27cc7461e675bd181b81a284b0cd98129e98fa916735be28
-  data.tar.gz: 0d6d9b8a96282568c647293adab6c58e9eed438e36d1e42f1f4b473a6da59c7cb5014eebc5cc56b4326211e8faa68e292651940a5f1e1d2c30b9b82ba5435710
+  metadata.gz: 147599c8ebad87d56263e53740bff7e6ed8ff610c0cc484fc54e2eb0bae0871f9c36aee64e584fd7c9406af28aaa67c7de315095265dd4ae46a2713b3294a1fd
+  data.tar.gz: 6fc3c60083417ebc18a63a01553421c9f26a8d55dcc63a0d8cee03ce4278addf97e69cb04a638ecd376aab4d97ec4258ccd9a1757a3958c466e392bcbd053e0c

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+2.5.5

data/.travis.yml

@@ -1,13 +1,11 @@
 before_install:
   - gem update bundler
 rvm:
-  - 2.1.0
-  - 2.1.2
-  - 2.1.5
-  - 2.2.3
-  - 2.3.0
-  - 2.3.1
-  - 2.3.4
+  - 3.0.1
+  - 2.6.2
+  - 2.5.5
+  - 2.4.5
+  - 2.3.8
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## v.0.6.4
+
+* fix: no longer throwing "Wrong number of arguments" when using the cache (by brianlow)
+
+## v.0.6.3
+
+* chore: bumped dependency support up to Rails 6.1 (by mintyfresh)
+
+## v.0.6.2
+
+* chore: bumped dependency support up to Rails 6 (by zackchandler)
+
+## v.0.6.1
+
+* fix: when matrix places were built from hashes, passing hashes to route/s_for doesnt't work (by brauliomartinezlm)
+* fix: place comparison was not working with == (by brauliomartinezlm)
+
+## v.0.6.0
+
+* Depend on activemodel & activesupport < 5.3 (by brauliomartinezlm)
+* Tested with Ruby 2.5.
+* Dropped support for Ruby 2.2 and below.
+* Added support for `channel` (by michaelgpearce)
+
 ## v.0.5.0
 
 This release contains breaking change where `url` has been renamed to

data/README.md

@@ -11,9 +11,6 @@ pull the distance matrix from Google.
 Once you have the matrix you can fetch all routes from a given
 origin or to a given destination.
 
-The matrix may also be used as a data set for traveling salesman problem,
-but to solve it you may look at <http://ai4r.org/>.
-
 
 
 

data/google_distance_matrix.gemspec

@@ -1,6 +1,6 @@
 # frozen_String_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'google_distance_matrix/version'
 
@@ -19,14 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 3.2.13', '<= 5'
-  spec.add_dependency 'activemodel', '>= 3.2.13', '<= 5'
+  spec.add_dependency 'activemodel', '>= 3.2.13', '< 6.2'
+  spec.add_dependency 'activesupport', '>= 3.2.13', '< 6.2'
   spec.add_dependency 'google_business_api_url_signer', '~> 0.1.3'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rspec', '~> 3.5.0'
-  spec.add_development_dependency 'rubocop', '~> 0.48'
-  spec.add_development_dependency 'shoulda-matchers', '~> 3.1.1'
-  spec.add_development_dependency 'webmock', '~> 3.0.1'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.8.0'
+  spec.add_development_dependency 'rubocop', '~> 0.59.2'
+  spec.add_development_dependency 'shoulda-matchers', '~> 4.0.0.rc1'
+  spec.add_development_dependency 'webmock', '~> 3.4.2'
 end

data/lib/google_distance_matrix/client_cache.rb

@@ -19,7 +19,7 @@ module GoogleDistanceMatrix
 
     def get(url, options = {})
       cache.fetch self.class.key(url, options.fetch(:configuration)) do
-        client.get url, options
+        client.get url, **options
       end
     end
   end

data/lib/google_distance_matrix/configuration.rb

@@ -18,7 +18,7 @@ module GoogleDistanceMatrix
       mode avoid units language
       departure_time arrival_time
       transit_mode transit_routing_preference
-      traffic_model
+      traffic_model channel
     ].freeze
 
     API_DEFAULTS = {
@@ -84,7 +84,7 @@ module GoogleDistanceMatrix
       API_DEFAULTS.each_pair do |attr_name, value|
         self[attr_name] = begin
                             value.dup
-                          rescue
+                          rescue StandardError
                             value
                           end
       end
@@ -105,10 +105,7 @@ module GoogleDistanceMatrix
         attr_and_value[1].nil? || param_same_as_api_default?(attr_and_value)
       end
 
-      if google_business_api_client_id.present?
-        out << ['client', google_business_api_client_id]
-      end
-
+      out << ['client', google_business_api_client_id] if google_business_api_client_id.present?
       out << ['key', google_api_key] if google_api_key.present?
 
       out

data/lib/google_distance_matrix/logger.rb

@@ -19,7 +19,7 @@ module GoogleDistanceMatrix
         msg = args.first
         tags = PREFIXES.dup.concat Array.wrap(options[:tag])
 
-        backend.public_send level, tag_msg(msg, tags) if backend
+        backend&.public_send level, tag_msg(msg, tags)
       end
     end
 

data/lib/google_distance_matrix/place.rb

@@ -22,6 +22,7 @@ module GoogleDistanceMatrix
       if respond_to_needed_attributes? attributes_or_object
         extract_and_assign_attributes_from_object attributes_or_object
       elsif attributes_or_object.is_a? Hash
+        @extracted_attributes_from = attributes_or_object.with_indifferent_access
         assign_attributes attributes_or_object
       else
         raise ArgumentError, 'Must be either hash or object responding to lat, lng or address. '
@@ -36,12 +37,15 @@ module GoogleDistanceMatrix
     end
 
     def eql?(other)
+      return false unless other.is_a? self.class
+
       if address.present?
         address == other.address
       else
         lat_lng == other.lat_lng
       end
     end
+    alias == eql?
 
     def lat_lng?
       lat.present? && lng.present?
@@ -74,9 +78,7 @@ module GoogleDistanceMatrix
 
     def extract_and_assign_attributes_from_object(object)
       attrs = Hash[ATTRIBUTES.map do |attr_name|
-        if object.respond_to? attr_name
-          [attr_name, object.public_send(attr_name)]
-        end
+        [attr_name, object.public_send(attr_name)] if object.respond_to? attr_name
       end.compact]
 
       attrs.delete 'address' if attrs.key?('lat') || attrs.key?('lng')

data/lib/google_distance_matrix/polyline_encoder/value_encoder.rb

@@ -58,11 +58,12 @@ module GoogleDistanceMatrix
       #
       # Example of usage
       #   p d 17998321 # => "00000001 00010010 10100001 11110001"
-      def d(v, bits = 32, chunk_size = 8)
+      def d(val, bits = 32, chunk_size = 8)
         (bits - 1).downto(0)
-                  .map { |n| v[n] }
+                  .map { |n| val[n] }
                   .each_slice(chunk_size).map(&:join).join ' '
       end
     end
   end
 end
+# rubocop:enable Style/NumericPredicate

data/lib/google_distance_matrix/routes_finder.rb

@@ -10,8 +10,9 @@ module GoogleDistanceMatrix
 
     def initialize(matrix)
       @matrix = matrix
-    end # Public: Finds routes for given place.
+    end
 
+    # Public: Finds routes for given place.
     #
     # place   -  Either an origin or destination, or an object which you built the place from
     #
@@ -53,9 +54,7 @@ module GoogleDistanceMatrix
       origin = ensure_place options[:origin]
       destination = ensure_place options[:destination]
 
-      if origin.nil? || destination.nil?
-        raise ArgumentError, 'Must provide origin and destination'
-      end
+      raise ArgumentError, 'Must provide origin and destination' if origin.nil? || destination.nil?
 
       routes_for(origin).detect { |route| route.destination == destination }
     end
@@ -143,6 +142,8 @@ module GoogleDistanceMatrix
       if object.is_a? Place
         object
       else
+        object = object.with_indifferent_access if object.is_a? Hash
+
         find_place_for_object(origins, object) ||
           find_place_for_object(destinations, object)
       end
@@ -196,4 +197,5 @@ module GoogleDistanceMatrix
       raise InvalidQuery, 'Matrix must be in mode driving and a departure_time must be set'
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/google_distance_matrix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoogleDistanceMatrix
-  VERSION = '0.5.0'
+  VERSION = '0.6.4'
 end

data/spec/lib/google_distance_matrix/client_cache_spec.rb

@@ -29,6 +29,7 @@ describe GoogleDistanceMatrix::ClientCache do
 
       expect(subject.get(url, options)).to eq 'cached-data'
     end
+    # rubocop:enable Metrics/LineLength
 
     it 'asks client when cache miss' do
       expect(client).to receive(:get).with(url, options).and_return 'api-data'

data/spec/lib/google_distance_matrix/place_spec.rb

@@ -95,4 +95,12 @@ describe GoogleDistanceMatrix::Place do
         .to_not be_eql described_class.new(lat: lat, lng: lng + 1)
     end
   end
+
+  describe '#==' do
+    it 'is considered equal when places are compared with ==' do
+      expect(described_class.new(address: address) ==
+             GoogleDistanceMatrix::Place.new(address: address))
+        .to be_truthy
+    end
+  end
 end

data/spec/lib/google_distance_matrix/routes_finder_spec.rb

@@ -3,7 +3,8 @@
 require 'spec_helper'
 
 describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
-  let(:origin_1) { GoogleDistanceMatrix::Place.new address: 'Karl Johans gate, Oslo' }
+  let(:origin_1_attributes) { { address: 'Karl Johans gate, Oslo' } }
+  let(:origin_1) { GoogleDistanceMatrix::Place.new origin_1_attributes }
   let(:origin_2) { GoogleDistanceMatrix::Place.new address: 'Askerveien 1, Asker' }
 
   let(:destination_1) { GoogleDistanceMatrix::Place.new address: 'Drammensveien 1, Oslo' }
@@ -70,6 +71,13 @@ describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
         expect(routes.map(&:origin).all? { |o| o == origin_1 }).to be true
       end
 
+      it 'still returns routes for origin if it has same address but different object_id' do
+        routes = subject.routes_for GoogleDistanceMatrix::Place.new origin_1_attributes
+
+        expect(routes.length).to eq 2
+        expect(routes.map(&:origin).all? { |o| o == origin_1 }).to be true
+      end
+
       it 'returns routes for given destination' do
         routes = subject.routes_for destination_2
 
@@ -83,6 +91,17 @@ describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
         expect(routes.length).to eq 2
         expect(routes.map(&:destination).all? { |d| d == destination_2 }).to be true
       end
+
+      context 'place built from hash' do
+        let(:destination_2_built_from) { { address: 'Skjellestadhagen, Heggedal' } }
+
+        it 'returns routes for given hash a place was built from' do
+          routes = subject.routes_for destination_2_built_from
+
+          expect(routes.length).to eq 2
+          expect(routes.map(&:destination).all? { |d| d == destination_2 }).to be true
+        end
+      end
     end
 
     describe '#routes_for!' do
@@ -104,6 +123,16 @@ describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
         expect(route.destination).to eq destination_2
       end
 
+      context 'place built from hash' do
+        let(:destination_2_built_from) { { address: 'Skjellestadhagen, Heggedal' } }
+
+        it 'returns route when you give it the hash the place was built from' do
+          route = subject.route_for(origin: origin_1, destination: destination_2_built_from)
+          expect(route.origin).to eq origin_1
+          expect(route.destination).to eq destination_2
+        end
+      end
+
       it 'fails with argument error if origin is missing' do
         expect { subject.route_for destination: destination_2 }.to raise_error ArgumentError
       end

data/spec/lib/google_distance_matrix/url_builder_spec.rb

@@ -49,7 +49,7 @@ describe GoogleDistanceMatrix::UrlBuilder do
 
   describe '#sensitive_url' do
     it 'fails if the url is more than 2048 characters' do
-      long_string = ''.dup
+      long_string = +''
       2049.times { long_string << 'a' }
 
       expect(subject).to receive(:query_params_string).and_return long_string

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: google_distance_matrix
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Thorbjørn Hermansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,19 +27,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: google_business_api_url_signer
   requirement: !ruby/object:Gem::Requirement
@@ -79,75 +79,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 0.59.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 0.59.2
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.2
 description: Ruby client for The Google Distance Matrix API
 email:
 - thhermansen@gmail.com
@@ -221,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for The Google Distance Matrix API