google_distance_matrix 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: daba322586706a934e7a0c37a6ff05e104b4668d
+  data.tar.gz: f243fbebe95c8fe0eb41cfeb225eccccdf193115
+SHA512:
+  metadata.gz: b835fef4ef30276e69619511771e76807c07e7d8ee4b365e06ac8cd3581df8e23d08cfa5133c848359e3da911c80b791daac98d465cb27b828a9b685c14488c7
+  data.tar.gz: ce2a4b6ac843540aa1add4741a43d3b97cdbd94aa0a01d840d3c4e20c12b7b82d1b1fb24574e0af66e12cff95f253cd10c063dcbf7dea8d287338e39949c0d63

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p194
+2.1.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.0.1.0
+* Allowed for ActiveSupport and ActiveModel 4.1.
+* Removed Route#distance_value and Route#duration_value. Use distance_in_meters and duration_in_seconds.
+* Add language parameter to matrix configuration (by Iuri Fernandes)
+
+
 ## v.0.0.3
 * Bumped version of google_business_api_url_signer to get Ruby 2 support.
 

data/google_distance_matrix.gemspec

@@ -18,13 +18,13 @@ 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"
-  spec.add_dependency "activemodel", "~> 3.2.13"
-  spec.add_dependency "google_business_api_url_signer", "~> 0.0.2"
+  spec.add_dependency "activesupport", [">= 3.2.13", "<= 4.1"]
+  spec.add_dependency "activemodel", [">= 3.2.13", "<= 4.1"]
+  spec.add_dependency "google_business_api_url_signer", "~> 0.1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec", "~> 2.13"
-  spec.add_development_dependency "shoulda-matchers", "~> 2.0.0"
-  spec.add_development_dependency "webmock", "~> 1.11"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
+  spec.add_development_dependency "shoulda-matchers", "~> 2.6.2"
+  spec.add_development_dependency "webmock", "~> 1.18.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]
+    ATTRIBUTES = %w[sensor mode avoid units language]
 
     API_DEFAULTS = {
       mode: "driving",

data/lib/google_distance_matrix/route.rb

@@ -33,12 +33,7 @@ module GoogleDistanceMatrix
       end
     end
 
-    {distance_value: :distance_in_meters, duration_value: :duration_in_seconds}.each_pair do |old_attr, new_attr|
-      define_method old_attr do
-        ActiveSupport::Deprecation.warn "#{old_attr} is being replaced by #{new_attr}. Please use #{new_attr}."
-        public_send new_attr
-      end
-    end
+
 
     def inspect
       inspection = ATTRIBUTES.reject { |a| public_send(a).blank? }.map { |a| "#{a}: #{public_send(a).inspect}" }.join ', '

data/lib/google_distance_matrix/version.rb

@@ -1,3 +1,3 @@
 module GoogleDistanceMatrix
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/lib/google_distance_matrix/client_cache_spec.rb

@@ -4,20 +4,20 @@ describe GoogleDistanceMatrix::ClientCache do
   let(:url) { "http://www.example.com" }
   let(:options) { {hello: :options} }
 
-  let(:client) { mock get: "data" }
-  let(:cache) { mock }
+  let(:client) { double get: "data" }
+  let(:cache) { double }
 
   subject { described_class.new client, cache }
 
   describe "#get" do
     it "returns from cache if it hits" do
-      cache.should_receive(:fetch).with(url).and_return "cached-data"
+      expect(cache).to receive(:fetch).with(url).and_return "cached-data"
       expect(subject.get(url, options)).to eq "cached-data"
     end
 
     it "asks client when cache miss" do
-      client.should_receive(:get).with(url, options).and_return "api-data"
-      cache.should_receive(:fetch) { |&block| block.call }
+      expect(client).to receive(:get).with(url, options).and_return "api-data"
+      expect(cache).to receive(:fetch) { |&block| block.call }
 
       expect(subject.get(url, options)).to eq "api-data"
     end

data/spec/lib/google_distance_matrix/configuration_spec.rb

@@ -4,7 +4,25 @@ describe GoogleDistanceMatrix::Configuration do
   subject { described_class.new }
 
   describe "Validations" do
-    it { should ensure_inclusion_of(:sensor).in_array([true, false]) }
+    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
 
     it { should ensure_inclusion_of(:mode).in_array(["driving", "walking", "bicycling"]) }
     it { should allow_value(nil).for(:mode) }
@@ -20,18 +38,19 @@ describe GoogleDistanceMatrix::Configuration do
 
 
   describe "defaults" do
-    its(:sensor) { should be_false }
-    its(:mode) { should eq "driving" }
-    its(:avoid) { should be_nil }
-    its(:units) { should eq "metric" }
-    its(:lat_lng_scale) { should eq 5 }
-    its(:protocol) { should eq "http" }
-
-    its(:google_business_api_client_id) { should be_nil }
-    its(:google_business_api_private_key) { should be_nil }
-
-    its(:logger) { should be_nil }
-    its(:cache) { should be_nil }
+    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" }
+    it { expect(subject.lat_lng_scale).to eq 5 }
+    it { expect(subject.protocol).to eq 'http' }
+    it { expect(subject.language).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.logger).to be_nil }
+    it { expect(subject.cache).to be_nil }
   end
 
 

data/spec/lib/google_distance_matrix/logger_spec.rb

@@ -12,24 +12,24 @@ describe GoogleDistanceMatrix::Logger do
   end
 
   context "with a logger backend" do
-    let(:backend) { mock }
+    let(:backend) { double }
 
     subject { described_class.new backend }
 
     described_class::LEVELS.each do |level|
       describe level do
         it "sends log message to the backend" do
-          backend.should_receive(level).with("[google_distance_matrix] log msg")
+          expect(backend).to receive(level).with("[google_distance_matrix] log msg")
           subject.public_send level, "log msg"
         end
 
         it "supports sending in a tag" do
-          backend.should_receive(level).with("[google_distance_matrix] [client] log msg")
+          expect(backend).to receive(level).with("[google_distance_matrix] [client] log msg")
           subject.public_send level, "log msg", tag: :client
         end
 
         it "supports sending in multiple tags" do
-          backend.should_receive(level).with("[google_distance_matrix] [client] [request] log msg")
+          expect(backend).to receive(level).with("[google_distance_matrix] [client] [request] log msg")
           subject.public_send level, "log msg", tag: ['client', 'request']
         end
       end

data/spec/lib/google_distance_matrix/matrix_spec.rb

@@ -35,9 +35,9 @@ describe GoogleDistanceMatrix::Matrix do
 
   describe "#configuration" do
     it "is by default set from default_configuration" do
-      config = mock
-      config.stub(:dup).and_return config
-      GoogleDistanceMatrix.should_receive(:default_configuration).and_return config
+      config = double
+      allow(config).to receive(:dup).and_return config
+      expect(GoogleDistanceMatrix).to receive(:default_configuration).and_return config
 
       expect(described_class.new.configuration).to eq config
     end
@@ -83,12 +83,12 @@ describe GoogleDistanceMatrix::Matrix do
       shortest_route_by_distance_to!
     ].each do |method|
     it "delegates #{method} to routes_finder" do
-      finder = mock
-      result = mock
+      finder = double
+      result = double
 
-      subject.stub(:routes_finder).and_return finder
+      allow(subject).to receive(:routes_finder).and_return finder
 
-      finder.should_receive(method).and_return result
+      expect(finder).to receive(method).and_return result
       expect(subject.public_send(method)).to eq result
     end
   end
@@ -106,7 +106,7 @@ describe GoogleDistanceMatrix::Matrix do
         subject.reset!
         subject.data
 
-        stub.should have_been_requested.twice
+        expect(stub).to have_been_requested.twice
       end
     end
 
@@ -123,7 +123,7 @@ describe GoogleDistanceMatrix::Matrix do
         subject.reset!
         subject.data
 
-        stub.should have_been_requested.once
+        expect(stub).to have_been_requested.once
       end
 
       it "clears the cache key on reload" do
@@ -132,7 +132,7 @@ describe GoogleDistanceMatrix::Matrix do
         subject.reload
         subject.data
 
-        stub.should have_been_requested.twice
+        expect(stub).to have_been_requested.twice
       end
     end
   end
@@ -143,12 +143,12 @@ describe GoogleDistanceMatrix::Matrix do
 
       it "loads from Google's API" do
         subject.data
-        api_request_stub.should have_been_requested
+        expect(api_request_stub).to have_been_requested
       end
 
       it "does not load twice" do
         2.times { subject.data }
-        api_request_stub.should have_been_requested
+        expect(api_request_stub).to have_been_requested
       end
 
       it "contains one row" do
@@ -182,7 +182,7 @@ describe GoogleDistanceMatrix::Matrix do
 
       it "loads from Google's API" do
         subject.data
-        api_request_stub.should have_been_requested
+        expect(api_request_stub).to have_been_requested
       end
 
       it "as loaded route with errors correctly" do
@@ -196,7 +196,7 @@ describe GoogleDistanceMatrix::Matrix do
 
   describe "#reload" do
     before do
-      subject.stub(:load_matrix).and_return { ['loaded'] }
+      allow(subject).to receive(:load_matrix) { ['loaded'] }
       subject.data.clear
     end
 

data/spec/lib/google_distance_matrix/place_spec.rb

@@ -18,7 +18,7 @@ describe GoogleDistanceMatrix::Place do
     end
 
     it "builds with an object responding to lat and lng" do
-      point = mock lat: 1, lng: 2
+      point = double lat: 1, lng: 2
       place = described_class.new(point)
 
       expect(place.lat).to eq point.lat
@@ -27,20 +27,20 @@ describe GoogleDistanceMatrix::Place do
 
 
     it "keeps a record of the object it built itself from" do
-      point = mock lat: 1, lng: 2
+      point = double lat: 1, lng: 2
       place = described_class.new(point)
 
       expect(place.extracted_attributes_from).to eq point
     end
     it "builds with an object responding to address" do
-      object = mock address: address
+      object = double address: address
       place = described_class.new(object)
 
       expect(place.address).to eq object.address
     end
 
     it "builds with an object responding to lat, lng and address" do
-      object = mock lat: 1, lng:2, address: address
+      object = double lat: 1, lng:2, address: address
       place = described_class.new(object)
 
       expect(place.lat).to eq object.lat
@@ -63,13 +63,13 @@ describe GoogleDistanceMatrix::Place do
     context "with address" do
       subject { described_class.new address: address }
 
-      its(:to_param) { should eq address }
+      it { expect(subject.to_param).to eq address }
     end
 
     context "with lat lng" do
       subject { described_class.new lng: lng, lat: lat }
 
-      its(:to_param) { should eq "#{lat},#{lng}" }
+      it { expect(subject.to_param).to eq "#{lat},#{lng}" }
     end
   end
 

data/spec/lib/google_distance_matrix/places_spec.rb

@@ -39,8 +39,8 @@ describe GoogleDistanceMatrix::Places do
       it "wraps values in a Place" do
         subject.public_send attr, {address: "four"}
 
-        expect(subject.all? { |place| place.is_a? GoogleDistanceMatrix::Place }).to be_true
-        expect(subject.any? { |place| place.address == "four" }).to be_true
+        expect(subject.all? { |place| place.is_a? GoogleDistanceMatrix::Place }).to be true
+        expect(subject.any? { |place| place.address == "four" }).to be true
       end
     end
   end

data/spec/lib/google_distance_matrix/route_spec.rb

@@ -11,18 +11,11 @@ describe GoogleDistanceMatrix::Route do
 
   subject { described_class.new attributes }
 
-  its(:status) { should eq "ok" }
-  its(:distance_in_meters) { should eq 2032 }
-  its(:distance_text) { should eq "2.0 km" }
-  its(:duration_in_seconds) { should eq 367 }
-  its(:duration_text) { should eq "6 mins" }
+  it { expect(subject.status).to eq "ok" }
+  it { expect(subject.distance_in_meters).to eq 2032 }
+  it { expect(subject.distance_text).to eq "2.0 km" }
+  it { expect(subject.duration_in_seconds).to eq 367 }
+  it { expect(subject.duration_text).to eq "6 mins" }
 
-  describe "deprecations" do
-    around { |example| ActiveSupport::Deprecation.silence { example.run } }
-
-    its(:duration_value) { should eq 367 }
-    its(:distance_value) { should eq 2032 }
-  end
-
-  it { should be_ok }
+  it { is_expected.to be_ok }
 end

data/spec/lib/google_distance_matrix/routes_finder_spec.rb

@@ -6,7 +6,7 @@ describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
 
   let(:destination_1) { GoogleDistanceMatrix::Place.new address: "Drammensveien 1, Oslo" }
 
-  let(:destination_2_built_from) { mock address: "Skjellestadhagen, Heggedal" }
+  let(:destination_2_built_from) { double address: "Skjellestadhagen, Heggedal" }
   let(:destination_2) { GoogleDistanceMatrix::Place.new destination_2_built_from }
 
   let(:url_builder) { GoogleDistanceMatrix::UrlBuilder.new matrix }
@@ -79,7 +79,7 @@ describe GoogleDistanceMatrix::RoutesFinder, :request_recordings do
       end
 
       it "fails with argument error if sent in object is neither place nor something it was built from" do
-        expect { subject.route_for origin: origin_1, destination: mock }.to raise_error ArgumentError
+        expect { subject.route_for origin: origin_1, destination: double }.to raise_error ArgumentError
       end
     end
 

data/spec/lib/google_distance_matrix/url_builder_spec.rb

@@ -47,7 +47,7 @@ describe GoogleDistanceMatrix::UrlBuilder do
       long_string = ""
       2049.times { long_string << "a" }
 
-      subject.stub(:get_params_string).and_return long_string
+      allow(subject).to receive(:get_params_string).and_return long_string
 
       expect { subject.url }.to raise_error GoogleDistanceMatrix::MatrixUrlTooLong
     end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'webmock/rspec'
 require 'shoulda-matchers'
 
 WebMock.disable_net_connect!
+I18n.enforce_available_locales = false
 
 module RecordedRequestHelpers
   def recorded_request_for(name)
@@ -19,6 +20,5 @@ module RecordedRequestHelpers
 end
 
 RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
   c.include RecordedRequestHelpers, :request_recordings
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_distance_matrix
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Thorbjørn Hermansen
@@ -12,133 +11,129 @@ cert_chain: []
 date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    none: false
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: activemodel
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.2.13
-    none: false
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: google_business_api_url_signer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
-    none: false
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: bundler
+        version: '0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rspec
+        version: 3.0.0
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-    none: false
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: shoulda-matchers
+        version: 2.6.2
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    none: false
+        version: 2.6.2
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  name: webmock
+        version: 1.18.0
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    none: false
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rake
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Ruby client for The Google Distance Matrix API
 email:
 - thhermansen@gmail.com
@@ -146,9 +141,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rbenv-version
-- .travis.yml
+- ".gitignore"
+- ".rbenv-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -186,33 +181,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4095186925905366277
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 4095186925905366277
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client for The Google Distance Matrix API
 test_files:
 - spec/lib/google_distance_matrix/client_cache_spec.rb