google_places_autocomplete 0.0.1 → 0.0.2

data/lib/google_places_autocomplete/client.rb

@@ -12,8 +12,34 @@ module GooglePlacesAutocomplete
     end
     
     def autocomplete(options={})
-      query = options.merge(self.default_options)
-      mashup(self.class.get("/json", :query => query))
+      sensor = options.delete(:sensor) || false
+      types  = options.delete(:types)
+      input  = options.delete(:input)
+      offset = options.delete(:offset) || nil
+      radius = options.delete(:radius) || nil
+      lat = options.delete(:lat) || nil
+      lng = options.delete(:lng) || nil
+      location = [lat,lng].join(',') if lat && lng
+      sw_bounds = [options[:sw_bounds].delete(:lat),options[:sw_bounds].delete(:lng)].join(',') if options[:sw_bounds] && options[:sw_bounds][:lat] && options[:sw_bounds][:lng]
+      ne_bounds = [options[:ne_bounds].delete(:lat),options[:ne_bounds].delete(:lng)].join(',') if options[:ne_bounds] && options[:ne_bounds][:lat] && options[:ne_bounds][:lng]
+      bounds = [sw_bounds,ne_bounds].join('|') if sw_bounds && ne_bounds
+      
+      options = {
+        :location => location,
+        :radius => radius,
+        :sensor => sensor,
+        :input => input,
+        :offset => offset,
+        :bounds => bounds
+      }
+      
+      if types
+        types = (types.is_a?(Array) ? types.join('|') : types)
+        options.merge!(:types => types)
+      end
+      
+      options = options.delete_if {|key, value| value.nil?}
+      mashup(self.class.get("/json", :query => options.merge(self.default_options)))
     end
     
     protected

data/lib/google_places_autocomplete/version.rb

@@ -1,3 +1,3 @@
 module GooglePlacesAutocomplete
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/google_places_autocomplete/client_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe GooglePlacesAutocomplete::Client do
-  use_vcr_cassette 'autocomplete'
   
   it 'should not initialize without an api_key' do
     lambda { GooglePlacesAutocomplete::Client.new }.should raise_error
@@ -11,11 +10,28 @@ describe GooglePlacesAutocomplete::Client do
     @client = GooglePlacesAutocomplete::Client.new(:api_key => "foobar")
     @client.api_key.should == "foobar"
   end
+  
+  context "request an autocomplete" do
+    use_vcr_cassette 'autocomplete'
 
-  it 'should request autocomplete' do    
-    @client = GooglePlacesAutocomplete::Client.new(:api_key => "foobar")
-    @autocomplete = @client.autocomplete(:input => "Paris", :types => "geocode")
-    @autocomplete.predictions.size.should == 5
-    @autocomplete.predictions.first.description.should == 'Paris, France'
+    it 'should request autocomplete' do    
+      @client = GooglePlacesAutocomplete::Client.new(:api_key => "foobar")
+      @autocomplete = @client.autocomplete(:input => "Paris", :types => "geocode")
+      @autocomplete.predictions.size.should == 5
+      @autocomplete.predictions.first.description.should == 'Paris, France'
+    end
+  end
+  
+  context "request an autocomplete with bounds" do
+    use_vcr_cassette 'with_bounds'
+
+    it 'should request autocomplete with bounds parameter' do    
+      @client = GooglePlacesAutocomplete::Client.new(:api_key => "AIzaSyA8TtA11BlJ1XWlMisoboZvjk24xHgHwX0")
+      @autocomplete = @client.autocomplete(:input => "Peter Luger", :types => "establishment", 
+                                           :sw_bounds => {:lat => 40.606654, :lng => -74.036865}, 
+                                           :ne_bounds => {:lat => 40.744655, :lng => -73.831558})
+      
+      @autocomplete.predictions.size.should == 0
+    end
   end
 end

data/spec/vcr_cassettes/autocomplete.yml

@@ -12,16 +12,16 @@
     headers: 
       content-type: 
       - application/json; charset=UTF-8
-      date: 
-      - Thu, 02 Jun 2011 08:17:49 GMT
-      server: 
-      - mafe
       x-xss-protection: 
       - 1; mode=block
-      vary: 
-      - Accept-Language
+      server: 
+      - mafe
+      date: 
+      - Thu, 02 Jun 2011 08:17:49 GMT
       cache-control: 
       - private
+      vary: 
+      - Accept-Language
     body: |
       {
          "predictions" : [
@@ -156,33 +156,3 @@
       }
 
     http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
-    uri: https://maps.googleapis.com:443/maps/api/place/autocomplete/json?types=geocode&input=Paris&sensor=false&key=foobar
-    body: 
-    headers: 
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
-      code: 200
-      message: OK
-    headers: 
-      content-type: 
-      - application/json; charset=UTF-8
-      x-xss-protection: 
-      - 1; mode=block
-      server: 
-      - mafe
-      date: 
-      - Fri, 03 Jun 2011 01:41:55 GMT
-      cache-control: 
-      - private
-      vary: 
-      - Accept-Language
-    body: |
-      {
-         "predictions" : [],
-         "status" : "REQUEST_DENIED"
-      }
-
-    http_version: "1.1"

data/spec/vcr_cassettes/with_bounds.yml

@@ -0,0 +1,65 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://maps.googleapis.com:443/maps/api/place/autocomplete/json?bounds=40.606654%2C-74.036865%7C40.744655%2C-73.831558&input=Peter%20Luger&location=%2C&sensor=false&types=establishment&key=AIzaSyA8TtA11BlJ1XWlMisoboZvjk24xHgHwX0
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      expires: 
+      - Mon, 06 Jun 2011 02:44:11 GMT
+      content-type: 
+      - application/json; charset=UTF-8
+      date: 
+      - Mon, 06 Jun 2011 02:39:11 GMT
+      server: 
+      - mafe
+      x-xss-protection: 
+      - 1; mode=block
+      cache-control: 
+      - public, max-age=300
+      vary: 
+      - Accept-Language
+    body: |
+      {
+         "predictions" : [],
+         "status" : "ZERO_RESULTS"
+      }
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://maps.googleapis.com:443/maps/api/place/autocomplete/json?bounds=40.606654%2C-74.036865%7C40.744655%2C-73.831558&input=Peter%20Luger&sensor=false&types=establishment&key=AIzaSyA8TtA11BlJ1XWlMisoboZvjk24xHgHwX0
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      expires: 
+      - Mon, 06 Jun 2011 02:57:39 GMT
+      content-type: 
+      - application/json; charset=UTF-8
+      x-xss-protection: 
+      - 1; mode=block
+      server: 
+      - mafe
+      date: 
+      - Mon, 06 Jun 2011 02:52:39 GMT
+      vary: 
+      - Accept-Language
+      cache-control: 
+      - public, max-age=300
+    body: |
+      {
+         "predictions" : [],
+         "status" : "ZERO_RESULTS"
+      }
+
+    http_version: "1.1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_places_autocomplete
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Johnny Khai Nguyen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -05:00
+date: 2011-06-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - spec/google_places_autocomplete/client_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/autocomplete.yml
+- spec/vcr_cassettes/with_bounds.yml
 - spec/vcr_setup.rb
 has_rdoc: true
 homepage: http://github.com/phuphighter/google_places_autocomplete
@@ -147,4 +148,5 @@ test_files:
 - spec/google_places_autocomplete/client_spec.rb
 - spec/spec_helper.rb
 - spec/vcr_cassettes/autocomplete.yml
+- spec/vcr_cassettes/with_bounds.yml
 - spec/vcr_setup.rb