google_distance_matrix 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bafa7129b5e8795d2843bf132729e31ac07079e
-  data.tar.gz: ee670023245891199fe478f084b58b1e984ae7b4
+  metadata.gz: 90be905a03cf4356641158bddfc9d73e8dbcd30a
+  data.tar.gz: aa34d8e0ef5d84c3041105c6e07e5a05e8fbf30a
 SHA512:
-  metadata.gz: b407618b92520edcc3a84199f5ab27e9db91598fb8c6e51b851379e6b4fb82f4d2fabe783eed065f4ba3a51ccc3a81abd4b99759546ae77e82ec49efccf954f8
-  data.tar.gz: cffa738e7f599684a5107755d0945924c229dedc320daa14b5cc71f70079409f572fdff199ed04f43a12889ff603df860e9ee04340cf649a058c08fec42d7647
+  metadata.gz: 99df75867c1dee0fc7c2fea2d9d1811cb236d2a9acbfbddce2e4ad0bff73a62a28ae9fadfcc8eec8b18b0cdf3739cf0047f0876178d0ddcc211020c4e822fa66
+  data.tar.gz: a27b71536a839707da8e62bb1d58e76c0cb8f255698f62e084938c002adb7eda0d81a5bee3dec8af74fc9903ace9e674640cc6ca23735d03bae60c9346363c54

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 2.1.5
   - 2.2.3
   - 2.3.0
+  - 2.3.1
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v.0.3.0 (unreleased)
+This release includes one breaking change, the removal of sensor parameter.
+This parameter is no longer used - see:
+https://developers.google.com/maps/documentation/distance-matrix/intro#Sensor
+
+* Remove sensor attribute. (by rpocklin)
+* Added "transit_routing_preference" and "traffic_model" attributes to request. (by rpocklin)
+* Added "ferries", "indoor" as valid avoid value. (by rpocklin)
+
 ## v.0.2.1
 * Made https be default (by almnes)
 

data/README.md

@@ -50,7 +50,7 @@ matrix.origins << another_point
 ```ruby
 matrix.configure do |config|
   config.mode = 'driving'
-  config.avoid = ['tolls']
+  config.avoid = 'tolls'
 
   # To build signed URLs to use with a Google Business account.
   config.google_business_api_client_id = "123"

data/google_distance_matrix.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "google_business_api_url_signer", "~> 0.1.3"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec", "~> 3.3.0"
-  spec.add_development_dependency "shoulda-matchers", "~> 3.0.0"
-  spec.add_development_dependency "webmock", "~> 1.21.0"
+  spec.add_development_dependency "rspec", "~> 3.4.0"
+  spec.add_development_dependency "shoulda-matchers", "~> 3.1.1"
+  spec.add_development_dependency "webmock", "~> 2.0.2"
   spec.add_development_dependency "rake"
 end

data/lib/google_distance_matrix/configuration.rb

@@ -3,17 +3,23 @@ module GoogleDistanceMatrix
   #
   # Holds configuration used when building API URL.
   #
-  # See https://developers.google.com/maps/documentation/distancematrix/#RequestParameters
+  # See https://developers.google.com/maps/documentation/distance-matrix/intro
   # for documentation on each configuration.
   #
   class Configuration
     include ActiveModel::Validations
 
-    ATTRIBUTES = %w[sensor mode avoid units language departure_time arrival_time transit_mode]
+    ATTRIBUTES = %w[
+      mode avoid units language
+      departure_time arrival_time
+      transit_mode transit_routing_preference
+      traffic_model
+    ]
 
     API_DEFAULTS = {
       mode: "driving",
-      units: "metric"
+      units: "metric",
+      traffic_model: "best_guess"
     }.with_indifferent_access
 
     attr_accessor *ATTRIBUTES, :protocol, :logger, :lat_lng_scale
@@ -21,21 +27,20 @@ module GoogleDistanceMatrix
     attr_accessor :cache
 
 
-    validates :sensor, inclusion: {in: [true, false]}
     validates :mode, inclusion: {in: ["driving", "walking", "bicycling", "transit"]}, allow_blank: true
-    validates :avoid, inclusion: {in: ["tolls", "highways"]}, allow_blank: true
+    validates :avoid, inclusion: {in: ["tolls", "highways", "ferries", "indoor"]}, allow_blank: true
     validates :units, inclusion: {in: ["metric", "imperial"]}, allow_blank: true
 
     validates :departure_time, numericality: true, allow_blank: true
     validates :arrival_time, numericality: true, allow_blank: true
 
     validates :transit_mode, inclusion: {in: %w[bus subway train tram rail]}, allow_blank: true
+    validates :transit_routing_preference, inclusion: {in: %w[less_walking fewer_transfers]}, allow_blank: true
+    validates :traffic_model, inclusion: {in: %w[best_guess pessimistic optimistic]}, allow_blank: true
 
     validates :protocol, inclusion: {in: ["http", "https"]}, allow_blank: true
 
-
     def initialize
-      self.sensor = false
       self.protocol = "https"
       self.lat_lng_scale = 5
 

data/lib/google_distance_matrix/version.rb

@@ -1,3 +1,3 @@
 module GoogleDistanceMatrix
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/lib/google_distance_matrix/configuration_spec.rb

@@ -6,26 +6,6 @@ describe GoogleDistanceMatrix::Configuration do
   subject { described_class.new }
 
   describe "Validations" do
-    describe "sensor" do
-      it "is valid with true" do
-        subject.sensor = true
-        subject.valid?
-        expect(subject.errors[:sensor].length).to eq 0
-      end
-
-      it "is valid with false" do
-        subject.sensor = false
-        subject.valid?
-        expect(subject.errors[:sensor].length).to eq 0
-      end
-
-      it "is invalid with 'foo'" do
-        subject.sensor = 'foo'
-        subject.valid?
-        expect(subject.errors[:sensor].length).to eq 1
-      end
-    end
-
     describe 'departure_time' do
       it 'is valid with a timestamp' do
         subject.departure_time = Time.now.to_i
@@ -55,10 +35,9 @@ describe GoogleDistanceMatrix::Configuration do
     end
 
     it { should validate_inclusion_of(:mode).in_array(["driving", "walking", "bicycling", "transit"]) }
-
     it { should allow_value(nil).for(:mode) }
 
-    it { should validate_inclusion_of(:avoid).in_array(["tolls", "highways"]) }
+    it { should validate_inclusion_of(:avoid).in_array(["tolls", "highways", "ferries", "indoor"]) }
     it { should allow_value(nil).for(:avoid) }
 
     it { should validate_inclusion_of(:units).in_array(["metric", "imperial"]) }
@@ -68,11 +47,12 @@ describe GoogleDistanceMatrix::Configuration do
     it { should validate_inclusion_of(:protocol).in_array(["http", "https"]) }
 
     it { should validate_inclusion_of(:transit_mode).in_array(["bus", "subway", "train", "tram", "rail"])}
+    it { should validate_inclusion_of(:transit_routing_preference).in_array(["less_walking",  "fewer_transfers"])}
+    it { should validate_inclusion_of(:traffic_model).in_array(["best_guess", "pessimistic", "optimistic"])}
   end
 
 
   describe "defaults" do
-    it { expect(subject.sensor).to eq false }
     it { expect(subject.mode).to eq "driving" }
     it { expect(subject.avoid).to be_nil }
     it { expect(subject.units).to eq "metric" }
@@ -83,6 +63,7 @@ describe GoogleDistanceMatrix::Configuration do
     it { expect(subject.departure_time).to be_nil }
     it { expect(subject.arrival_time).to be_nil }
     it { expect(subject.transit_mode).to be_nil }
+    it { expect(subject.traffic_model).to eq 'best_guess' }
 
     it { expect(subject.google_business_api_client_id).to be_nil }
     it { expect(subject.google_business_api_private_key).to be_nil }

data/spec/lib/google_distance_matrix/matrix_spec.rb

@@ -44,14 +44,14 @@ describe GoogleDistanceMatrix::Matrix do
 
     it "has it's own configuration" do
       expect {
-        subject.configure { |c| c.sensor = !GoogleDistanceMatrix.default_configuration.sensor }
-      }.to_not change(GoogleDistanceMatrix.default_configuration, :sensor)
+        subject.configure { |c| c.mode = !GoogleDistanceMatrix.default_configuration.mode }
+      }.to_not change(GoogleDistanceMatrix.default_configuration, :mode)
     end
 
     it "has a configurable configuration :-)" do
       expect {
-        subject.configure { |c| c.sensor = !GoogleDistanceMatrix.default_configuration.sensor }
-      }.to change(subject.configuration, :sensor).to !GoogleDistanceMatrix.default_configuration.sensor
+        subject.configure { |c| c.mode = !GoogleDistanceMatrix.default_configuration.mode }
+      }.to change(subject.configuration, :mode).to !GoogleDistanceMatrix.default_configuration.mode
     end
   end
 

data/spec/lib/google_distance_matrix/url_builder_spec.rb

@@ -35,7 +35,7 @@ describe GoogleDistanceMatrix::UrlBuilder do
 
     it "fails if matrix's configuration is invalid" do
       expect {
-        matrix.configure { |c| c.sensor = nil }
+        matrix.configure { |c| c.mode = 'foobar' }
         described_class.new matrix
       }.to raise_error GoogleDistanceMatrix::InvalidMatrix
     end
@@ -80,10 +80,6 @@ describe GoogleDistanceMatrix::UrlBuilder do
     end
 
     describe "configuration" do
-      it "includes sensor" do
-        expect(subject.url).to include "sensor=#{matrix.configuration.sensor}"
-      end
-
       context 'with google api key set' do
         before do
           matrix.configure do |config|
@@ -109,7 +105,7 @@ describe GoogleDistanceMatrix::UrlBuilder do
         end
 
         it "has signature" do
-          expect(subject.url).to include "signature=R6dKSHc7EZ7uzmpXKngJCX9i2_E="
+          expect(subject.url).to include "signature=DIUgkQ_BaVBJU6hwhzH3GLeMdeo="
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_distance_matrix
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Thorbjørn Hermansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for The Google Distance Matrix API