google_places 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41a85a299216122859d7a3ef70ccf3c7105b52bd
-  data.tar.gz: eea158376f2fe0b4910b62e18d5dae17237c7c57
+  metadata.gz: a36355b632140bf6ebad9a1f19d6fb067dd956d8
+  data.tar.gz: 9fe83b73519827f1770d121672a3b21a5ef82bdf
 SHA512:
-  metadata.gz: fdfc4cc85b037103d4e3520c6a2274f27bb7c6aea3a8c0235aae1f27b03e13f374cce7dd10744bbb0638a036489c9e65ba5b6e4be9968de66bcf39a8fcbc5be1
-  data.tar.gz: 843be3c2a89f26ce292f34aa4eaf9efae5f3f860a042b941e9c6369fe389baeac796468295c2811f3c0f4202a135604dfba421c7529764a5dd991a231dcab9dd
+  metadata.gz: 256fa11719e1c5523d839b9e6e9ce817721f4b84b415a30c100d0fad9daaa0356be20d75ccbc266981bf704d45065c4fc90a9e76360e89a02c9f7a042d56c5f3
+  data.tar.gz: efeb854f9aca0e29775d8e85c9ed1a22f9b7dc6e2ea719a2d9388ed09753012a4406b44c28ffcf72c583269d6b5ab24f3c9d76baa195ad4be23fe876bdc4b32f

data/Gemfile.lock

@@ -1,34 +1,44 @@
 PATH
   remote: .
   specs:
-    google_places (0.20.0)
-      httparty
+    google_places (0.22.0)
+      httparty (~> 0.13.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    fakeweb (1.3.0)
-    httparty (0.12.0)
+    addressable (2.3.6)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.1)
     multi_xml (0.5.5)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    vcr (2.2.5)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    safe_yaml (1.0.3)
+    vcr (2.9.2)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeweb
   google_places!
-  rspec
-  vcr
+  rspec (~> 3.0.0)
+  vcr (~> 2.9.2)
+  webmock (~> 1.18.0)

data/google_places.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "google_places"
-  s.version     = '0.21.0'
+  s.name        = 'google_places'
+  s.version     = '0.22.0'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Marcel de Graaf"]
-  s.email       = ["mail@marceldegraaf.net"]
-  s.homepage    = "https://github.com/marceldegraaf/google_places"
+  s.authors     = ['Marcel de Graaf']
+  s.email       = ['mail@marceldegraaf.net']
+  s.homepage    = 'https://github.com/marceldegraaf/google_places'
   s.summary     = %q{A Ruby wrapper around the Google Places API.}
   s.description = %q{This gem provides a Ruby wrapper around the Google Places API for use in your own project. Please note that this gem does not provide OAuth authentication.}
   s.license     = 'MIT'
@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
   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.require_paths = ['lib']
 
-  s.add_dependency 'httparty'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fakeweb'
-  s.add_development_dependency 'vcr'
+  s.add_dependency 'httparty',            '~> 0.13.1'
+  s.add_development_dependency 'rspec',   '~> 3.0.0'
+  s.add_development_dependency 'webmock', '~> 1.18.0'
+  s.add_development_dependency 'vcr',     '~> 2.9.2'
 end

data/lib/google_places/spot.rb

@@ -2,7 +2,7 @@ require 'google_places/review'
 
 module GooglePlaces
   class Spot
-    attr_accessor :lat, :lng, :name, :icon, :reference, :vicinity, :types, :id, :formatted_phone_number, :international_phone_number, :formatted_address, :address_components, :street_number, :street, :city, :region, :postal_code, :country, :rating, :url, :cid, :website, :reviews, :aspects, :zagat_selected, :zagat_reviewed, :photos, :review_summary, :nextpagetoken, :price_level, :opening_hours, :events, :utc_offset
+    attr_accessor :lat, :lng, :name, :icon, :reference, :vicinity, :types, :id, :formatted_phone_number, :international_phone_number, :formatted_address, :address_components, :street_number, :street, :city, :region, :postal_code, :country, :rating, :url, :cid, :website, :reviews, :aspects, :zagat_selected, :zagat_reviewed, :photos, :review_summary, :nextpagetoken, :price_level, :opening_hours, :events, :utc_offset, :place_id
 
     # Search for Spots at the provided location
     #
@@ -27,7 +27,7 @@ module GooglePlaces
     #     the number of check-ins from your application, global popularity, and other factors.
     #   - distance. This option sorts results in ascending order by their distance from the specified location.
     #     Ranking results by distance will set a fixed search radius of 50km.
-    #     One or more of keyword, name, or types is required.                                                                                                                                                                                                                                                                                       distance. This option sorts results in ascending order by their distance from the specified location. Ranking results by distance will set a fixed search radius of 50km. One or more of keyword, name, or types is required.
+    #     One or more of keyword, name, or types is required.
     # @option options [String,Array] :types
     #   Restricts the results to Spots matching at least one of the specified types
     # @option options [String] :name
@@ -363,6 +363,7 @@ module GooglePlaces
     # @return [Spot] a newly created spot
     def initialize(json_result_object, api_key, sensor)
       @reference                  = json_result_object['reference']
+      @place_id                   = json_result_object['place_id']
       @vicinity                   = json_result_object['vicinity']
       @lat                        = json_result_object['geometry']['location']['lat']
       @lng                        = json_result_object['geometry']['location']['lng']

data/spec/google_places/client_spec.rb

@@ -4,39 +4,39 @@ describe GooglePlaces::Client do
 
   it 'should initialize with an api_key' do
     @client = GooglePlaces::Client.new(api_key)
-    @client.api_key.should == api_key
+    expect(@client.api_key).to eq(api_key)
   end
 
   it 'should request spots' do
     lat, lng = '-33.8670522', '151.1957362'
     @client = GooglePlaces::Client.new(api_key)
-    GooglePlaces::Spot.should_receive(:list).with(lat, lng, api_key, false, {})
+    expect(GooglePlaces::Spot).to receive(:list).with(lat, lng, api_key, false, {})
 
     @client.spots(lat, lng)
   end
 
   it 'should request a single spot' do
-    reference = "CoQBeAAAAO-prCRp9Atcj_rvavsLyv-DnxbGkw8QyRZb6Srm6QHOcww6lqFhIs2c7Ie6fMg3PZ4PhicfJL7ZWlaHaLDTqmRisoTQQUn61WTcSXAAiCOzcm0JDBnafqrskSpFtNUgzGAOx29WGnWSP44jmjtioIsJN9ik8yjK7UxP4buAmMPVEhBXPiCfHXk1CQ6XRuQhpztsGhQU4U6-tWjTHcLSVzjbNxoiuihbaA"
+    reference = 'CoQBeAAAAO-prCRp9Atcj_rvavsLyv-DnxbGkw8QyRZb6Srm6QHOcww6lqFhIs2c7Ie6fMg3PZ4PhicfJL7ZWlaHaLDTqmRisoTQQUn61WTcSXAAiCOzcm0JDBnafqrskSpFtNUgzGAOx29WGnWSP44jmjtioIsJN9ik8yjK7UxP4buAmMPVEhBXPiCfHXk1CQ6XRuQhpztsGhQU4U6-tWjTHcLSVzjbNxoiuihbaA'
     @client = GooglePlaces::Client.new(api_key)
-    GooglePlaces::Spot.should_receive(:find).with(reference, api_key, false, {})
+    expect(GooglePlaces::Spot).to receive(:find).with(reference, api_key, false, {})
 
     @client.spot(reference)
   end
 
   it 'should request spots by query' do
-    query = "Statue of liberty, New York"
+    query = 'Statue of liberty, New York'
     @client = GooglePlaces::Client.new(api_key)
-    GooglePlaces::Spot.should_receive(:list_by_query).with(query, api_key, false, {})
+    expect(GooglePlaces::Spot).to receive(:list_by_query).with(query, api_key, false, {})
 
     @client.spots_by_query(query)
   end
 
   it 'should request spots by radar' do
-    keywords = "landmarks"
+    keywords = 'landmarks'
     lat, lng = '51.511627', '-0.183778'
     radius = 5000
     @client = GooglePlaces::Client.new(api_key)
-    GooglePlaces::Spot.should_receive(:list_by_radar).with(lat, lng, api_key, false, {:radius=> radius, :keyword =>  keywords})
+    expect(GooglePlaces::Spot).to receive(:list_by_radar).with(lat, lng, api_key, false, {:radius=> radius, :keyword =>  keywords})
 
     @client.spots_by_radar(lat, lng, :radius => radius, :keyword =>  keywords)
   end

data/spec/google_places/location_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GooglePlaces::Location do
 
   it 'should return a location based on a lat and lng' do
-    GooglePlaces::Location.new('123', '456').format.should == '123.00000000,456.00000000'
+    expect(GooglePlaces::Location.new('123', '456').format).to eq('123.00000000,456.00000000')
   end
 
 end

data/spec/google_places/photo_spec.rb

@@ -8,22 +8,21 @@ describe GooglePlaces::Photo do
     @photo_reference = "CnRtAAAACQQXR83Jc3Pffxt1Zx7QbCe6AfY2negSNzkk2IeSf0q5nxHgartLzkr1fltSlkEDSS-EZqswWAW2eQDbiOl12J-V4Rmn_JNko9e9gSnMwxHBdmScu_84NMSe-0RwB9BM6AEqE8sENXQ8cpWaiEsC_RIQLzIJxpRdoqSPrPtrjTrOhxoUWb8uwObkV4duXfKIiNB20gfnu88"
   end
 
-  context 'Photo' do
-    use_vcr_cassette 'photo'
+  context 'Photo', vcr: { cassette_name: 'photo'} do
     before :each do
       @photo = GooglePlaces::Photo.new(400, 400, @photo_reference, [], api_key, @sensor)
     end
     it 'should be a Photo' do
-      @photo.class.should == GooglePlaces::Photo
+      expect(@photo.class).to eq(GooglePlaces::Photo)
     end
     %w(width height photo_reference html_attributions).each do |attribute|
       it "should have the attribute: #{attribute}" do
-        @photo.respond_to?(attribute).should == true
+        expect(@photo.respond_to?(attribute)).to eq(true)
       end
     end
     it 'should return a url when fetched' do
       url = @photo.fetch_url(@max_width)
-      url.should_not be_empty
+      expect(url).to_not be_empty
     end
   end
 end

data/spec/google_places/request_spec.rb

@@ -4,16 +4,15 @@ describe GooglePlaces::Request do
 
   before :each do
     @location = GooglePlaces::Location.new('-33.8670522', '151.1957362').format
-    @query = "Statue of liberty, New York"
+    @query = 'Statue of liberty, New York'
     @radius = 200
     @sensor = false
-    @reference = "CnRsAAAASc4grenwL0h3X5VPNp5fkDNfqbjt3iQtWIPlKS-3ms9GbnCxR_FLHO0B0ZKCgJSg19qymkeHagjQFB4aUL87yhp4mhFTc17DopK1oiYDaeGthztSjERic8TmFNe-6zOpKSdiZWKE6xlQvcbSiWIJchIQOEYZqunSSZqNDoBSs77bWRoUJcMMVANtSlhy0llKI0MI6VcC7DU"
-    @reference_not_found = "CnRpAAAAlO2WvF_4eOqp02TAWKsXpPSCFz8KxBjraWhB4MSvdUPqXN0yCpxQgblam1LeRENcWZF-9-2CEfUwlHUli61PaYe0e7dUPAU302tk6KkalnKqx7nv07iFA1Ca_Y1WoCLH9adEWwkxKMITlbGhUUz9-hIQPxQ4Bp_dz5nHloUFkj3rkBoUDSPqy2smqMnPEo4ayfbDupeKEZY"
-    @keyword = "attractions"
+    @reference = 'CnRsAAAASc4grenwL0h3X5VPNp5fkDNfqbjt3iQtWIPlKS-3ms9GbnCxR_FLHO0B0ZKCgJSg19qymkeHagjQFB4aUL87yhp4mhFTc17DopK1oiYDaeGthztSjERic8TmFNe-6zOpKSdiZWKE6xlQvcbSiWIJchIQOEYZqunSSZqNDoBSs77bWRoUJcMMVANtSlhy0llKI0MI6VcC7DU'
+    @reference_not_found = 'CnRpAAAAlO2WvF_4eOqp02TAWKsXpPSCFz8KxBjraWhB4MSvdUPqXN0yCpxQgblam1LeRENcWZF-9-2CEfUwlHUli61PaYe0e7dUPAU302tk6KkalnKqx7nv07iFA1Ca_Y1WoCLH9adEWwkxKMITlbGhUUz9-hIQPxQ4Bp_dz5nHloUFkj3rkBoUDSPqy2smqMnPEo4ayfbDupeKEZY'
+    @keyword = 'attractions'
   end
 
-  context 'Listing spots' do
-    use_vcr_cassette 'list_spots'
+  context 'Listing spots', vcr: { cassette_name: 'list_spots' } do
     context 'with valid options' do
       it 'should retrieve a list of spots' do
         response = GooglePlaces::Request.spots(
@@ -22,36 +21,25 @@ describe GooglePlaces::Request do
           :sensor => @sensor,
           :key => api_key
         )
-        response['results'].should_not be_empty
-      end
-    end
-    context 'with missing sensor' do
-      it do
-        lambda {
-          GooglePlaces::Request.spots(
-            :location => @location,
-            :radius => @radius,
-            :key => api_key
-          )
-        }.should raise_error GooglePlaces::RequestDeniedError
+        expect(response['results']).to_not be_empty
       end
     end
     context 'without location' do
       context 'without retry options' do
         it do
-          lambda {
+          expect(lambda {
             GooglePlaces::Request.spots(
               :radius => @radius,
               :sensor => @sensor,
               :key => api_key
             )
-          }.should raise_error GooglePlaces::InvalidRequestError
+          }).to raise_error GooglePlaces::InvalidRequestError
         end
       end
       context 'with retry options' do
         context 'without timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots(
                 :radius => @radius,
                 :sensor => @sensor,
@@ -62,12 +50,12 @@ describe GooglePlaces::Request do
                   :delay => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryError
+            }).to raise_error GooglePlaces::RetryError
           end
         end
         context 'with timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots(
                 :radius => @radius,
                 :sensor => @sensor,
@@ -79,7 +67,7 @@ describe GooglePlaces::Request do
                   :timeout => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryTimeoutError
+            }).to raise_error GooglePlaces::RetryTimeoutError
           end
         end
       end
@@ -87,8 +75,7 @@ describe GooglePlaces::Request do
   end
 
 
-  context 'Listing spots by query' do
-    use_vcr_cassette 'list_spots'
+  context 'Listing spots by query', vcr: { cassette_name: 'list_spots' } do
 
     context 'with valid options' do
       it 'should retrieve a list of spots' do
@@ -98,37 +85,26 @@ describe GooglePlaces::Request do
           :key => api_key
         )
 
-        response['results'].should_not be_empty
-      end
-    end
-
-    context 'with missing sensor' do
-      it do
-        lambda {
-          GooglePlaces::Request.spots_by_query(
-            :query => @query,
-            :key => api_key
-          )
-        }.should raise_error GooglePlaces::RequestDeniedError
+        expect(response['results']).to_not be_empty
       end
     end
 
     context 'without query' do
       context 'without retry options' do
         it do
-          lambda {
+          expect(lambda {
             GooglePlaces::Request.spots_by_query(
               :sensor => @sensor,
               :key => api_key
             )
-          }.should raise_error GooglePlaces::InvalidRequestError
+          }).to raise_error GooglePlaces::InvalidRequestError
         end
       end
 
       context 'with retry options' do
         context 'without timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots_by_query(
                 :sensor => @sensor,
                 :key => api_key,
@@ -138,13 +114,13 @@ describe GooglePlaces::Request do
                   :delay => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryError
+            }).to raise_error GooglePlaces::RetryError
           end
         end
 
         context 'with timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots_by_query(
                 :sensor => @sensor,
                 :key => api_key,
@@ -155,15 +131,14 @@ describe GooglePlaces::Request do
                   :timeout => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryTimeoutError
+            }).to raise_error GooglePlaces::RetryTimeoutError
           end
         end
       end
     end
   end
 
-  context 'Spot details' do
-    use_vcr_cassette 'single_spot'
+  context 'Spot details', vcr: { cassette_name: 'single_spot' } do
     context 'with valid options' do
       it 'should retrieve a single spot' do
         response = GooglePlaces::Request.spot(
@@ -171,45 +146,35 @@ describe GooglePlaces::Request do
           :sensor => @sensor,
           :key => api_key
         )
-        response['result'].should_not be_empty
+        expect(response['result']).to_not be_empty
       end
       context 'with reference not found' do
-        it 'should raise not found error' do
-          lambda {
+        it 'to raise not found error' do
+          expect(lambda {
             GooglePlaces::Request.spot(
               :reference => @reference_not_found,
               :sensor => @sensor,
               :key => api_key
             )
-          }.should raise_error GooglePlaces::NotFoundError
+          }).to raise_error GooglePlaces::NotFoundError
         end
       end
     end
-    context 'with missing sensor' do
-      it do
-        lambda {
-          GooglePlaces::Request.spot(
-            :reference => @reference,
-            :key => api_key
-          )
-        }.should raise_error GooglePlaces::RequestDeniedError
-      end
-    end
     context 'with missing reference' do
       context 'without retry options' do
         it do
-          lambda {
+          expect(lambda {
             GooglePlaces::Request.spot(
               :sensor => @sensor,
               :key => api_key
             )
-          }.should raise_error GooglePlaces::InvalidRequestError
+          }).to raise_error GooglePlaces::InvalidRequestError
         end
       end
       context 'with retry options' do
         context 'without timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spot(
                 :sensor => @sensor,
                 :key => api_key,
@@ -219,12 +184,12 @@ describe GooglePlaces::Request do
                   :delay => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryError
+            }).to raise_error GooglePlaces::RetryError
           end
         end
         context 'with timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spot(
                 :sensor => @sensor,
                 :key => api_key,
@@ -235,7 +200,7 @@ describe GooglePlaces::Request do
                   :timeout => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryTimeoutError
+            }).to raise_error GooglePlaces::RetryTimeoutError
           end
         end
       end
@@ -244,8 +209,7 @@ describe GooglePlaces::Request do
 
 
 
-  context 'Listing spots by radar' do
-    use_vcr_cassette 'list_spots_by_radar'
+  context 'Listing spots by radar', vcr: { cassette_name: 'list_spots_by_radar' } do
 
     context 'with valid options' do
       context 'with keyword' do
@@ -257,7 +221,7 @@ describe GooglePlaces::Request do
             :sensor => @sensor,
             :key => api_key
           ) 
-          response['results'].should_not be_empty
+          expect(response['results']).to_not be_empty
         end
       end
       
@@ -270,42 +234,29 @@ describe GooglePlaces::Request do
             :sensor => @sensor,
             :key => api_key
           )
-          response['results'].should_not be_empty
+          expect(response['results']).to_not be_empty
         end
       end
     end
 
-    context 'with missing sensor' do
-      it do
-        lambda {
-          GooglePlaces::Request.spots_by_radar(
-            :location => @location,
-            :keyword => @keyword,
-            :radius => @radius,
-            :key => api_key
-          )
-        }.should raise_error GooglePlaces::RequestDeniedError
-      end
-    end
-
    context 'without keyword' do
       context 'without retry options' do
         it do
-          lambda {
+          expect(lambda {
             GooglePlaces::Request.spots_by_radar(
               :location => @location,
               :radius => @radius,
               :sensor => @sensor,
               :key => api_key
             )
-          }.should raise_error GooglePlaces::InvalidRequestError
+          }).to raise_error GooglePlaces::InvalidRequestError
         end
       end
 
       context 'with retry options' do
         context 'without timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots_by_radar(
                 :location => @location,
                 :radius => @radius,
@@ -317,13 +268,13 @@ describe GooglePlaces::Request do
                   :delay => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryError
+            }).to raise_error GooglePlaces::RetryError
           end
         end
 
         context 'with timeout' do
           it do
-            lambda {
+            expect(lambda {
               GooglePlaces::Request.spots_by_radar(
                 :location => @location,
                 :radius => @radius,
@@ -336,7 +287,7 @@ describe GooglePlaces::Request do
                   :timeout => 1
                 }
               )
-            }.should raise_error GooglePlaces::RetryTimeoutError
+            }).to raise_error GooglePlaces::RetryTimeoutError
           end
         end
       end