netroots-ruby-votesmart 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 2
+:patch: 3

data/lib/vote_smart/common.rb

@@ -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

data/lib/vote_smart/official.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
 

data/spec/responses/Official.get_by_office_state.12.CO.js

@@ -0,0 +1 @@
+{"candidateList":{"generalInfo":{"title":"Project Vote Smart - Search Candidates","linkBack":"http:\/\/votesmart.org\/"},"candidate":{"electionDistrictName":"","lastName":"Suthers","candidateId":"29799","title":"Attorney General","officeDistrictName":"","nickName":"","electionYear":"","electionStatus":"","electionParties":"","middleName":"W.","firstName":"John","electionDistrictId":"","officeParties":"Republican","electionStateId":"","officeStateId":"CO","officeDistrictId":"","suffix":""}}}

data/spec/vote_smart/official_spec.rb

@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netroots-ruby-votesmart
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dan Cunning
@@ -67,6 +67,7 @@ files:
 - spec/responses/Official.get_by_district.20689.js
 - spec/responses/Official.get_by_district.21397.js
 - spec/responses/Official.get_by_district.21946.js
+- spec/responses/Official.get_by_office_state.12.CO.js
 - spec/responses/Official.get_by_office_state.12.GA.js
 - spec/responses/Official.get_by_office_state.13.GA.js
 - spec/responses/Official.get_by_office_state.33.GA.js