govkit 0.7.2 → 0.7.3

data/spec/follow_the_money_spec.rb

@@ -1,25 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-# Provides "String.singularize"
-# which is used by resource_for_collection, in resource.rb
-require 'active_support/inflector'
-
 module GovKit::FollowTheMoney
   describe GovKit::FollowTheMoney do
 
     before(:all) do
-      base_uri = GovKit::FollowTheMoneyResource.base_uri.gsub(/\./, '\.')
-
-      urls = [
-        ['/base_level\.industries\.list\.php\?.*page=0',                          'business-page0.response'],
-        ['/base_level\.industries\.list\.php\?.*page=1',                          'business-page1.response'],
-        ['/candidates\.contributions\.php\?imsp_candidate_id=111933',             'contribution.response'],
-        ['/candidates\.contributions\.php\?imsp_candidate_id=0',                  'unauthorized.response'],
-      ]
-
-      urls.each do |u|
-        FakeWeb.register_uri(:get, %r|#{base_uri}#{u[0]}|, :response => File.join(FIXTURES_DIR, 'follow_the_money', u[1]))
-        # puts "registered #{base_uri}#{u[0]}"
+      unless FakeWeb.allow_net_connect?
+        base_uri = GovKit::FollowTheMoneyResource.base_uri.gsub(/\./, '\.')
+
+        urls = [
+          ['/base_level\.industries\.list\.php\?.*page=0',                          'business-page0.response'],
+          ['/base_level\.industries\.list\.php\?.*page=1',                          'business-page1.response'],
+          ['/candidates\.contributions\.php\?imsp_candidate_id=111933',             'contribution.response'],
+          ['/candidates\.contributions\.php\?imsp_candidate_id=0',                  'unauthorized.response'],
+        ]
+
+        urls.each do |u|
+          FakeWeb.register_uri(:get, %r|#{base_uri}#{u[0]}|, :response => File.join(FIXTURES_DIR, 'follow_the_money', u[1]))
+        end
       end
     end
 
@@ -30,11 +27,17 @@ module GovKit::FollowTheMoney
     end
 
     it "should raise NotAuthorized if the api key is not valid" do
+      api_key = GovKit.configuration.ftm_apikey
+
+      GovKit.configuration.ftm_apikey = nil
+
       lambda do 
         @contribution = Contribution.find(0)
       end.should raise_error(GovKit::NotAuthorized)
 
       @contribution.should be_nil
+
+      GovKit.configuration.ftm_apikey = api_key
     end
 
     describe Business do
@@ -49,6 +52,7 @@ module GovKit::FollowTheMoney
 
     describe Contribution do
       it "should get a list of campaign contributions for a given person" do
+        pending 'This API call is restricted'
         @contributions = Contribution.find(111933)
         @contributions.should be_an_instance_of(Array)
         @contributions.each do |c|

data/spec/open_congress_spec.rb

@@ -4,30 +4,28 @@ module GovKit::OpenCongress
   describe GovKit::OpenCongress do
     before(:all) do
       @oc_objs = [Bill, Person]
-      base_uri = "http://www.opencongress.org/api/"
-      
-      # An array of uris and filenames
-      # Use FakeWeb to intercept net requests;
-      # if a requested uri matches one of the following,
-      # then return the contents of the corresponding file
-      # as the result. 
-      urls = [
-       [ "people?format=json&district=1&state=FL", "fl01.response" ],
-       [ "people?format=json&district=0&state=ZZ", "empty.response" ],
-       [ "most_blogged_representatives_this_week?format=json", "person.response" ],
-       [ "bills?format=json&number=0", "empty.response" ],
-       [ "bills?format=json&number=501", "501.response" ],
-       [ "most_blogged_bills_this_week?format=json", "bill.response" ] 
-      ]
-      
-      urls.each do |u|
-        FakeWeb.register_uri(:get, "#{base_uri}#{u[0]}", :response => File.join(FIXTURES_DIR, 'open_congress', u[1]))
+
+      unless FakeWeb.allow_net_connect?
+        base_uri = "http://api.opencongress.org/"
+
+        urls = [
+         [ "people?format=json&district=1&state=FL", "fl01.response" ],
+         [ "people?format=json&district=0&state=ZZ", "empty.response" ],
+         [ "most_blogged_representatives_this_week?format=json", "person.response" ],
+         [ "bills?format=json&number=0", "empty.response" ],
+         [ "bills?format=json&number=501", "501.response" ],
+         [ "most_blogged_bills_this_week?format=json", "bill.response" ] 
+        ]
+
+        urls.each do |u|
+          FakeWeb.register_uri(:get, "#{base_uri}#{u[0]}", :response => File.join(FIXTURES_DIR, 'open_congress', u[1]))
+        end
       end
     end
     
     it "should construct a url properly" do
       @oc_objs.each do |klass|
-        klass.construct_url(klass.to_s.split("::").last, {}).should == "http://www.opencongress.org/api/#{klass.to_s.split("::").last}?format=json"
+        klass.construct_url(klass.to_s.split("::").last, {}).should == "http://api.opencongress.org/#{klass.to_s.split("::").last}?format=json"
       end
     end
     
@@ -40,9 +38,7 @@ module GovKit::OpenCongress
     describe Person do
       context "#find" do
         it "should find a specific person" do
-          lambda do
-            @person = Person.find(:district => 1, :state => "FL").first
-          end.should_not raise_error
+          @person = Person.find(:district => 1, :state => "FL").first
 
           @person.should be_an_instance_of(Person)
           @person.firstname.should == "Jeff"
@@ -50,9 +46,7 @@ module GovKit::OpenCongress
         end
         
         it "should return an empty array when no person fits the criteria" do
-          lambda do
-            @person = Person.find(:district => 0, :state => "ZZ")
-          end.should_not raise_error
+          @person = Person.find(:district => 0, :state => "ZZ")
           
           @person.should be_an_instance_of(Array)
           @person.empty?.should be_true
@@ -61,9 +55,7 @@ module GovKit::OpenCongress
       
       context "#most blogged representatives this week" do
         it "should find reps" do
-          lambda do
-            @person = Person.most_blogged_representatives_this_week.first
-          end.should_not raise_error
+          @person = Person.most_blogged_representatives_this_week.first
 
           @person.should be_an_instance_of(Person)
           @person.firstname.should == "Jeff"
@@ -75,13 +67,11 @@ module GovKit::OpenCongress
     describe Bill do
       context "#find" do
         it "should find a specific bill" do
-          lambda do
-            @bill = Bill.find(:number => 501).first
-          end.should_not raise_error
+          @bill = Bill.find(:number => 501).first
         
           @bill.should be_an_instance_of(Bill)
           @bill.number.should == 501
-          @bill.bill_type.should == "h"
+          @bill.bill_type.should == (FakeWeb.allow_net_connect? ? "hr" : "h")
         end
         
         it "should return an empty array when no bill fits the criteria" do
@@ -94,9 +84,7 @@ module GovKit::OpenCongress
       
       context "#most blogged bills this week" do
         it "should find specific bills" do
-          lambda do
-            @bill = Bill.most_blogged_bills_this_week.first
-          end.should_not raise_error
+          @bill = Bill.most_blogged_bills_this_week.first
           
           @bill.should be_an_instance_of(Bill)
           @bill.number.should == 2678

data/spec/open_states_spec.rb

@@ -1,80 +1,73 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-# Provides "String.singularize"
-# which is used by resource_for_collection, in resource.rb
-require 'active_support/inflector'
-
-# Provides string.last()
-# which is used by method_missing in resource.rb
-require 'active_support/core_ext/string'
-
 module GovKit::OpenStates
   describe GovKit::OpenStates do
     before(:all) do
-      base_uri = GovKit::OpenStatesResource.base_uri.gsub(/\./, '\.')
-
-      # An array of uris and filenames
-      # Use FakeWeb to intercept net requests;
-      # if a requested uri matches one of the following,
-      # then return the contents of the corresponding file
-      # as the result. 
-      urls = [
-        ['/bills/ca/20092010/AB667/',          'bill.response'],
-        ['/bills/\?.*q=cooperatives.*',        'bill_query.response'],
-        ['/bills/\?.*state=tx.*',              'bill_query.response'],
-        ['/bills/\?.*q=professions.*',         'bill.response'],
-        ['/bills/latest/\?',                   'bill_query.response'],
-        ['/legislators/2462/\?',               'legislator.response'],
-        ['/legislators/410/\?',                '410.response'],
-        ['/legislators/401/\?',                '401.response'],
-        ['/legislators/404/\?',                '404.response'],
-        ['/legislators/\?.*state=zz.*',        '404.response'],
-        ['/legislators/\?.*state=ca.*',        'legislator.response'],
-        ['/committees/MDC000012/',             'committee_find.response'],
-        ['/committees/\?.*state=md',           'committee_query.response'],
-        ['/metadata/ca/\?',                    'state.response']
-      ]
-
-      # First convert each of the uri strings above into regexp's before 
-      # passing them on to register_uri. 
-      #
-      # Internally, before checking if a new uri string matches one of the registered uri's,
-      # FakeWeb normalizes it by parsing it with URI.parse(string), and then 
-      # calling URI.normalize on the resulting URI.  This appears to reorder any
-      # query parameters alphabetically by key.
-      #
-      # So the uri
-      #   http://openstates.sunlightlabs.com/api/v1/legislators/?state=zz&output=json&apikey=
-      # would actually not match a registered uri of
-      #   ['/legislators/\?state=zz',                                  '404.response'],
-      # or 
-      #   ['/legislators/\?state=zz*',                                 '404.response'],
-      # or even
-      #   ['/legislators/\?state=zz&output=json&apikey=',              '404.response'],
-      #
-      # But it would match a registered uri of 
-      #   ['/legislators/\?apikey=&output=json&state=zz',              '404.response'],
-      #   or
-      #   ['/legislators/\?(.*)state=zz(.*)',                          '404.response'],
-
-
-      urls.each do |u|
-        FakeWeb.register_uri(:get, %r|#{base_uri}#{u[0]}|, :response => File.join(FIXTURES_DIR, 'open_states', u[1]))
+      unless FakeWeb.allow_net_connect?
+        base_uri = GovKit::OpenStatesResource.base_uri.gsub(/\./, '\.')
+
+        # @todo The fixtures are out-of-date.
+        urls = [
+          ['/bills/ca/20092010/lower/AB%20667/', 'bill.response'],
+          ['/bills/\?.*q=cooperatives.*',        'bill_find.response'],
+          ['/bills/\?.*state=tx.*',              'bill_query.response'],
+          ['/legislators/CAL000088/\?',          'legislator_find.response'],
+          ['/legislators/XXL123456/\?',          '401.response'],
+          ['/legislators/CAL999999/\?',          '404.response'],
+          ['/legislators/\?.*state=zz.*',        '404.response'],
+          ['/legislators/\?.*state=ca.*',        'legislator_query.response'],
+          ['/committees/MDC000012/',             'committee_find.response'],
+          ['/committees/\?.*state=md',           'committee_query.response'],
+          ['/metadata/ca/\?',                    'state.response']
+        ]
+
+        # First convert each of the uri strings above into regexp's before
+        # passing them on to register_uri.
+        #
+        # Internally, before checking if a new uri string matches one of the registered uri's,
+        # FakeWeb normalizes it by parsing it with URI.parse(string), and then
+        # calling URI.normalize on the resulting URI.  This appears to reorder any
+        # query parameters alphabetically by key.
+        #
+        # So the uri
+        #   http://openstates.sunlightlabs.com/api/v1/legislators/?state=zz&output=json&apikey=
+        # would actually not match a registered uri of
+        #   ['/legislators/\?state=zz',                                  '404.response'],
+        # or
+        #   ['/legislators/\?state=zz*',                                 '404.response'],
+        # or even
+        #   ['/legislators/\?state=zz&output=json&apikey=',              '404.response'],
+        #
+        # But it would match a registered uri of
+        #   ['/legislators/\?apikey=&output=json&state=zz',              '404.response'],
+        #   or
+        #   ['/legislators/\?(.*)state=zz(.*)',                          '404.response'],
+
+
+        urls.each do |u|
+          FakeWeb.register_uri(:get, %r|#{base_uri}#{u[0]}|, :response => File.join(FIXTURES_DIR, 'open_states', u[1]))
+        end
       end
     end
 
     it "should have the base uri set properly" do
       [State, Bill, Legislator].each do |klass|
-        klass.base_uri.should == "http://openstates.sunlightlabs.com/api/v1"
+        klass.base_uri.should == "http://openstates.org/api/v1"
       end
     end
 
     it "should raise NotAuthorized if the api key is not valid" do
+      api_key = GovKit.configuration.sunlight_apikey
+
+      GovKit.configuration.sunlight_apikey = nil
+
       lambda do
-        @legislator = Legislator.find(401)
+        @legislator = Legislator.find 'XXL123456'
       end.should raise_error(GovKit::NotAuthorized)
 
       @legislator.should be_nil
+
+      GovKit.configuration.sunlight_apikey = api_key
     end
 
     describe State do
@@ -89,7 +82,7 @@ module GovKit::OpenStates
 
           @state.should be_an_instance_of(State)
           @state.name.should == "California"
-          @state.sessions.size.should == 8
+          @state.terms.first.sessions.size.should == 9
         end
       end
     end
@@ -98,7 +91,7 @@ module GovKit::OpenStates
       context "#find" do
         it "should find a bill by state abbreviation, session, chamber, bill_id" do
           lambda do
-            @bill = Bill.find('ca', '20092010', 'lower', 'AB667')
+            @bill = Bill.find('ca', '20092010', 'AB 667', 'lower')
           end.should_not raise_error
 
           @bill.should be_an_instance_of(Bill)
@@ -114,29 +107,21 @@ module GovKit::OpenStates
           @bills.each do |b|
             b.should be_an_instance_of(Bill)
           end
-          @bills.collect(&:bill_id).should include("SB 921")
-        end
-        
-        it "should return a single bill result as an array" do
-          @bills = Bill.search('professions')
-        
-          @bills.should be_an_instance_of(Array)
-          @bills.collect(&:bill_id).should include("AB667")
+          @bills.collect(&:bill_id).should include("SB 207")
         end
-
       end
 
       context "#latest" do
         it "should get the latest bills by given criteria" do
           lambda do
-            @latest = Bill.latest('2010-01-01', :state => 'tx')
+            @latest = Bill.latest('2012-11-01', :state => 'tx')
           end.should_not raise_error
 
           @latest.should be_an_instance_of(Array)
           @latest.each do |b|
             b.should be_an_instance_of(Bill)
           end
-          @latest.collect(&:bill_id).should include("SB 2236")
+          @latest.collect(&:bill_id).should include("HB 41")
         end
       end
     end
@@ -145,16 +130,16 @@ module GovKit::OpenStates
       context "#find" do
         it "should find a specific legislator" do
           lambda do
-            @legislator = Legislator.find(2462)
+            @legislator = Legislator.find('CAL000088')
           end.should_not raise_error
 
           @legislator.should be_an_instance_of(Legislator)
-          @legislator.first_name.should == "Dave"
-          @legislator.last_name.should == "Cox"
+          @legislator.first_name.should == "Bob"
+          @legislator.last_name.should == "Blumenfield"
         end
 
         it "should return an empty array if the legislator is not found" do
-          @legislator = Legislator.find(404)
+          @legislator = Legislator.find('CAL999999')
 
           @legislator.should eql([])
         end
@@ -202,10 +187,10 @@ module GovKit::OpenStates
           end.should_not raise_error
 
           @committees.should be_an_instance_of(Array)
-          @committees.length.should eql(20)
+          @committees.length.should eql(21)
           com = @committees[0]
           com.should be_an_instance_of(Committee)
-          com['id'].should eql('MDC000009')
+          com['id'].should eql('MDC000001')
         end
       end
     end

data/spec/search_engines_spec.rb

@@ -3,19 +3,16 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 module GovKit::SearchEngines
   describe GovKit::SearchEngines do
     before(:all) do
-      google_news_uri = "http://news.google.com/"
-      
-      # An array of uris and filenames
-      # Use FakeWeb to intercept net requests;
-      # if a requested uri matches one of the following,
-      # then return the contents of the corresponding file
-      # as the result. 
-      urls = [
-       [ "news?q=congress&output=rss&num=50", "google_news.response" ] 
-      ]
-      
-      urls.each do |u|
-        FakeWeb.register_uri(:get, "#{google_news_uri}#{u[0]}", :response => File.join(FIXTURES_DIR, 'search_engines', u[1]))
+      unless FakeWeb.allow_net_connect?
+        google_news_uri = "http://news.google.com/"
+
+        urls = [
+         [ "news?q=congress&output=rss&num=50", "google_news.response" ]
+        ]
+
+        urls.each do |u|
+          FakeWeb.register_uri(:get, "#{google_news_uri}#{u[0]}", :response => File.join(FIXTURES_DIR, 'search_engines', u[1]))
+        end
       end
     end
     

data/spec/spec_helper.rb

@@ -3,6 +3,22 @@ require 'rspec'
 require 'fakeweb'
 require File.dirname(__FILE__) + '/../lib/govkit'
 
+# Set to true to run tests against the live URLs, and add the following to
+# spec/support/api_keys.rb:
+#
+#     unless FakeWeb.allow_net_connect?
+#       GovKit.configure do |config|
+#         config.sunlight_apikey   = 'YOUR_SUNLIGHT_API_KEY'
+#         config.votesmart_apikey  = 'YOUR_VOTESMART_API_KEY'
+#         config.ftm_apikey        = 'YOUR_FTM_API_KEY'
+#       end
+#     end
+FakeWeb.allow_net_connect = false
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].each {|f| require f}
+
 # prevent the use of `` in tests
 RSpec.configure do |c|
 end
@@ -25,12 +41,4 @@ module Kernel
   end
 end
 
-FakeWeb.allow_net_connect = false
-
 FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
-
-GovKit.configure do |config|
-  config.openstates_apikey = 'YOUR_OPENSTATES_API_KEY'
-  config.votesmart_apikey = 'YOUR_VOTESMART_API_KEY'
-  config.ftm_apikey = 'YOUR_FTM_API_KEY'
-end