google_distance_matrix 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059c0da78b14d17f1c6a11d5de3e535b77d652c9
-  data.tar.gz: 07a291b59c5099c25906fee538f2fd6d7d4685ed
+  metadata.gz: 889a735e923a64e646fdd8d62f8b95e9cac813de
+  data.tar.gz: aac05a54e40741a24969c3cd7ebc07e24531a535
 SHA512:
-  metadata.gz: a0e06fe9215299611134f0fe052484ca84a5c394fba93e142238de1fd07884db3a76ca0f9c2defdd4780fe96de332a852d9db3d5d21c8328f8b19f48b38c5136
-  data.tar.gz: 4408a0c269ee247801ab790724f96617a8a75f83c27e58f8ebc9ae6f34c21920a6e3d4c23831ff8c769496f13068fdca1daba8ff2687676411697a14341ef2af
+  metadata.gz: dae22319ffd3a4c144527985d729c1dfcd87432d830d7c9efa8434d8210285507f7890257a6ace2f26349dbb5f64523abee6599cec44bbd7b476e52b6e60502b
+  data.tar.gz: f5d5950aa52c3527be20fe315de87a3f0e10a636d9e0c31d563a9f4d367dbeafab61a19426e477864fc5e4213609443c45ba4e96fb434ca2713cd16bc1d34f91

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/.travis.yml

@@ -1,14 +1,10 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.1.2
   - 2.1.5
+  - 2.2.3
   - ruby-head
-  - jruby-19mode
-  - jruby
-  - jruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-head
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.0.2.0
+* Dropped support for Ruby 1.9.X
+* Added new configuration options: google_api_key,
+  transit, transit_mode, arrival_time and departure_time. (by lsanwick)
+
+
 ## v.0.1.3
 * Be optimistic in regards to ActiveSupport and ActiveModel version we support.
 

data/README.md

@@ -41,13 +41,13 @@ but to solve it you may look at http://ai4r.org/.
     another_point = Point.new lat: 1, lng: 3
     matrix.origins << another_point
 
-### Do some configuration - see GoogleDistanceMatrix.default_configuration as well.
+### Do some configuration - see GoogleDistanceMatrix.configure_defaults as well.
 
     matrix.configure do |config|
       config.mode = 'driving'
       config.avoid = ['tolls']
 
-      # To build signed URLs to use with a Google Business account
+      # To build signed URLs to use with a Google Business account. You may also use google_api_key.
       config.google_business_api_client_id = "123"
       config.google_business_api_private_key = "your-secret-key"
     end
@@ -100,7 +100,7 @@ Or install it yourself as:
 
 ## Configuration
 
-    Configuration is done directly on a matrix or via GoogleDistanceMatrix.default_configuration.
+    Configuration is done directly on a matrix or via GoogleDistanceMatrix.configure_defaults.
     Apart from configuration on requests it is also possible to provide your own logger class and
     set a cache.
 
@@ -109,7 +109,7 @@ Or install it yourself as:
     Given Google's limit to the service you may have the need to cache requests. This is done by simply
     using URL as cache keys. Cache we'll accept should provide a default ActiveSupport::Cache::Store interface.
 
-    GoogleDistanceMatrix.default_configuration do |config|
+    GoogleDistanceMatrix.configure_defaults do |config|
         config.cache = ActiveSupport::Cache.lookup_store :your_store, {
             expires_in: 12.hours
             # ..or other options you like for your store

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.1.0"
-  spec.add_development_dependency "shoulda-matchers", "~> 2.6.2"
-  spec.add_development_dependency "webmock", "~> 1.18.0"
+  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 "rake"
 end

data/lib/google_distance_matrix/configuration.rb

@@ -9,7 +9,7 @@ module GoogleDistanceMatrix
   class Configuration
     include ActiveModel::Validations
 
-    ATTRIBUTES = %w[sensor mode avoid units language]
+    ATTRIBUTES = %w[sensor mode avoid units language departure_time arrival_time transit_mode]
 
     API_DEFAULTS = {
       mode: "driving",
@@ -17,15 +17,20 @@ module GoogleDistanceMatrix
     }.with_indifferent_access
 
     attr_accessor *ATTRIBUTES, :protocol, :logger, :lat_lng_scale
-    attr_accessor :google_business_api_client_id, :google_business_api_private_key
+    attr_accessor :google_business_api_client_id, :google_business_api_private_key, :google_api_key
     attr_accessor :cache
 
 
     validates :sensor, inclusion: {in: [true, false]}
-    validates :mode, inclusion: {in: ["driving", "walking", "bicycling"]}, allow_blank: true
+    validates :mode, inclusion: {in: ["driving", "walking", "bicycling", "transit"]}, allow_blank: true
     validates :avoid, inclusion: {in: ["tolls", "highways"]}, 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 :protocol, inclusion: {in: ["http", "https"]}, allow_blank: true
 
 
@@ -59,6 +64,10 @@ module GoogleDistanceMatrix
         out << ['client', google_business_api_client_id]
       end
 
+      if google_api_key.present?
+        out << ['key', google_api_key]
+      end
+
       out
     end
 

data/lib/google_distance_matrix/url_builder.rb

@@ -39,6 +39,10 @@ module GoogleDistanceMatrix
       configuration.google_business_api_private_key.present?
     end
 
+    def include_api_key?
+      configuration.google_api_key.present?
+    end
+
     def get_params_string
       params.to_a.map { |key_value| key_value.join("=") }.join("&")
     end

data/lib/google_distance_matrix/version.rb

@@ -1,3 +1,3 @@
 module GoogleDistanceMatrix
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/lib/google_distance_matrix/configuration_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe GoogleDistanceMatrix::Configuration do
+  include Shoulda::Matchers::ActiveModel
+
   subject { described_class.new }
 
   describe "Validations" do
@@ -24,16 +26,48 @@ describe GoogleDistanceMatrix::Configuration do
       end
     end
 
-    it { should ensure_inclusion_of(:mode).in_array(["driving", "walking", "bicycling"]) }
+    describe 'departure_time' do
+      it 'is valid with a timestamp' do
+        subject.departure_time = Time.now.to_i
+        subject.valid?
+        expect(subject.errors[:departure_time].length).to eq 0
+      end
+
+      it 'is invalid with something else' do
+        subject.departure_time = 'foo'
+        subject.valid?
+        expect(subject.errors[:departure_time].length).to eq 1
+      end
+    end
+
+    describe 'arrival_time' do
+      it 'is valid with a timestamp' do
+        subject.arrival_time = Time.now.to_i
+        subject.valid?
+        expect(subject.errors[:arrival_time].length).to eq 0
+      end
+
+      it 'is invalid with something else' do
+        subject.arrival_time = 'foo'
+        subject.valid?
+        expect(subject.errors[:arrival_time].length).to eq 1
+      end
+    end
+
+    it { should validate_inclusion_of(:mode).in_array(["driving", "walking", "bicycling", "transit"]) }
+
     it { should allow_value(nil).for(:mode) }
 
-    it { should ensure_inclusion_of(:avoid).in_array(["tolls", "highways"]) }
+    it { should validate_inclusion_of(:avoid).in_array(["tolls", "highways"]) }
     it { should allow_value(nil).for(:avoid) }
 
-    it { should ensure_inclusion_of(:units).in_array(["metric", "imperial"]) }
+    it { should validate_inclusion_of(:units).in_array(["metric", "imperial"]) }
     it { should allow_value(nil).for(:units) }
 
-    it { should ensure_inclusion_of(:protocol).in_array(["http", "https"]) }
+
+    it { should validate_inclusion_of(:protocol).in_array(["http", "https"]) }
+
+    it { should validate_inclusion_of(:transit_mode).in_array(["bus", "subway", "train", "tram", "rail"])}
   end
 
 
@@ -46,8 +80,13 @@ describe GoogleDistanceMatrix::Configuration do
     it { expect(subject.protocol).to eq 'http' }
     it { expect(subject.language).to be_nil }
 
+    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.google_business_api_client_id).to be_nil }
     it { expect(subject.google_business_api_private_key).to be_nil }
+    it { expect(subject.google_api_key).to be_nil }
 
     it { expect(subject.logger).to be_nil }
     it { expect(subject.cache).to be_nil }
@@ -79,5 +118,10 @@ describe GoogleDistanceMatrix::Configuration do
       subject.google_business_api_client_id = "123"
       expect(subject.to_param['client']).to eq "123"
     end
+
+    it "includes key if google_api_key has been set" do
+      subject.google_api_key = "12345"
+      expect(subject.to_param['key']).to eq("12345")
+    end
   end
 end

data/spec/lib/google_distance_matrix/url_builder_spec.rb

@@ -84,6 +84,18 @@ describe GoogleDistanceMatrix::UrlBuilder do
         expect(subject.url).to include "sensor=#{matrix.configuration.sensor}"
       end
 
+      context 'with google api key set' do
+        before do
+          matrix.configure do |config|
+            config.google_api_key = '12345'
+          end
+        end
+
+        it 'includes the api key' do
+          expect(subject.url).to include "key=#{matrix.configuration.google_api_key}"
+        end
+      end
+
       context "with google business client id and private key set" do
         before do
           matrix.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_distance_matrix
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Thorbjørn Hermansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rbenv-version"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for The Google Distance Matrix API

data/.rbenv-version

@@ -1 +0,0 @@
-2.1.5