netroots-ruby-votesmart 0.2.1 → 0.2.2

data/VERSION.yml

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

data/lib/vote_smart/district.rb

@@ -4,6 +4,8 @@ module VoteSmart
     
     attr_accessor :id, :name, :office_id, :state_id
     
+    attr_accessor :office
+    
     set_attribute_map "districtId" => :id, "name" => :name, "officeId" => :office_id, "stateId" => :state_id
     
     def number

data/lib/vote_smart/office.rb

@@ -4,12 +4,16 @@ module VoteSmart
     
     attr_accessor :id, :type_id, :level_id, :branch_id, :name, :title, :short_title
     
+    attr_accessor :office
+    
     set_attribute_map "officeId" => :id, "officeTypeId" => :type_id, "officeLevelId" => :level_id,
                       "officeBranchId" => :branch_id, "name" => :name, "title" => :title, "shortTitle" => :short_title
     
     def districts_by_state_id state_id
       @districts_by_state ||= {}
-      @districts_by_state[state_id] ||= District.find_all_by_office_id_and_state_id(self.id, state_id)
+      districts = District.find_all_by_office_id_and_state_id(self.id, state_id)
+      districts.each { |district| district.office = self }
+      @districts_by_state[state_id] ||= districts
     end
     
     def district_by_state_id_and_number state_id, number
@@ -20,7 +24,9 @@ module VoteSmart
     
     def official_by_state_id state_id
       @official_by_state ||= {}
-      @official_by_state[state_id] ||= Official.find_by_office_id_and_state_id(self.id, state_id)
+      official = Official.find_by_office_id_and_state_id(self.id, state_id)
+      official.office = self if official
+      @official_by_state[state_id] ||= official
     end
     
     def self.all

data/lib/vote_smart/official.rb

@@ -3,7 +3,9 @@ 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, :district
+                  :election_parties, :office_parties, :district_id, :district_name, :state_id
+    
+    attr_accessor :district, :office
     
     set_attribute_map "candidateId" => :id, "firstName" => :first_name, "nickName" => :nick_name,
                       "middleName" => :middle_name, "lastName" => :last_name, "suffix" => :suffix,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netroots-ruby-votesmart
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dan Cunning