spec/responses/Official.get_by_office_state.12.CO.js @@ -86,7 +86,7 @@ module VoteSmart if response.class == Net::HTTPOK result = JSON.parse(response.body) else - raise RequestFailed.new("Request was not OK: #{response.class}: #{response.body}") + raise RequestFailed.new("Request was not OK: #{response.class}: #{url} #{response.body}") end end # self.get_json_data lib/vote_smart/common.rb @@ -5,7 +5,7 @@ module VoteSmart attr_accessor :id, :first_name, :nick_name, :middle_name, :last_name, :suffix, :title, :election_parties, :office_parties, :district_id, :district_name, :state_id - attr_accessor :district, :office + attr_accessor :district, :office, :office_id set_attribute_map "candidateId" => :id, "firstName" => :first_name, "nickName" => :nick_name, "middleName" => :middle_name, "lastName" => :last_name, "suffix" => :suffix, @@ -20,6 +20,10 @@ module VoteSmart "Official: " + [title, first_name, last_name].compact.join(' ') end + def office_id + @office_id || (office.id if office) + end + def self.find_by_district district official = find_by_district_id district.id official.district = district if official @@ -33,13 +37,18 @@ module VoteSmart def self.find_by_office_id_and_state_id office_id, state_id response = response_child(get_by_office_state(office_id, state_id), "candidateList", "candidate") - Official.new(response) unless response.empty? + official = Official.new(response) unless response.empty? + official.office_id = office_id if official + official.state_id ||= state_id if official + official end def self.find_all_by_address address, city, state, zip placemark = Geocoding.get("#{address} #{city}, #{state} #{zip}").first + state ||= placemark.administrative_area + placemark ? find_all_by_state_and_latitude_and_longitude(state, placemark.latitude, placemark.longitude) : [] end lib/vote_smart/official.rb @@ -19,11 +19,18 @@ def gem_available_on_server? } end +def gem_is_in_specfile? + fetcher = Gem::SpecFetcher.new + specs = fetcher.load_specs(URI.parse('http://gems.github.com/'), 'specs') + specs.any?{|(name, spec)| name == @gem_name and spec.version.to_s == @gem_spec.version.to_s } +end + + is_built = false while not is_built - if gem_available_on_server? + if gem_available_on_server? && gem_is_in_specfile? is_built = true system "say 'gem is built'" else script/is_gem_built @@ -9,7 +9,7 @@ module VoteSmart Official.find_by_district_id("20451") end - it_should_find :item => {:last_name => "Isakson", :id => "1721"} + it_should_find :item => {:last_name => "Isakson", :id => "1721", :district_id => "20451"} end describe "multiple offices" do @@ -33,6 +33,16 @@ module VoteSmart it_should_find :count => 1, :first => {:address => {:type => "Capitol"}} end + describe "find_by_office_id_and_state_id" do + + def do_find + Official.find_by_office_id_and_state_id("12", "CO") + end + + it_should_find :item => {:last_name => "Suthers", :id => "29799", :office_id => "12", :state_id => "CO"} + + end + describe "find by address" do before :each do spec/vote_smart/official_spec.rb @@ -55,7 +55,9 @@ namespace :spec do # save_json VoteSmart::Official, :get_by_district, "21397" - save_json VoteSmart::Address, :get_office, "106446" + # save_json VoteSmart::Address, :get_office, "106446" + + save_json VoteSmart::Official, :get_by_office_state, "12", "CO" end end \ No newline at end of file tasks/spec_json.rake 6034aa817c50c7b7eb66dbb4a74c4314f9b3f3e0 Dan Cunning dancunning@gmail.com http://github.com/netroots/ruby-votesmart/commit/53a253a7a364b4df3a7c105591f50a6d889df7d9 53a253a7a364b4df3a7c105591f50a6d889df7d9 2009-02-17T14:45:29-08:00 2009-02-17T14:45:29-08:00 relationship caching. f5ef7f9787ef050d84490d7c02d7567b8c7983ee Dan Cunning dancunning@gmail.com