woefoo 0.0.10 → 0.0.14

data/lib/woefoo/config.rb

@@ -6,6 +6,8 @@ module Woefoo
     attr :placefinder_result_count, true
     # the minimum input quality for a canonical town match
     attr :min_input_quality, true
+    # the minimum result quality for a canonical town match
+    attr :min_result_quality, true
   
     def placefinder_result_count
       (@placefinder_result_count &&  @placefinder_result_count > 0) ? @placefinder_result_count : 3
@@ -16,7 +18,7 @@ module Woefoo
     end
   
     def min_result_quality
-      (@min_result_quality && @min_result_quality > 0) ? @min_result_quality : 80
+      (@min_result_quality && @min_result_quality > 0) ? @min_result_quality : 40
     end
   end
 end

data/lib/woefoo/town_match_validators.rb

@@ -17,15 +17,19 @@ module Woefoo::TownMatchValidators
           response.results.each do |r|
             if r[:quality] >= response.input_quality && r[:quality] >= min_result_quality
               place=Woefoo::GeoplanetPlace.find_by_woeid(r[:woeid])
-              if place.place_type=="Town"
-                # If the query included a country code, make sure the place we're picking is in the same country!
-                next if (response.query_options.include?(:country_code) && 
-                  response.query_options[:country_code].downcase != place.country_code.downcase)
-                best_match=r[:woeid] 
-              elsif ["Zip", "Suburb"].include?(place.place_type) && place.town
-                next if (response.query_options.include?(:country_code) && 
-                  response.query_options[:country_code].downcase != place.country_code.downcase)
-                best_match=place.town.woeid
+              if place
+                if place.place_type=="Town"
+                  # If the query included a country code, make sure the place we're picking is in the same country!
+                  next if (response.query_options.include?(:country_code) && 
+                    response.query_options[:country_code].downcase != place.country_code.downcase)
+                  best_match=r[:woeid] 
+                elsif ["Zip", "Suburb"].include?(place.place_type) && place.town
+                  next if (response.query_options.include?(:country_code) && 
+                    response.query_options[:country_code].downcase != place.country_code.downcase)
+                  best_match=place.town.woeid
+                end
+              else
+                puts "Encountered a woeid without a geoplanet place #{r[:woeid]}"
               end
             end
             break if best_match

data/lib/woefoo/version.rb

@@ -1,3 +1,3 @@
 module Woefoo
-  VERSION = "0.0.10"
+  VERSION = "0.0.14"
 end

data/lib/woefoo.rb

@@ -17,19 +17,34 @@ module Woefoo
   
   def lookup_town_woeid(opts={})
     validate!(opts)
-    woeid=nil
+    results = {:woeid=>nil}
     # First try the parameterized query, if the user bothered to separate out the fields
     if opts.length > 1
-      response = perform_parameterized_lookup(opts)
-      woeid = canonical_town_match(response)
+      results[:parameterized_response] = perform_parameterized_lookup(opts)
+      results[:woeid] = canonical_town_match(results[:parameterized_response])
     end
     
-    if !woeid
-      response = perform_lookup(opts)
-      woeid = canonical_town_match(response)
+    if !results[:woeid]
+      results[:query_response] = perform_lookup(opts)
+      results[:woeid] = canonical_town_match(results[:query_response])
     end
     
-    woeid
+    results
+  end
+  
+  def lookup_town_woeid_by_geo(opts={})
+    results = {:woeid=>nil}
+    results[:geo_response] = perform_geo_lookup(opts)
+    results[:woeid] = canonical_town_match(results[:geo_response])
+    
+    results
+  end
+  
+  def validate!(opts)
+    raise "Woefoo.appid is not defined" if !@appid
+    if opts.length == 0 || opts.include?(:query) && (opts[:query] == "")
+      raise "Invalid query"
+    end
   end
 
   
@@ -43,12 +58,6 @@ module Woefoo
     end
   end
   
-  def validate!(opts)
-    raise "Woefoo.appid is not defined" if !@appid
-    if opts.length == 0 || opts.include?(:query) && (opts[:query] == "")
-      raise "Invalid query" 
-    end
-  end
   
   # Build a single query url
   def build_query_url(opts={})
@@ -70,12 +79,17 @@ module Woefoo
     build_query_keys(opts).each do |l|
       if opts.include?(l)
         val = ::CGI.escape(opts[l])
-        s << "&#{l.to_s}=#{val} "
+        s << "&#{l.to_s}=#{val}"
       end
     end
     "http://where.yahooapis.com/geocode?appid=#{@appid}&count=#{placefinder_result_count}#{s}"
   end
   
+  
+  def build_geo_url(opts={})
+    "http://where.yahooapis.com/geocode?appid=#{@appid}&count=#{placefinder_result_count}&gflags=R&q=#{opts[:lat]},+#{opts[:lng]}" 
+  end
+  
   def perform_lookup(opts)
     url = build_query_url(opts)
     tr = Typhoeus::Request.get(url)
@@ -88,6 +102,12 @@ module Woefoo
     Woefoo::Response.new(opts, tr) if tr
   end
   
+  def perform_geo_lookup(opts)
+    url = build_geo_url(opts)
+    tr = Typhoeus::Request.get(url)
+    Woefoo::Response.new(opts, tr) if tr
+  end
+  
   def build_query_keys(opts={})
     k = [:line1, :city, :state, :postal, :country]
     if opts.include?(:country)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: woefoo
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - smnirven
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 Z
+date: 2011-11-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: typhoeus