technicalpickles-daywalker 0.1.2 → 0.2.0

data/lib/daywalker/type_converter.rb

@@ -4,7 +4,7 @@ module Daywalker
       case letter
       when 'M' then :male
       when 'F' then :female
-      else raise ArgumentError, "unknown gender #{letter.inspect}"
+      else raise ArgumentError, "Unknown gender #{letter.inspect}. Only M and F allowed."
       end
     end
 
@@ -13,7 +13,7 @@ module Daywalker
       when 'D' then :democrat
       when 'R' then :republican
       when 'I' then :independent
-      else raise ArgumentError, "unknown party #{letter.inspect}"
+      else raise ArgumentError, "Unknown party #{letter.inspect}. Only D, R, and I allowed."
       end
     end
 
@@ -21,7 +21,25 @@ module Daywalker
       case abbr
       when 'Sen' then :senator
       when 'Rep' then :representative
-      else raise ArgumentError, "Unknown title #{abbr.inspect}"
+      else raise ArgumentError, "Unknown title #{abbr.inspect}. Only Sen and Rep allowed."
+      end
+    end
+
+    def self.district_to_sym_or_i(district)
+      case district
+      when 'Junior Seat' then :junior_seat
+      when 'Senior Seat' then :senior_seat
+      when /^(\d+)$/ then $1.to_i
+      else raise ArgumentError, "Unknown district #{district.inspect}. Only Junior Seat, Senior Seat, and numbers allowed."
+      end
+    end
+
+    def self.sym_or_i_to_district(sym)
+      case sym
+      when :junior_seat then 'Junior Seat'
+      when :senior_seat then 'Senior Seat'
+      when Fixnum then sym.to_s
+      else raise ArgumentError, "Unknown district #{sym.inspect}. Only :junior_seat, :senior_seat, and Fixnum are allowed."
       end
     end
 
@@ -55,11 +73,14 @@ module Daywalker
     end
 
     def self.normalize_conditions(conditions)
+      if conditions[:district].kind_of?(Symbol) || conditions[:district].kind_of?(Fixnum)
+        conditions[:district] = sym_or_i_to_district(conditions[:district])
+      end
+
       if conditions[:title].kind_of? Symbol
         conditions[:title] = sym_to_title_abbr(conditions[:title])
       end
 
-      move_value_in_hash(conditions, :district_number, :district)
       move_value_in_hash(conditions, :official_rss_url, :official_rss)
 
       if conditions[:party].kind_of? Symbol

data/spec/daywalker/district_spec.rb

@@ -1,32 +1,32 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Daywalker::District do
+  describe 'parsed from xml' do
+    before do
+      @xml = <<-XML
+        <district>
+          <state>NC</state>
+          <number>4</number>
+        </district>
+      XML
+    end
+    subject { Daywalker::District.parse(@xml) }
 
-  before :each do
-    FakeWeb.clean_registry
-  end
-
-  before :all do
-    Daywalker.api_key = 'redacted'
-  end
-
-  after :all do
-    Daywalker.api_key = nil
+    specify_its_attributes :state => 'NC', :number => 4
   end
 
-  describe 'find_by_latlng' do
+  describe 'unique_by_latitude_and_longitude' do
     describe 'happy path' do
       before do
         # curl -i "http://services.sunlightlabs.com/api/districts.getDistrictFromLatLong.xml?apikey=urkeyhere&latitude=40.739157&longitude=-73.990929" > districts_by_latlng.xml
         register_uri_with_response 'districts.getDistrictFromLatLong.xml?apikey=redacted&latitude=40.739157&longitude=-73.990929', 'districts_by_latlng.xml'
-
+        @district = Daywalker::District.unique_by_latitude_and_longitude(40.739157, -73.990929)
       end
 
-      subject { Daywalker::District.find_by_latlng(40.739157, -73.990929) } 
-
-      specify { subject.size == 1 }
-      specify { subject.first.state.should == 'NY' }
-      specify { subject.first.number.should == 14 }
+      it 'should return NY district 4' do
+        @district.state.should == 'NY'
+        @district.number.should == 14
+      end
     end
 
     describe 'bad api key' do
@@ -35,43 +35,42 @@ describe Daywalker::District do
         register_uri_with_response('districts.getDistrictFromLatLong.xml?apikey=redacted&latitude=40.739157&longitude=-73.990929', 'districts_by_latlng_bad_api.xml')
       end
 
-      specify 'should raise Daywalker::InvalidApiKey' do
+      specify 'should raise Daywalker::BadApiKeyError' do
         lambda {
-          Daywalker::District.find_by_latlng(40.739157, -73.990929)
-        }.should raise_error(Daywalker::BadApiKey)
+          Daywalker::District.unique_by_latitude_and_longitude(40.739157, -73.990929)
+        }.should raise_error(Daywalker::BadApiKeyError)
       end
     end
 
     describe 'missing latitude' do
-      setup do
-        # curl -i "http://services.sunlightlabs.com/api/districts.getDistrictFromLatLong.xml?apikey=urkeyhere&longitude=-73.990929" > 'districts_by_latlng_missing_lat.xml'
-        register_uri_with_response('districts.getDistrictFromLatLong.xml?apikey=redacted&longitude=-73.990929', 'districts_by_latlng_missing_lat.xml')
-      end
-
       specify 'should raise ArgumentError for latitude' do
         lambda {
-          Daywalker::District.find_by_latlng(nil, -73.990929)
+          Daywalker::District.unique_by_latitude_and_longitude(nil, -73.990929)
         }.should raise_error(ArgumentError, /latitude/)
       end
     end
+
+    describe 'missing longitude' do
+      specify 'should raise ArgumentError for longitude' do
+        lambda {
+          Daywalker::District.unique_by_latitude_and_longitude(40.739157, nil)
+        }.should raise_error(ArgumentError, /longitude/)
+      end
+    end
   end
 
-  describe 'find_by_zipcode' do
+  describe 'all_by_zipcode' do
     describe 'happy path' do
       setup do
         # curl -i "http://services.sunlightlabs.com/api/districts.getDistrictsFromZip.xml?apikey=urkeyhere&zip=27511" > districts_by_zip.xml
         register_uri_with_response('districts.getDistrictsFromZip.xml?apikey=redacted&zip=27511', 'districts_by_zip.xml')
+        @districts = Daywalker::District.all_by_zipcode(27511)
       end
 
-      subject { Daywalker::District.find_by_zip(27511) }
-
-      specify { subject.size.should == 2 }
-
-      specify { subject[0].state.should == 'NC' }
-      specify { subject[0].number.should == 13 }
-      
-      specify { subject[1].state.should == 'NC' }
-      specify { subject[1].number.should == 4 }
+      it 'should find NC district 13 and 4' do
+        @districts.map{|d| d.state}.should == ['NC', 'NC']
+        @districts.map{|d| d.number}.should == [13, 4]
+      end
     end
 
     describe 'bad api key' do
@@ -80,25 +79,48 @@ describe Daywalker::District do
         register_uri_with_response 'districts.getDistrictsFromZip.xml?apikey=redacted&zip=27511', 'districts_by_zip_bad_api.xml'
       end
 
-      specify 'should raise BadApiKey' do
+      specify 'should raise BadApiKeyError' do
         lambda {
-          Daywalker::District.find_by_zip(27511)
-        }.should raise_error(Daywalker::BadApiKey)
+          Daywalker::District.all_by_zipcode(27511)
+        }.should raise_error(Daywalker::BadApiKeyError)
       end
     end
 
     describe 'missing zip' do
-      setup do
-        # curl -i "http://services.sunlightlabs.com/api/districts.getDistrictsFromZip.xml?apikey=urkeyhere" > districts_by_zip_missing_zip.xml
-        register_uri_with_response 'districts.getDistrictsFromZip.xml?apikey=redacted', 'districts_by_zip_missing_zip.xml'
-      end
-
       specify 'should raise ArgumentError for missing zip' do
         lambda {
-          Daywalker::District.find_by_zip(nil)
+          Daywalker::District.all_by_zipcode(nil)
         }.should raise_error(ArgumentError, /zip/)
       end
+    end
+  end
+
+  describe 'unique_by_address' do
+    describe 'happy path' do
+      before do
+        Daywalker.geocoder.stub!(:locate).with("110 8th St., Troy, NY 12180").and_return({:longitude => -73.684236, :latitude => 42.731245})
+
+        Daywalker::District.stub!(:unique_by_latitude_and_longitude).with(42.731245, -73.684236)
+      end
+
+      it 'should use unique_by_latitude_and_longitude' do
+        Daywalker::District.should_receive(:unique_by_latitude_and_longitude).with(42.731245, -73.684236)
 
+        Daywalker::District.unique_by_address("110 8th St., Troy, NY 12180")
+      end
+
+      it 'should use the geocoder to locate a latitude and longitude' do
+        Daywalker.geocoder.should_receive(:locate).with("110 8th St., Troy, NY 12180").and_return({:longitude => -73.684236, :latitude => 42.731245})
+        Daywalker::District.unique_by_address("110 8th St., Troy, NY 12180")
+      end
+    end
+
+    describe 'with nil address' do
+      it 'should raise ArgumentError if address is not given' do
+        lambda {
+          Daywalker::District.unique_by_address(nil)
+        }.should raise_error(ArgumentError, /address/)
+      end
     end
   end
 end

data/spec/daywalker/dynamic_finder_match_spec.rb

@@ -1,33 +1,33 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Daywalker::DynamicFinderMatch do
-  describe 'finding all by valid attributes (state and district number)' do
-    subject { Daywalker::DynamicFinderMatch.new(:find_all_by_state_and_district_number) }
+  describe 'all by valid attributes (state and district number)' do
+    subject { Daywalker::DynamicFinderMatch.new(:all_by_state_and_district) }
 
     specify 'should have :all finder' do
       subject.finder.should == :all
     end
 
-    specify 'should have attributes named [:state, :district_number]' do
-      subject.attribute_names.should == [:state, :district_number]
+    specify 'should have attributes named [:state, :district]' do
+      subject.attribute_names.should == [:state, :district]
     end
 
     specify { should be_a_match }
   end
 
   describe 'finding all by invalid attributes (foo and bar)' do
-    subject { Daywalker::DynamicFinderMatch.new(:find_all_by_foo_and_bar) }
+    subject { Daywalker::DynamicFinderMatch.new(:all_by_foo_and_bar) }
     specify { should_not be_a_match }
   end
 
-  describe 'finding one by valid attrribute (govtrack_id)' do
-    subject { Daywalker::DynamicFinderMatch.new(:find_by_govtrack_id) }
+  describe 'finding unique by valid attrribute (govtrack_id)' do
+    subject { Daywalker::DynamicFinderMatch.new(:unique_by_govtrack_id) }
     specify { should be_a_match }
     specify 'should have :govtrack_id attribute' do
       subject.attribute_names.should == [:govtrack_id]
     end
-    specify 'should have :one finder' do
-      subject.finder.should == :one
+    specify 'should have :unique finder' do
+      subject.finder.should == :unique
     end
   end
 end

data/spec/daywalker/geocoder_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Daywalker::Geocoder do
+
+  describe 'locate for 110 8th St., Troy, NY 12180' do
+    before do
+      @geocoder = mock('geocoder')
+      Graticule::Geocoder::GeocoderUs.stub!(:new).and_return(@geocoder)
+
+      @geocoder.stub!(:locate).and_return(build_location)
+    end
+
+    it 'should return longitude -73.684236, latitude 42.731245' do
+      subject.locate('110 8th St., Troy, NY 12180').should == {
+        :longitude => -73.684236,
+        :latitude => 42.731245
+      }
+    end
+
+    it 'should use geocoder.us geocoder to locate' do
+      @geocoder.should_receive(:locate).with('110 8th St., Troy, NY 12180').and_return(build_location)
+
+      subject.locate('110 8th St., Troy, NY 12180')
+    end
+
+    def build_location
+      Graticule::Location.new(:longitude => -73.684236, :latitude => 42.731245)
+    end
+  end
+
+  describe 'locate an address that is fake' do
+    before do
+      @geocoder = mock('geocoder')
+      Graticule::Geocoder::GeocoderUs.stub!(:new).and_return(@geocoder)
+
+      @geocoder.stub!(:locate).and_raise(Graticule::AddressError)
+    end
+
+    it 'should raise AddressError' do
+      lambda {
+        subject.locate('zomg')
+      }.should raise_error(Daywalker::AddressError)
+    end
+  end
+
+end

data/spec/daywalker/legislator_spec.rb

@@ -2,26 +2,14 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Daywalker::Legislator do
 
-  before :each do
-    FakeWeb.clean_registry
-  end
-
-  before :all do
-    Daywalker.api_key = 'redacted'
-  end
-
-  after :all do
-    Daywalker.api_key = nil
-  end
-
-  describe 'find_all_by_zip' do
+  describe 'all_by_zip' do
 
     describe 'happy path' do
       setup do
         # curl -i "http://services.sunlightlabs.com/api/legislators.allForZip.xml?zip=27511&apikey=redacted" > legislators_by_zip.xml
         register_uri_with_response 'legislators.allForZip.xml?zip=27511&apikey=redacted', 'legislators_by_zip.xml'
 
-        @legislators = Daywalker::Legislator.find_all_by_zip 27511
+        @legislators = Daywalker::Legislator.all_by_zip 27511
       end
 
       it 'return legislators identified by votersmart ids 119, 21082, 21787, and 10205' do
@@ -37,67 +25,78 @@ describe Daywalker::Legislator do
 
       it 'should raise bad API key error' do
         lambda {
-          Daywalker::Legislator.find_all_by_zip 27511
-        }.should raise_error(Daywalker::BadApiKey) 
+          Daywalker::Legislator.all_by_zip 27511
+        }.should raise_error(Daywalker::BadApiKeyError) 
       end
     end
 
     describe 'without a zip code' do
       it 'should raise ArgumentError for missing zip' do
         lambda {
-          Daywalker::Legislator.find_all_by_zip nil
+          Daywalker::Legislator.all_by_zip nil
         }.should raise_error(ArgumentError, /zip/) 
       end
     end
   end
 
-  describe 'found with find(:one)' do
+  describe 'found with unique' do
     describe 'by state and district, with one result,' do
       describe 'happy path' do
         before do
           register_uri_with_response 'legislators.get.xml?apikey=redacted&state=NY&district=4', 'legislators_find_by_ny_district_4.xml'
-          @legislator = Daywalker::Legislator.find(:one, :state => 'NY', :district => 4)
+          @legislator = Daywalker::Legislator.unique(:state => 'NY', :district => 4)
         end
 
-
         it 'should have votesmart id 119' do
           @legislator.votesmart_id.should == 119
         end
       end
 
-      describe 'by state and district, with bad API key' do
+      describe 'with bad API key' do
         before do
           register_uri_with_response 'legislators.get.xml?apikey=redacted&state=NY&district=4', 'legislators_find_by_ny_district_4_bad_api.xml'
         end
 
         it 'should raise a missing parameter error for zip' do
           lambda {
-            Daywalker::Legislator.find(:one, :state => 'NY', :district => 4)
-          }.should raise_error(Daywalker::BadApiKey) 
+            Daywalker::Legislator.unique(:state => 'NY', :district => 4)
+          }.should raise_error(Daywalker::BadApiKeyError) 
         end
       end
 
-      describe 'by state and district, with multiple results' do
+      describe 'with multiple results' do
         before do
           register_uri_with_response 'legislators.get.xml?state=NY&title=Sen&apikey=redacted', 'legislators_find_one_by_ny_senators.xml'
         end
 
         it 'should raise an error about multiple legislators returned' do
           lambda {
-            Daywalker::Legislator.find(:one, :state => 'NY', :title => :senator)
+            Daywalker::Legislator.unique(:state => 'NY', :title => :senator)
           }.should raise_error(ArgumentError, "The conditions provided returned multiple results, by only one is expected")
         end
       end
+
+      describe 'with no results' do
+        before do
+          register_uri_with_response 'legislators.get.xml?state=JK&title=Sen&apikey=redacted', 'get_nonexistent_legislator.xml'
+        end
+
+        it 'should raise NotFoundError' do
+          lambda {
+            Daywalker::Legislator.unique(:state => 'JK', :title => :senator)
+          }.should raise_error(Daywalker::NotFoundError)
+        end
+      end
     end
   end
 
-  describe 'found with find(:all)' do
+  describe 'found with all' do
     describe 'by state and title, with multiple results,' do
       describe 'happy path' do
         before do
           # curl -i "http://services.sunlightlabs.com/api/legislators.getList.xml?state=NY&title=Sen&apikey=redacted" > legislators_find_ny_senators.xml
           register_uri_with_response 'legislators.getList.xml?state=NY&apikey=redacted&title=Sen', 'legislators_find_ny_senators.xml'
-          @legislators = Daywalker::Legislator.find(:all, :state => 'NY', :title => :senator)
+          @legislators = Daywalker::Legislator.all(:state => 'NY', :title => :senator)
         end
 
         it 'should return legislators with votesmart ids 55463 and 26976' do
@@ -110,30 +109,21 @@ describe Daywalker::Legislator do
           register_uri_with_response 'legislators.getList.xml?state=NY&apikey=redacted&title=Sen', 'legislators_find_ny_senators_bad_api.xml'
         end
 
-        it 'should raise BadApiKey error' do
+        it 'should raise BadApiKeyError' do
           lambda {
-            Daywalker::Legislator.find(:all, :state => 'NY', :title => :senator)
-          }.should raise_error(Daywalker::BadApiKey)
-
+            Daywalker::Legislator.all(:state => 'NY', :title => :senator)
+          }.should raise_error(Daywalker::BadApiKeyError)
         end
       end
     end
   end
 
-  describe 'found with find(:zomg)' do
-    it 'should raise ArgumentError' do
-      lambda {
-        Daywalker::Legislator.find(:zomg, {})
-      }.should raise_error(ArgumentError, /zomg/)
-    end
-  end
-
   # TODO switch this to mocking
-  describe 'dynamic finder find_all_by_state_and_title' do
+  describe 'dynamic finder all_by_state_and_title' do
     before do
       register_uri_with_response 'legislators.getList.xml?state=NY&apikey=redacted&title=Sen', 'legislators_find_ny_senators.xml'
 
-      @legislators = Daywalker::Legislator.find_all_by_state_and_title('NY', :senator)
+      @legislators = Daywalker::Legislator.all_by_state_and_title('NY', :senator)
     end
     
     it 'should return legislators with votesmart ids 55463 and 26976' do
@@ -141,12 +131,79 @@ describe Daywalker::Legislator do
     end
     
     it 'should respond to find_all_by_state_and_title' do
-      Daywalker::Legislator.should respond_to(:find_all_by_state_and_title)
+      Daywalker::Legislator.should respond_to(:all_by_state_and_title)
     end
   end
 
+  describe 'all_by_latitude_and_longitude' do
+    before do
+      @district = mock('district', :state => 'NY', :number => 21)
+      Daywalker::District.stub!(:unique_by_latitude_and_longitude).with(42.731245, -73.684236).and_return(@district)
+      
+      @representative = mock('representative')
+      @junior_senator = mock('junior senator')
+      @senior_senator = mock('senior senator')
 
-  describe 'parsed from XML' do
+      Daywalker::Legislator.stub!(:unique_by_state_and_district).with('NY', 21).and_return(@representative)
+      Daywalker::Legislator.stub!(:unique_by_state_and_district).with('NY', :junior_seat).and_return(@junior_senator)
+      Daywalker::Legislator.stub!(:unique_by_state_and_district).with('NY', :senior_seat).and_return(@senior_senator)
+    end
+
+    it 'should find district by lat & lng' do
+      Daywalker::District.should_receive(:unique_by_latitude_and_longitude).with(42.731245, -73.684236).and_return(@district)
+
+      Daywalker::Legislator.all_by_latitude_and_longitude(42.731245, -73.684236)
+    end
+
+    it 'should find the representative for the district' do
+      Daywalker::Legislator.should_receive(:unique_by_state_and_district).with('NY', 21).and_return(@representative)
+      
+      Daywalker::Legislator.all_by_latitude_and_longitude(42.731245, -73.684236)
+    end
+
+    it 'should find the junior senator for the state' do
+      Daywalker::Legislator.should_receive(:unique_by_state_and_district).with('NY', :junior_seat).and_return(@junior_senator)
+
+      Daywalker::Legislator.all_by_latitude_and_longitude(42.731245, -73.684236)
+    end
+
+    it 'should find the senior senator for the state' do
+      Daywalker::Legislator.should_receive(:unique_by_state_and_district).with('NY', :senior_seat).and_return(@senior_senator)
+
+      Daywalker::Legislator.all_by_latitude_and_longitude(42.731245, -73.684236)
+    end
+
+    it 'should return the representative, junior senator, and senior senator' do
+      Daywalker::Legislator.all_by_latitude_and_longitude(42.731245, -73.684236).should == {
+        :representative => @representative,
+        :junior_senator => @junior_senator,
+        :senior_senator => @senior_senator
+      }
+    end
+  end
+
+  describe 'all_by_address' do
+    before do
+      Daywalker.geocoder.stub!(:locate).with("110 8th St., Troy, NY 12180").and_return({:longitude => -73.684236, :latitude => 42.731245})
+
+      Daywalker::Legislator.stub!(:all_by_latitude_and_longitude).with(42.731245, -73.684236)
+    end
+
+    it 'should geocode the address' do
+      Daywalker.geocoder.should_receive(:locate).with("110 8th St., Troy, NY 12180").and_return({:longitude => -73.684236, :latitude => 42.731245})
+
+      Daywalker::Legislator.all_by_address("110 8th St., Troy, NY 12180")
+    end
+
+    it 'should find legislators by latitude and longitude' do
+      Daywalker::Legislator.should_receive(:all_by_latitude_and_longitude).with(42.731245, -73.684236)
+
+      Daywalker::Legislator.all_by_address("110 8th St., Troy, NY 12180")
+    end
+
+  end
+
+  describe 'representative parsed from XML' do
     setup do
       @xml = <<-XML
         <legislator>
@@ -181,36 +238,166 @@ describe Daywalker::Legislator do
         </legislator>
       XML
     end
+
+    subject { Daywalker::Legislator.parse(@xml) }
+
+    specify_its_attributes  :district => 4,
+                            :title => :representative,
+                            :eventful_id => 'P0-001-000016562-5',
+                            :in_office => true,
+                            :state => 'NC',
+                            :votesmart_id => 119,
+                            :official_rss_url => nil,
+                            :party => :democrat,
+                            :email => nil,
+                            :crp_id => 'N00002260',
+                            :website_url => 'http://price.house.gov/',
+                            :fax_number => '202-225-2014',
+                            :govtrack_id => 400326,
+                            :first_name => 'David',
+                            :middle_name => 'Eugene',
+                            :last_name => 'Price',
+                            :congress_office => '2162 Rayburn House Office Building',
+                            :bioguide_id => 'P000523',
+                            :webform_url => 'http://price.house.gov/contact/contact_form.shtml',
+                            :youtube_url => 'http://www.youtube.com/repdavidprice',
+                            :nickname => nil,
+                            :phone => '202-225-1784',
+                            :fec_id => 'H6NC04037',
+                            :gender => :male,
+                            :name_suffix => nil,
+                            :twitter_id => nil,
+                            :sunlight_old_id => 'fakeopenID319',
+                            :congresspedia_url => 'http://www.sourcewatch.org/index.php?title=David_Price'
+  end
+
+  describe 'senior senator parsed from XML' do
+    before do
+      @xml = <<-XML
+        <legislator>
+          <district>Senior Seat</district>
+          <title>Sen</title>
+          <eventful_id>P0-001-000016060-2</eventful_id>
+          <in_office>1</in_office>
+          <state>NC</state>
+          <votesmart_id>41533</votesmart_id>
+          <party>R</party>
+          <email/>
+          <crp_id>N00008071</crp_id>
+          <website>http://dole.senate.gov</website>
+          <fax>202-224-1100</fax>
+          <govtrack_id>300035</govtrack_id>
+          <firstname>Elizabeth</firstname>
+          <middlename>H.</middlename>
+          <lastname>Dole</lastname>
+          <congress_office>555 Dirksen Office Building</congress_office>
+          <bioguide_id>D000601</bioguide_id>
+          <webform>http://dole.senate.gov/public/index.cfm?FuseAction=ContactInformation.ContactForm</webform>
+          <nickname/>
+          <phone>202-224-6342</phone>
+          <fec_id>S2NC00083</fec_id>
+          <gender>F</gender>
+          <name_suffix/>
+          <twitter_id/>
+          <sunlight_old_id>fakeopenID468</sunlight_old_id>
+          <congresspedia_url>http://www.sourcewatch.org/index.php?title=Elizabeth_Dole</congresspedia_url>
+        </legislator>
+      XML
+    end
+
     subject { Daywalker::Legislator.parse(@xml) }
 
-    specify { subject.district_number.should == 4 }
-    specify { subject.title.should == :representative }
-    specify { subject.eventful_id.should == 'P0-001-000016562-5' }
-    specify { subject.in_office.should be_true }
-    specify { subject.state.should == 'NC' }
-    specify { subject.votesmart_id.should == 119 }
-    specify { subject.official_rss_url.should be_nil } 
-    specify { subject.party.should == :democrat }
-    specify { subject.email.should be_nil }
-    specify { subject.crp_id.should == 'N00002260' }
-    specify { subject.website_url.should == 'http://price.house.gov/' }
-    specify { subject.fax_number.should == '202-225-2014' }
-    specify { subject.govtrack_id.should == 400326 }
-    specify { subject.first_name.should == 'David' }
-    specify { subject.middle_name.should == 'Eugene' }
-    specify { subject.last_name.should == 'Price' }
-    specify { subject.congress_office.should == '2162 Rayburn House Office Building' }
-    specify { subject.bioguide_id.should == 'P000523' }
-    specify { subject.webform_url.should == 'http://price.house.gov/contact/contact_form.shtml' }
-    specify { subject.youtube_url.should == 'http://www.youtube.com/repdavidprice' }
-    specify { subject.nickname.should be_nil }
-    specify { subject.phone.should == '202-225-1784' }
-    specify { subject.fec_id.should == 'H6NC04037' }
-    specify { subject.gender.should == :male }
-    specify { subject.name_suffix.should be_nil }
-    specify { subject.twitter_id.should be_nil }
-    specify { subject.sunlight_old_id.should == 'fakeopenID319' }
-    specify { subject.congresspedia_url.should == 'http://www.sourcewatch.org/index.php?title=David_Price' }
+    specify_its_attributes  :district => :senior_seat,
+                            :title => :senator,
+                            :eventful_id => 'P0-001-000016060-2',
+                            :in_office => true,
+                            :state => 'NC',
+                            :votesmart_id => 41533,
+                            :party => :republican,
+                            :email => nil,
+                            :crp_id => 'N00008071',
+                            :website_url => 'http://dole.senate.gov',
+                            :fax_number => '202-224-1100',
+                            :govtrack_id => 300035,
+                            :first_name => 'Elizabeth',
+                            :middle_name => 'H.',
+                            :last_name => 'Dole',
+                            :congress_office => '555 Dirksen Office Building',
+                            :bioguide_id => 'D000601',
+                            :webform_url => 'http://dole.senate.gov/public/index.cfm?FuseAction=ContactInformation.ContactForm',
+                            :nickname => nil,
+                            :phone => '202-224-6342',
+                            :fec_id => 'S2NC00083',
+                            :gender => :female,
+                            :name_suffix => nil,
+                            :twitter_id => nil,
+                            :sunlight_old_id => 'fakeopenID468',
+                            :congresspedia_url => 'http://www.sourcewatch.org/index.php?title=Elizabeth_Dole'
   end
 
+  describe 'junior senator parsed from XML' do
+    before do
+      @xml = <<-XML
+        <legislator>
+          <district>Junior Seat</district>
+          <title>Sen</title>
+          <eventful_id>P0-001-000016040-8</eventful_id>
+          <in_office>1</in_office>
+          <state>NC</state>
+          <votesmart_id>21787</votesmart_id>
+          <party>R</party>
+          <email/>
+          <crp_id>N00002221</crp_id>
+          <website>http://burr.senate.gov/</website>
+          <fax>202-228-2981</fax>
+          <govtrack_id>400054</govtrack_id>
+          <firstname>Richard</firstname>
+          <middlename>M.</middlename>
+          <lastname>Burr</lastname>
+          <congress_office>217 Russell Senate Office Building</congress_office>
+          <bioguide_id>B001135</bioguide_id>
+          <webform>http://burr.senate.gov/public/index.cfm?FuseAction=Contact.Home</webform>
+          <nickname/>
+          <phone>202-224-3154</phone>
+          <fec_id>S4NC00089</fec_id>
+          <gender>M</gender>
+          <name_suffix/>
+          <twitter_id/>
+          <sunlight_old_id>fakeopenID449</sunlight_old_id>
+          <congresspedia_url>http://www.sourcewatch.org/index.php?title=Richard_Burr</congresspedia_url>
+        </legislator>
+      XML
+    end
+
+    subject { Daywalker::Legislator.parse(@xml) }
+
+    specify_its_attributes :district => :junior_seat,
+                           :title => :senator,
+                           :eventful_id => 'P0-001-000016040-8',
+                           :in_office => true,
+                           :state => 'NC',
+                           :votesmart_id => 21787,
+                           :party => :republican,
+                           :email => nil,
+                           :crp_id => 'N00002221',
+                           :website_url => 'http://burr.senate.gov/',
+                           :fax_number => '202-228-2981',
+                           :govtrack_id => 400054,
+                           :first_name => 'Richard',
+                           :middle_name => 'M.',
+                           :last_name => 'Burr',
+                           :congress_office => '217 Russell Senate Office Building',
+                           :bioguide_id => 'B001135',
+                           :webform_url => 'http://burr.senate.gov/public/index.cfm?FuseAction=Contact.Home',
+                           :nickname => nil,
+                           :phone => '202-224-3154',
+                           :fec_id => 'S4NC00089',
+                           :gender => :male,
+                           :name_suffix => nil,
+                           :twitter_id => nil,
+                           :sunlight_old_id => 'fakeopenID449',
+                           :congresspedia_url => 'http://www.sourcewatch.org/index.php?title=Richard_Burr'
+  end
+
+
 end