netroots-ruby-votesmart 0.2.0 → 0.2.1

data/VERSION.yml

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

data/lib/vote_smart/common.rb

@@ -41,6 +41,11 @@ module VoteSmart
       response || {}
     end
     
+    def self.response_child_array response, *children
+      child = response_child response, *children
+      child.kind_of?(Array) ? child : [child]
+    end
+    
     def self.request(api_method, params = {})
       url = construct_url api_method, params
       

data/lib/vote_smart/official.rb

@@ -3,7 +3,7 @@ module VoteSmart
   class Official < Common
     
     attr_accessor :id, :first_name, :nick_name, :middle_name, :last_name, :suffix, :title,
-                  :election_parties, :office_parties, :district_id, :district_name, :state_id
+                  :election_parties, :office_parties, :district_id, :district_name, :state_id, :district
     
     set_attribute_map "candidateId" => :id, "firstName" => :first_name, "nickName" => :nick_name,
                       "middleName" => :middle_name, "lastName" => :last_name, "suffix" => :suffix,
@@ -11,7 +11,7 @@ module VoteSmart
                       "officeDistrictName" => :district_name, "officeStateId" => :state_id
     
     def offices
-      Official.response_child(Address.get_office(self.id), "address", "office").collect {|office| CandidateOffice.new(office) }
+      Official.response_child_array(Address.get_office(self.id), "address", "office").collect {|office| CandidateOffice.new(office) }
     end
     
     def inspect
@@ -19,7 +19,9 @@ module VoteSmart
     end
     
     def self.find_by_district district
-      find_by_district_id district.id
+      official = find_by_district_id district.id
+      official.district = district if official
+      official
     end
     
     def self.find_by_district_id district_id

data/spec/responses/Address.get_office.106446.js

@@ -0,0 +1 @@
+{"address":{"generalInfo":{"title":"Project Vote Smart - Campaign Address - Lois Court","linkBack":"http:\/\/votesmart.org\/bio.php?can_id=106446"},"candidate":{"lastName":"Court","title":"Rep.","nickName":"","middleName":"","firstName":"Lois","suffix":""},"office":{"notes":{"contactName":"","contactTitle":""},"phone":{"ttyd":"","tollFree":"","fax1":"","fax2":"","phone1":"303-866-2967","phone2":""},"address":{"city":"Denver","zip":"80203","type":"Capitol","street":"Colorado State Capitol\n200 East Colfax","state":"CO"}}}}

data/spec/responses/Official.get_by_district.21397.js

@@ -0,0 +1 @@
+{"candidateList":{"generalInfo":{"title":"Project Vote Smart - Search Candidates","linkBack":"http:\/\/votesmart.org\/"},"candidate":{"electionDistrictName":"","lastName":"Court","candidateId":"106446","title":"Representative","officeDistrictName":"","nickName":"","electionYear":"","electionStatus":"","electionParties":"Democratic","middleName":"","firstName":"Lois","electionDistrictId":"","officeParties":"Democratic","electionStateId":"","officeStateId":"CO","officeDistrictId":"21397","suffix":""}}}

data/spec/vote_smart/official_spec.rb

@@ -12,7 +12,7 @@ module VoteSmart
       it_should_find :item => {:last_name => "Isakson", :id => "1721"}
     end
     
-    describe "offices" do
+    describe "multiple offices" do
       
       def do_find
         @official = Official.find_by_district_id("20451")
@@ -23,6 +23,16 @@ module VoteSmart
                                   :last  => {:address => {:type => "Washington, D.C."}}
     end
     
+    describe "one office" do
+      
+      def do_find
+        @official = Official.find_by_district_id("21397")
+        @official.offices
+      end
+      
+      it_should_find :count => 1, :first => {:address => {:type => "Capitol"}}
+    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.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Dan Cunning
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -08:00
+date: 2009-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +52,7 @@ files:
 - lib/vote_smart/state.rb
 - lib/vote_smart/vote.rb
 - spec/responses
+- spec/responses/Address.get_office.106446.js
 - spec/responses/Address.get_office.1721.js
 - spec/responses/authorization_failed.js
 - spec/responses/District.get_by_office_state.7.GA.js
@@ -64,6 +65,7 @@ files:
 - spec/responses/Office.get_types.js
 - spec/responses/Official.get_by_district.20451.js
 - 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.GA.js
 - spec/responses/Official.get_by_office_state.13.GA.js