woefoo 0.0.14 → 1.0.0

data/Gemfile

@@ -1,9 +1,21 @@
 source "http://rubygems.org"
 
+gem "rake", "0.9.2.2"
+gem "nokogiri", "1.5.0"
+gem "geokit", "1.5.0"
+gem "typhoeus", "0.1.27"
+gem "json", "1.6.1", :require => "json/pure"
+gem "activerecord", "2.3.14"
+gem "ancestry", "1.2.4"
+
 # Specify your gem's dependencies in woefoo.gemspec
 gemspec
 
+group :development do
+  gem "mysql", "2.8.1"
+end
+
 group :test do
-  gem "mocha", "~> 0.9.7"
-  gem "shoulda"
-end
+  gem "mocha", "0.10.0"
+  gem "shoulda", "2.11.3"
+end

data/lib/woefoo.rb

@@ -1,17 +1,21 @@
-require 'cgi'
-require 'typhoeus'
-require 'active_record'
-require 'ancestry'
-require 'woefoo/config'
-require 'woefoo/town_match_validators'
-require 'woefoo/response'
-require 'woefoo/geoplanet_place'
-require 'woefoo/geoplanet_alias'
-require 'woefoo/geoplanet_adjacency'
+require "cgi"
+require "typhoeus"
+require "nokogiri"
+require "activerecord"
+require "ancestry"
 
 module Woefoo
+  
+  autoload :Config, "woefoo/config"
+  autoload :TownMatchValidators, "woefoo/town_match_validators"
+  autoload :Response, "woefoo/response"
+  autoload :GeoplanetPlace, "woefoo/geoplanet_place"
+  autoload :GeoplanetAlias, "woefoo/geoplanet_alias"
+  autoload :GeoplanetAdjacency, "woefoo/geoplanet_adjacency"
+  
   include Woefoo::Config
   include Woefoo::TownMatchValidators
+  
   extend self
   # Fires a placefinder request to yahoo, returns with suggested places that match the query
   
@@ -21,22 +25,20 @@ module Woefoo
     # First try the parameterized query, if the user bothered to separate out the fields
     if opts.length > 1
       results[:parameterized_response] = perform_parameterized_lookup(opts)
-      results[:woeid] = canonical_town_match(results[:parameterized_response])
+      results[:woeid] = canonical_town_match(results[:parameterized_response], opts)
     end
     
     if !results[:woeid]
       results[:query_response] = perform_lookup(opts)
-      results[:woeid] = canonical_town_match(results[:query_response])
+      results[:woeid] = canonical_town_match(results[:query_response], opts)
     end
-    
     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[:woeid] = canonical_town_match(results[:geo_response], opts)
     results
   end
   
@@ -50,15 +52,14 @@ module Woefoo
   
   # Takes a Woefoo Response, and figures out a Town-level or equivalent
   # woe id that identifies where the queried address is
-  def canonical_town_match(response)
+  def canonical_town_match(response, input_opts = {})
     default_validators.each do |v|
-      if v[:conditions].call(response)
-        return v[:validator].call(response)
+      if v[:conditions].call(response, input_opts)
+        return v[:validator].call(response, input_opts)
       end
     end
   end
   
-  
   # Build a single query url
   def build_query_url(opts={})
     s = ""
@@ -85,7 +86,6 @@ module Woefoo
     "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
@@ -111,11 +111,11 @@ module Woefoo
   def build_query_keys(opts={})
     k = [:line1, :city, :state, :postal, :country]
     if opts.include?(:country)
-      if opts[:country] != "US" && opts[:country] != "CA"
+      unless ["US", "CA", "GB", "UK"].include? opts[:country]
         k.delete(:state)
         k.delete(:postal)
       end
     end
     k
   end
-end
+end

data/lib/woefoo/config.rb

@@ -14,11 +14,11 @@ module Woefoo
     end
   
     def min_input_quality
-      (@min_input_quality && @min_input_quality > 0) ? @min_input_quality : 40
+      (@min_input_quality && @min_input_quality > 0) ? @min_input_quality : 39
     end
   
     def min_result_quality
-      (@min_result_quality && @min_result_quality > 0) ? @min_result_quality : 40
+      (@min_result_quality && @min_result_quality > 0) ? @min_result_quality : 39
     end
   end
 end

data/lib/woefoo/response.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 module Woefoo
   class Response
     attr_reader :query_options

data/lib/woefoo/town_match_validators.rb

@@ -1,22 +1,38 @@
 # A town match validator is a hash of two procs, the first proc is 
 # a procedure for conditions in which this validator should be used, 
 # and the second proc is the actual validator to run on the place results
-require 'geokit'
 
 module Woefoo::TownMatchValidators
+  
+  # is this needed?
   extend self
   
+  
+  # np1 = [51.591049,-2.988250]
+  # np2 = [52.016029,-4.833970]
+  # puts D.distance_between(np1, np2)
+  # 
+  # D basically gives a way to call GeoKit::Mappable::ClassMethods.distance_between
+  class D
+    extend GeoKit::Mappable::ClassMethods
+  end
+  
+  # 
+  def close_enough_to_input_lat_lng? a,b
+    D.distance_between(a, b) <= 15.0
+  end
+  
   def default_validators
     [{
-      :conditions => Proc.new {|response|
+      :conditions => Proc.new {|response, input_opts|
          true # If all else fails, use this catch all validator
       },
-      :validator => Proc.new {|response|
+      :validator => Proc.new {|response, input_opts|
         best_match=nil
         if response.input_quality >= min_input_quality
           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 r[:quality] >= min_result_quality
+              place = Woefoo::GeoplanetPlace.find_by_woeid(r[: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!
@@ -32,6 +48,10 @@ module Woefoo::TownMatchValidators
                 puts "Encountered a woeid without a geoplanet place #{r[:woeid]}"
               end
             end
+            if input_opts[:lat] && input_opts[:lng]
+              best_match = nil unless
+                close_enough_to_input_lat_lng?([input_opts[:lat], input_opts[:lng]], [r[:latitude], r[:longitude]])
+            end
             break if best_match
           end
         end

data/lib/woefoo/version.rb

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

data/test/woefoo_test.rb

@@ -59,8 +59,8 @@ class WoefooTest < Test::Unit::TestCase
     should "use default validator if no users validators are specified" do
       response = mock()
       place = mock()
-      Woefoo::GeoplanetPlace.expects(:find_by_woeid).with(12345).returns(place)
-      response.expects(:input_quality).twice.returns(75)
+      Woefoo::GeoplanetPlace.stubs(:find_by_woeid).with(12345).returns(place)
+      response.expects(:input_quality).once.returns(75)
       response.expects(:results).returns([{:quality => 80, :woeid=>12345, :woetype=>7}])
       response.expects(:query_options).returns({})
       place.expects(:place_type).returns("Town")
@@ -69,4 +69,4 @@ class WoefooTest < Test::Unit::TestCase
       assert_equal 12345, best_woeid, "WOEID town match mismatch!"
     end
   end
-end
+end

metadata

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