portero 0.0.2 → 0.0.3

data/lib/portero/providers/foursquare.rb

@@ -7,8 +7,15 @@ module Portero
       requires_option :client_secret
 
       def search(conn, query, latitude, longitude, options = {})
-        results = conn.get("https://api.foursquare.com/v2/venues/search", {query: query, client_id: @provider_options[:client_id], client_secret: @provider_options[:client_secret], v: "20120709",
-          limit: options[:limit], radius: options[:radius], ll: [latitude, longitude].join(",")})
+        params = {}
+        params[:query] = query if query
+        params[:client_id] = @provider_options[:client_id]
+        params[:client_secret] = @provider_options[:client_secret]
+        params[:ll] = [latitude, longitude].join(",")
+        params[:v] = "20120709"
+        params[:limit] = options[:limit] || 50
+        params[:radius] = options[:radius] || 10000
+        results = conn.get("https://api.foursquare.com/v2/venues/search", params)
         parse_results(results)
       end
 
@@ -27,8 +34,8 @@ module Portero
           venue.state = found_venue["location"]["state"]
           venue.postal_code = found_venue["location"]["postalCode"]
           venue.country = found_venue["location"]["country"]
-          venue.category = found_venue["categories"].first["name"]
-          venue.icon = found_venue["categories"].first["icon"]["prefix"] + "64" + found_venue["categories"].first["icon"]["suffix"]
+          venue.category = found_venue["categories"].first["name"] if found_venue["categories"].first
+          venue.icon = found_venue["categories"].first["icon"]["prefix"] + "64" + found_venue["categories"].first["icon"]["suffix"] if found_venue["categories"].first
           venue.extra = {categories: found_venue["categories"], url: found_venue["url"]}
 
           results << venue

data/lib/portero/providers/google_places.rb

@@ -7,8 +7,15 @@ module Portero
       requires_option :key
 
       def search(conn, query, latitude, longitude, options = {})
-        results = conn.get("https://maps.googleapis.com/maps/api/place/textsearch/json", {query: query, key: @provider_options[:key],
-        radius: options[:radius], location: [latitude, longitude].join(","), sensor: false})
+        params = {}
+        params[:query] = query if query
+        params[:key] = @provider_options[:key]
+        params[:radius] = options[:radius] || 10000
+        params[:location] = [latitude, longitude].join(",")
+        params[:sensor] = false
+
+        url = query.present? ? "https://maps.googleapis.com/maps/api/place/textsearch/json" : "https://maps.googleapis.com/maps/api/place/search/json"
+        results = conn.get(url, params)
         parse_results(results)
       end
 
@@ -20,7 +27,7 @@ module Portero
           venue = Portero::SearchResult.new
           venue.id = found_venue["id"]
           venue.name = found_venue["name"]
-          venue.address = found_venue["formatted_address"]
+          venue.address = found_venue["formatted_address"] || found_venue["vicinity"]
           venue.latitude = found_venue["geometry"]["location"]["lat"]
           venue.longitude = found_venue["geometry"]["location"]["lng"]
           venue.city = ""

data/lib/portero/search_provider.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/object/blank'
 
 module Portero
   module SearchProvider

data/lib/portero/version.rb

@@ -1,3 +1,3 @@
 module Portero
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end