@@ -5,9 +5,9 @@ module VoteSmart attr_accessor :address, :phone, :notes def initialize attributes - self.address = Address.new(attributes["address"]) - self.phone = Phone.new(attributes["phone"]) - self.notes = Notes.new(attributes["notes"]) + self.address = Address.new(attributes["address"] || {}) + self.phone = Phone.new(attributes["phone"] || {}) + self.notes = Notes.new(attributes["notes"] || {}) end end lib/vote_smart/candidate_office.rb @@ -27,6 +27,7 @@ module VoteSmart def self.find_by_district district official = find_by_district_id district.id official.district = district if official + official.office = district.office if official official end @@ -47,6 +48,9 @@ module VoteSmart def self.find_all_by_address address, city, state, zip placemark = Geocoding.get("#{address} #{city}, #{state} #{zip}").first + + return [] unless placemark + state ||= placemark.administrative_area placemark ? find_all_by_state_and_latitude_and_longitude(state, placemark.latitude, placemark.longitude) : [] lib/vote_smart/official.rb c2ea79a0706354b1d8904db4dff1714bb5e75fa4 Dan Cunning dancunning@gmail.com http://github.com/netroots/ruby-votesmart/commit/4406ea21be7ae0e19ee629fed1ceb7e19faf1e87 4406ea21be7ae0e19ee629fed1ceb7e19faf1e87 2009-02-17T15:54:03-08:00 2009-02-17T15:54:03-08:00 fixes 0a085d9f3e6f3c5eea364b5a9337ba5c9e0ac48e Dan Cunning dancunning@gmail.com