congress 0.1.1 → 0.2.0

data/lib/congress.rb

@@ -1,27 +1,27 @@
 require 'congress/client'
 
 module Congress
-  class << self
-    attr_accessor :key
-    def configure
-      yield self
-    end
+  extend self # rubocop:disable ModuleFunction
+  attr_accessor :key
 
-    # Alias for Congress::Client.new
-    #
-    # @return [Congress::Client]
-    def new
-      Congress::Client.new
-    end
-
-    # Delegate to Congress::Client
-    def method_missing(method, *args, &block)
-      return super unless new.respond_to?(method)
-      new.send(method, *args, &block)
-    end
+  # Alias for Congress::Client.new
+  #
+  # @return [Congress::Client]
+  def new(key = key)
+    yield self if block_given?
+    return @client if instance_variable_defined?(:@client) && @client.key == key
+    @client = Congress::Client.new(key)
+  end
 
-    def respond_to?(method, include_private=false)
-      new.respond_to?(method, include_private) || super(method, include_private)
-    end
+  # Delegate to Congress::Client
+  def method_missing(method, *args, &block)
+    return super unless new.respond_to?(method)
+    new.send(method, *args, &block)
   end
+
+  # @return [Boolean]
+  def respond_to?(method, include_private = false) new.respond_to?(method, include_private) end if RUBY_VERSION < '1.9' # rubocop:disable SingleLineMethods
+
+  # @return [Boolean]
+  def respond_to_missing?(method_name, include_private = false) new.respond_to?(method_name, include_private) end if RUBY_VERSION >= '1.9' # rubocop:disable SingleLineMethods
 end

data/spec/congress/client_spec.rb

@@ -1,194 +1,205 @@
 require 'helper'
 
 describe Congress::Client do
+  let(:gmaps_api) { 'http://maps.googleapis.com/maps/api/geocode/json?address=2169%20Mission%20Street,%20San%20Francisco,%20CA%2094110&language=en&sensor=false' }
+
   before do
-    @client = Congress::Client.new
-    Congress.configure do |config|
-      config.key = "abc123"
-    end
+    @client = Congress::Client.new('abc123')
   end
 
   describe '#legislators' do
     before do
-      stub_get('/legislators?apikey=abc123').
+      stub_get('/legislators').
         to_return(:status => 200, :body => fixture('legislators.json'))
     end
     it "fetches current legislators' names, IDs, biography, and social media" do
       legislators = @client.legislators
-      a_get('/legislators?apikey=abc123').
-        should have_been_made
-      legislators['count'].should == 539
-      legislators['results'].first.bioguide_id.should == "K000385"
+      expect(a_get('/legislators').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(legislators['count']).to eq(539)
+      expect(legislators['results'].first.bioguide_id).to eq('K000385')
     end
   end
 
   describe '#legislators_locate' do
-    context "with a zip code passed" do
+    context 'with a zip code passed' do
       before do
-        stub_get('/legislators/locate?apikey=abc123&zip=94107').
+        stub_get('/legislators/locate?zip=94107').
           to_return(:status => 200, :body => fixture('legislators_locate.json'))
       end
-      it "fetches representatives and senators for a zip code" do
+      it 'fetches representatives and senators for a zip code' do
         legislators_locate = @client.legislators_locate(94107)
-        a_get('/legislators/locate?apikey=abc123&zip=94107').
-          should have_been_made
-        legislators_locate['count'].should == 3
-        legislators_locate['results'].first.bioguide_id.should == "P000197"
+        expect(a_get('/legislators/locate?zip=94107').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(legislators_locate['count']).to eq(3)
+        expect(legislators_locate['results'].first.bioguide_id).to eq('P000197')
       end
     end
-    context "with a latitude and longitude passed" do
+    context 'with a latitude and longitude passed' do
       before do
-        stub_get('/legislators/locate?apikey=abc123&latitude=37.775&longitude=-122.418').
+        stub_get('/legislators/locate?latitude=37.775&longitude=-122.418').
           to_return(:status => 200, :body => fixture('legislators_locate.json'))
       end
-      it "fetches representatives and senators for a latitude/longitude pir" do
+      it 'fetches representatives and senators for a latitude/longitude pair' do
         legislators_locate = @client.legislators_locate(37.775, -122.418)
-        a_get('/legislators/locate?apikey=abc123&latitude=37.775&longitude=-122.418').
-          should have_been_made
-        legislators_locate['count'].should == 3
-        legislators_locate['results'].first.bioguide_id.should == "P000197"
+        expect(a_get('/legislators/locate?latitude=37.775&longitude=-122.418').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(legislators_locate['count']).to eq(3)
+        expect(legislators_locate['results'].first.bioguide_id).to eq('P000197')
+      end
+    end
+    context 'with an address passed' do
+      before do
+        stub_get('/legislators/locate?latitude=37.775&longitude=-122.418').
+          to_return(:status => 200, :body => fixture('legislators_locate.json'))
+        stub_request(:get, gmaps_api).to_return(:status => 200, :body => fixture('google_geocoding.json'))
+      end
+      it 'fetches representatives and senators for an address' do
+        legislators_locate = @client.legislators_locate('2169 Mission Street, San Francisco, CA 94110')
+        expect(a_request(:get, gmaps_api)).to have_been_made
+        expect(a_get('/legislators/locate?latitude=37.775&longitude=-122.418').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(legislators_locate['count']).to eq(3)
+        expect(legislators_locate['results'].first.bioguide_id).to eq('P000197')
       end
     end
-    context "with no arguments passed" do
-      it "raises an argument error" do
-        lambda {
-          @client.legislators_locate
-        }.should raise_error ArgumentError
+    context 'with no arguments passed' do
+      it 'raises an argument error' do
+        expect { @client.legislators_locate }.to raise_error ArgumentError
       end
     end
   end
 
   describe '#districts_locate' do
-    context "with a zip code passed" do
+    context 'with a zip code passed' do
       before do
-        stub_get('/districts/locate?apikey=abc123&zip=94107').
+        stub_get('/districts/locate?zip=94107').
           to_return(:status => 200, :body => fixture('districts_locate.json'))
       end
-      it "fetches congressional districts for a zip code" do
+      it 'fetches congressional districts for a zip code' do
         districts_locate = @client.districts_locate(94107)
-        a_get('/districts/locate?apikey=abc123&zip=94107').
-          should have_been_made
-        districts_locate['count'].should == 1
-        districts_locate['results'].first.district.should == 12
+        expect(a_get('/districts/locate?zip=94107').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(districts_locate['count']).to eq(1)
+        expect(districts_locate['results'].first.district).to eq(12)
       end
     end
-    context "with a latitude and longitude passed" do
+    context 'with a latitude and longitude passed' do
       before do
-        stub_get('/districts/locate?apikey=abc123&latitude=37.775&longitude=-122.418').
+        stub_get('/districts/locate?latitude=37.775&longitude=-122.418').
           to_return(:status => 200, :body => fixture('districts_locate.json'))
       end
-      it "fetches congressional districts for a latitude/longitude pair" do
+      it 'fetches congressional districts for a latitude/longitude pair' do
         districts_locate = @client.districts_locate(37.775, -122.418)
-        a_get('/districts/locate?apikey=abc123&latitude=37.775&longitude=-122.418').
-          should have_been_made
-        districts_locate['count'].should == 1
-        districts_locate['results'].first.district.should == 12
+        expect(a_get('/districts/locate?latitude=37.775&longitude=-122.418').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(districts_locate['count']).to eq(1)
+        expect(districts_locate['results'].first.district).to eq(12)
+      end
+    end
+    context 'with an address passed' do
+      before do
+        stub_get('/districts/locate?latitude=37.775&longitude=-122.418').
+          to_return(:status => 200, :body => fixture('districts_locate.json'))
+        stub_request(:get, gmaps_api).to_return(:status => 200, :body => fixture('google_geocoding.json'))
+      end
+      it 'fetches congressional districts for an address' do
+        districts_locate = @client.districts_locate('2169 Mission Street, San Francisco, CA 94110')
+        expect(a_request(:get, gmaps_api)).to have_been_made
+        expect(a_get('/districts/locate?latitude=37.775&longitude=-122.418').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+        expect(districts_locate['count']).to eq(1)
+        expect(districts_locate['results'].first.district).to eq(12)
       end
     end
-    context "with no arguments passed" do
-      it "raises an argument error" do
-        lambda {
-          @client.districts_locate
-        }.should raise_error ArgumentError
+    context 'with no arguments passed' do
+      it 'raises an argument error' do
+        expect { @client.districts_locate }.to raise_error ArgumentError
       end
     end
   end
 
   describe '#committees' do
     before do
-      stub_get('/committees?apikey=abc123').
+      stub_get('/committees').
         to_return(:status => 200, :body => fixture('committees.json'))
     end
-    it "fetches current committees, subcommittees, and their membership" do
+    it 'fetches current committees, subcommittees, and their membership' do
       committees = @client.committees
-      a_get('/committees?apikey=abc123').
-        should have_been_made
-      committees['count'].should == 120
-      committees['results'].first.chamber.should == "senate"
+      expect(a_get('/committees').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(committees['count']).to eq(120)
+      expect(committees['results'].first.chamber).to eq('senate')
     end
   end
 
   describe '#bills' do
     before do
-      stub_get('/bills?apikey=abc123').
+      stub_get('/bills').
         to_return(:status => 200, :body => fixture('bills.json'))
     end
-    it "fetches legislation in the House and Senate" do
+    it 'fetches legislation in the House and Senate' do
       bills = @client.bills
-      a_get('/bills?apikey=abc123').
-        should have_been_made
-      bills['count'].should == 28614
-      bills['results'].first.bill_id.should == "s730-113"
+      expect(a_get('/bills').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(bills['count']).to eq(28614)
+      expect(bills['results'].first.bill_id).to eq('s730-113')
     end
   end
 
   describe '#bills_search' do
     before do
-      stub_get('/bills/search?apikey=abc123').
+      stub_get('/bills/search').
         to_return(:status => 200, :body => fixture('bills_search.json'))
     end
-    it "fetches legislation" do
+    it 'fetches legislation' do
       bills_search = @client.bills_search
-      a_get('/bills/search?apikey=abc123').
-        should have_been_made
-      bills_search['count'].should == 28614
-      bills_search['results'].first.bill_type.should == "hr"
+      expect(a_get('/bills/search').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(bills_search['count']).to eq(28614)
+      expect(bills_search['results'].first.bill_type).to eq('hr')
     end
   end
 
   describe '#votes' do
     before do
-      stub_get('/votes?apikey=abc123').
+      stub_get('/votes').
         to_return(:status => 200, :body => fixture('votes.json'))
     end
-    it "fetches roll call votes in Congress" do
+    it 'fetches roll call votes in Congress' do
       votes = @client.votes
-      a_get('/votes?apikey=abc123').
-        should have_been_made
-      votes['count'].should == 4647
-      votes['results'].first.roll_id.should == "h106-2013"
+      expect(a_get('/votes').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(votes['count']).to eq(4647)
+      expect(votes['results'].first.roll_id).to eq('h106-2013')
     end
   end
 
   describe '#floor_updates' do
     before do
-      stub_get('/floor_updates?apikey=abc123').
+      stub_get('/floor_updates').
         to_return(:status => 200, :body => fixture('floor_updates.json'))
     end
-    it "fetches to-the-minute updates from the floor of the House and Senate" do
+    it 'fetches to-the-minute updates from the floor of the House and Senate' do
       floor_updates = @client.floor_updates
-      a_get('/floor_updates?apikey=abc123').
-        should have_been_made
-      floor_updates['count'].should == 3066
-      floor_updates['results'].first.chamber.should == "senate"
+      expect(a_get('/floor_updates').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(floor_updates['count']).to eq(3066)
+      expect(floor_updates['results'].first.chamber).to eq('senate')
     end
   end
 
   describe '#hearings' do
     before do
-      stub_get('/hearings?apikey=abc123').
+      stub_get('/hearings').
         to_return(:status => 200, :body => fixture('hearings.json'))
     end
-    it "fetches committee hearings in Congress" do
+    it 'fetches committee hearings in Congress' do
       hearings = @client.hearings
-      a_get('/hearings?apikey=abc123').
-        should have_been_made
-      hearings['count'].should == 1279
-      hearings['results'].first.committee_id.should == "SSFR"
+      expect(a_get('/hearings').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(hearings['count']).to eq(1279)
+      expect(hearings['results'].first.committee_id).to eq('SSFR')
     end
   end
 
   describe '#upcoming_bills' do
     before do
-      stub_get('/upcoming_bills?apikey=abc123').
+      stub_get('/upcoming_bills').
         to_return(:status => 200, :body => fixture('upcoming_bills.json'))
     end
-    it "fetches bills scheduled for debate in the future, as announced by party leadership" do
+    it 'fetches bills scheduled for debate in the future, as announced by party leadership' do
       upcoming_bills = @client.upcoming_bills
-      a_get('/upcoming_bills?apikey=abc123').
-        should have_been_made
-      upcoming_bills['count'].should == 9
-      upcoming_bills['results'].first.bill_id.should == "s3457-113"
+      expect(a_get('/upcoming_bills').with(:headers => {'X-APIKEY' => 'abc123'})).to have_been_made
+      expect(upcoming_bills['count']).to eq(9)
+      expect(upcoming_bills['results'].first.bill_id).to eq('s3457-113')
     end
   end
 

data/spec/congress_spec.rb

@@ -1,18 +1,35 @@
 require 'helper'
 
 describe Congress do
-  describe ".new" do
-    it "should return a Congress::Client" do
-      Congress.new.should be_a Congress::Client
+  before do
+    Congress.key = 'abc1234'
+  end
+  describe '.new' do
+    it 'returns a Congress::Client' do
+      expect(Congress.new).to be_a Congress::Client
+    end
+    it 'sets key with a blog' do
+      Congress.new do |c|
+        c.key = 'abc123'
+      end
+      expect(Congress.key).to eq('abc123')
+    end
+    context 'with no api key' do
+      it 'raises an argument error' do
+        expect { Congress.new(nil) }.to raise_error ArgumentError
+      end
     end
   end
 
-  describe ".configure" do
-    it "should set 'name' and 'pass'" do
-      Congress.configure do |c|
-        c.key = "abc123"
-      end
-      Congress.key.should == "abc123"
+  describe '.method_missing' do
+    before do
+      stub_get('/legislators').
+        to_return(:status => 200, :body => fixture('legislators.json'))
+    end
+    it 'delegates to an instance of Congress::Client' do
+      client = Congress.new
+      expect(client).to receive(:legislators)
+      Congress.legislators
     end
   end
 end

data/spec/fixtures/google_geocoding.json

@@ -0,0 +1 @@
+{"results":[{"address_components":[{"long_name":"2169","short_name":"2169","types":["street_number"]},{"long_name":"Mission Street","short_name":"Mission St","types":["route"]},{"long_name":"Mission District","short_name":"Mission District","types":["neighborhood","political"]},{"long_name":"San Francisco","short_name":"SF","types":["locality","political"]},{"long_name":"San Francisco County","short_name":"San Francisco County","types":["administrative_area_level_2","political"]},{"long_name":"California","short_name":"CA","types":["administrative_area_level_1","political"]},{"long_name":"United States","short_name":"US","types":["country","political"]},{"long_name":"94110","short_name":"94110","types":["postal_code"]}],"formatted_address":"2169 Mission Street, San Francisco, CA 94110, USA","geometry":{"bounds":{"northeast":{"lat":37.7626032,"lng":-122.4194605},"southwest":{"lat":37.7626021,"lng":-122.4194789}},"location":{"lat":37.775,"lng":-122.418},"location_type":"RANGE_INTERPOLATED","viewport":{"northeast":{"lat":37.7639516302915,"lng":-122.4181207197085},"southwest":{"lat":37.7612536697085,"lng":-122.4208186802915}}},"types":["street_address"]}],"status":"OK"}

data/spec/helper.rb

@@ -5,20 +5,30 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage(100)
+end
 
 require 'congress'
 require 'rspec'
 require 'webmock/rspec'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 WebMock.disable_net_connect!(:allow => 'coveralls.io')
 
 def a_get(path)
-  a_request(:get, 'http://congress.api.sunlightfoundation.com' + path)
+  a_request(:get, Congress::Client::ENDPOINT + path)
 end
 
 def stub_get(path)
-  stub_request(:get, 'http://congress.api.sunlightfoundation.com' + path)
+  stub_request(:get, Congress::Client::ENDPOINT + path)
 end
 
 def fixture_path