google_places 0.0.8 → 0.1.0

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    google_places (0.0.5)
+    google_places (0.0.8)
       httparty
 
 GEM
   remote: http://rubygems.org/
   specs:
-    crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    httparty (0.7.7)
-      crack (= 0.1.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    vcr (1.9.0)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    vcr (2.2.2)
 
 PLATFORMS
   ruby

data/google_places.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "google_places"
-  s.version     = '0.0.8'
+  s.version     = '0.1.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Marcel de Graaf"]
   s.email       = ["mail@marceldegraaf.net"]

data/lib/google_places/client.rb

@@ -15,5 +15,9 @@ module GooglePlaces
     def spot(reference, options = {})
       Spot.find(reference, @api_key, @options.merge(options))
     end
+
+    def spots_by_query(query, options = {})
+      Spot.list_by_query(query, @api_key, @options.merge(options))
+    end
   end
 end

data/lib/google_places/request.rb

@@ -7,19 +7,23 @@ module GooglePlaces
 
     SPOTS_LIST_URL = 'https://maps.googleapis.com/maps/api/place/search/json'
     SPOT_URL = 'https://maps.googleapis.com/maps/api/place/details/json'
+    SPOTS_LIST_QUERY_URL = 'https://maps.googleapis.com/maps/api/place/textsearch/json'
 
     def self.spots(options = {})
-      # pp options
       request = new(SPOTS_LIST_URL, options)
       request.parsed_response
     end
 
     def self.spot(options = {})
-      # pp options
       request = new(SPOT_URL, options)
       request.parsed_response
     end
 
+    def self.spots_by_query(options = {})
+      request = new(SPOTS_LIST_QUERY_URL, options)
+      request.parsed_response
+    end
+
     def initialize(url, options)
       retry_options = options.delete(:retry_options) || {}
 

data/lib/google_places/spot.rb

@@ -54,6 +54,53 @@ module GooglePlaces
       self.new(response['result'])
     end
 
+    def self.list_by_query(query, api_key, options)
+      if options.has_key?(:lat) && options.has_key?(:lng)
+        with_location = true
+      else
+        with_location = false
+      end
+
+      if options.has_key?(:radius)
+        with_radius = true
+      else
+        with_radius = false
+      end
+
+      query = query
+      sensor = options.delete(:sensor) || false
+      location = Location.new(options.delete(:lat), options.delete(:lng)) if with_location
+      radius = options.delete(:radius) if with_radius
+      language = options.delete(:language)
+      types = options.delete(:types)
+      exclude = options.delete(:exclude) || []
+      retry_options = options.delete(:retry_options) || {}
+
+      exclude = [exclude] unless exclude.is_a?(Array)
+
+      options = {
+        :query => query,
+        :sensor => sensor,
+        :key => api_key,
+        :language => language,
+        :retry_options => retry_options
+      }
+
+      options[:location] = location.format if with_location
+      options[:radius] = radius if with_radius
+
+      # Accept Types as a string or array
+      if types
+        types = (types.is_a?(Array) ? types.join('|') : types)
+        options.merge!(:types => types)
+      end
+
+      response = Request.spots_by_query(options)
+      response['results'].map do |result|
+        self.new(result) if (result['types'] & exclude) == []
+      end.compact
+    end
+
     def initialize(json_result_object)
       @reference                  = json_result_object['reference']
       @vicinity                   = json_result_object['vicinity']
@@ -84,7 +131,7 @@ module GooglePlaces
         component.first[address_component_length] unless component.first.nil?
       end
     end
-    
+
     def address_components_of_type(type)
       @address_components.select{ |c| c['types'].include?(type.to_s) } unless @address_components.nil?
     end

data/spec/google_places/client_spec.rb

@@ -27,4 +27,11 @@ describe GooglePlaces::Client do
     @client.spot(reference)
   end
 
+  it 'should request spots by query' do
+    query = "Statue of liberty, New York"
+    @client = GooglePlaces::Client.new(api_key)
+    GooglePlaces::Spot.should_receive(:list_by_query).with(query, api_key, {})
+
+    @client.spots_by_query(query)
+  end
 end

data/spec/google_places/request_spec.rb

@@ -4,14 +4,14 @@ describe GooglePlaces::Request do
 
   before :each do
     @location = GooglePlaces::Location.new('-33.8670522', '151.1957362').format
+    @query = "Statue of liberty, New York"
     @radius = 200
     @sensor = false
-    @reference = "CoQBeAAAAO-prCRp9Atcj_rvavsLyv-DnxbGkw8QyRZb6Srm6QHOcww6lqFhIs2c7Ie6fMg3PZ4PhicfJL7ZWlaHaLDTqmRisoTQQUn61WTcSXAAiCOzcm0JDBnafqrskSpFtNUgzGAOx29WGnWSP44jmjtioIsJN9ik8yjK7UxP4buAmMPVEhBXPiCfHXk1CQ6XRuQhpztsGhQU4U6-tWjTHcLSVzjbNxoiuihbaA"
+    @reference = "CnRsAAAASc4grenwL0h3X5VPNp5fkDNfqbjt3iQtWIPlKS-3ms9GbnCxR_FLHO0B0ZKCgJSg19qymkeHagjQFB4aUL87yhp4mhFTc17DopK1oiYDaeGthztSjERic8TmFNe-6zOpKSdiZWKE6xlQvcbSiWIJchIQOEYZqunSSZqNDoBSs77bWRoUJcMMVANtSlhy0llKI0MI6VcC7DU"
   end
 
   context 'Listing spots' do
     use_vcr_cassette 'list_spots'
-
     context 'with valid options' do
       it 'should retrieve a list of spots' do
         response = GooglePlaces::Request.spots(
@@ -20,11 +20,9 @@ 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 {
@@ -36,7 +34,6 @@ describe GooglePlaces::Request do
         }.should raise_error GooglePlaces::RequestDeniedError
       end
     end
-
     context 'without location' do
       context 'without retry options' do
         it do
@@ -49,7 +46,6 @@ describe GooglePlaces::Request do
           }.should raise_error GooglePlaces::InvalidRequestError
         end
       end
-
       context 'with retry options' do
         context 'without timeout' do
           it do
@@ -67,7 +63,6 @@ describe GooglePlaces::Request do
             }.should raise_error GooglePlaces::RetryError
           end
         end
-
         context 'with timeout' do
           it do
             lambda {
@@ -89,9 +84,84 @@ describe GooglePlaces::Request do
     end
   end
 
+
+  context 'Listing spots by query' do
+    use_vcr_cassette 'list_spots'
+
+    context 'with valid options' do
+      it 'should retrieve a list of spots' do
+        response = GooglePlaces::Request.spots_by_query(
+          :query => @query,
+          :sensor => @sensor,
+          :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
+      end
+    end
+
+    context 'without query' do
+      context 'without retry options' do
+        it do
+          lambda {
+            GooglePlaces::Request.spots_by_query(
+              :sensor => @sensor,
+              :key => api_key
+            )
+          }.should raise_error GooglePlaces::InvalidRequestError
+        end
+      end
+
+      context 'with retry options' do
+        context 'without timeout' do
+          it do
+            lambda {
+              GooglePlaces::Request.spots_by_query(
+                :sensor => @sensor,
+                :key => api_key,
+                :retry_options => {
+                  :max => 3,
+                  :status => 'INVALID_REQUEST',
+                  :delay => 1
+                }
+              )
+            }.should raise_error GooglePlaces::RetryError
+          end
+        end
+
+        context 'with timeout' do
+          it do
+            lambda {
+              GooglePlaces::Request.spots_by_query(
+                :sensor => @sensor,
+                :key => api_key,
+                :retry_options => {
+                  :max => 3,
+                  :status => 'INVALID_REQUEST',
+                  :delay => 10,
+                  :timeout => 1
+                }
+              )
+            }.should raise_error GooglePlaces::RetryTimeoutError
+          end
+        end
+      end
+    end
+  end
+
   context 'Spot details' do
     use_vcr_cassette 'single_spot'
-
     context 'with valid options' do
       it 'should retrieve a single spot' do
         response = GooglePlaces::Request.spot(
@@ -99,11 +169,9 @@ describe GooglePlaces::Request do
           :sensor => @sensor,
           :key => api_key
         )
-
         response['result'].should_not be_empty
       end
     end
-
     context 'with missing sensor' do
       it do
         lambda {
@@ -114,7 +182,6 @@ describe GooglePlaces::Request do
         }.should raise_error GooglePlaces::RequestDeniedError
       end
     end
-
     context 'with missing reference' do
       context 'without retry options' do
         it do
@@ -126,7 +193,6 @@ describe GooglePlaces::Request do
           }.should raise_error GooglePlaces::InvalidRequestError
         end
       end
-
       context 'with retry options' do
         context 'without timeout' do
           it do
@@ -143,7 +209,6 @@ describe GooglePlaces::Request do
             }.should raise_error GooglePlaces::RetryError
           end
         end
-
         context 'with timeout' do
           it do
             lambda {

data/spec/google_places/spot_spec.rb

@@ -7,7 +7,7 @@ describe GooglePlaces::Spot do
     @lng = '151.1957362'
     @radius = 200
     @sensor = false
-    @reference = "CoQBeAAAAO-prCRp9Atcj_rvavsLyv-DnxbGkw8QyRZb6Srm6QHOcww6lqFhIs2c7Ie6fMg3PZ4PhicfJL7ZWlaHaLDTqmRisoTQQUn61WTcSXAAiCOzcm0JDBnafqrskSpFtNUgzGAOx29WGnWSP44jmjtioIsJN9ik8yjK7UxP4buAmMPVEhBXPiCfHXk1CQ6XRuQhpztsGhQU4U6-tWjTHcLSVzjbNxoiuihbaA"
+    @reference = "CnRsAAAASc4grenwL0h3X5VPNp5fkDNfqbjt3iQtWIPlKS-3ms9GbnCxR_FLHO0B0ZKCgJSg19qymkeHagjQFB4aUL87yhp4mhFTc17DopK1oiYDaeGthztSjERic8TmFNe-6zOpKSdiZWKE6xlQvcbSiWIJchIQOEYZqunSSZqNDoBSs77bWRoUJcMMVANtSlhy0llKI0MI6VcC7DU"
   end
 
   context 'List spots' do
@@ -116,17 +116,30 @@ describe GooglePlaces::Spot do
 
   end
 
+
+
+
+  context 'List spots by query' do
+    use_vcr_cassette 'list_spots'
+
+    after(:each) do
+      @collection.map(&:class).uniq.should == [GooglePlaces::Spot]
+    end
+
+    it 'should be a collection of Spots' do
+      @collection = GooglePlaces::Spot.list_by_query("Statue of liberty, New York", api_key, :sensor => @sensor)
+    end
+
+  end
+
   context 'Find a single spot' do
     use_vcr_cassette 'single_spot'
-
     before :each do
       @spot = GooglePlaces::Spot.find(@reference, api_key, :sensor => @sensor)
     end
-
     it 'should be a Spot' do
       @spot.class.should == GooglePlaces::Spot
     end
-
     %w(reference vicinity lat lng name icon types id formatted_phone_number international_phone_number formatted_address address_components street_number street city region postal_code country rating url types website).each do |attribute|
       it "should have the attribute: #{attribute}" do
         @spot.respond_to?(attribute).should == true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_places
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Marcel de Graaf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper around the Google Places API.