congress 0.0.6 → 0.1.0

data/.travis.yml

@@ -1,8 +1,10 @@
+language: ruby
 rvm:
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - rbx
-  - rbx-2.0
-  - ree
+  - 2.0.0

data/Gemfile

@@ -1,7 +1,21 @@
 source 'http://rubygems.org'
 
+gem 'rake'
+
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end
 
+group :development do
+  gem 'json', :platforms => :ruby_18
+  gem 'kramdown'
+  gem 'simplecov'
+  gem 'yard'
+end
+
+group :test do
+  gem 'rspec'
+  gem 'webmock'
+end
+
 gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Code for America
+Copyright (c) 2011-2013, Code for America
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

data/README.md

@@ -1,49 +1,60 @@
 # Ruby wrapper for the Real-Time Congress API
+
+[![Gem Version](https://badge.fury.io/rb/congress.png)][gem]
+[![Build Status](https://secure.travis-ci.org/codeforamerica/congress.png)][travis]
+[![Dependency Status](https://gemnasium.com/codeforamerica/congress.png?travis)][gemnasium]
+[![Code Climate](https://codeclimate.com/github/codeforamerica/congress.png)][codeclimate]
+[gem]: https://rubygems.org/gems/congress
+[travis]: http://travis-ci.org/codeforamerica/congress
+[gemnasium]: https://gemnasium.com/codeforamerica/congress
+[codeclimate]: https://codeclimate.com/github/codeforamerica/congress
+
 The Real-Time Congress (RTC) API is a RESTful API over the artifacts of
 Congress, in as close to real-time as possible.
 
-## <a name="installation">Installation</a>
+## Installation
     gem install congress
 
-## <a name="documentation">Documentation</a>
-[http://rdoc.info/gems/congress](http://rdoc.info/gems/congress)
+## Documentation
+[http://rdoc.info/gems/congress][documentation]
+[documentation]: http://rdoc.info/gems/congress
 
-## <a name="ci">Continuous Integration</a>
-[![Build Status](https://secure.travis-ci.org/codeforamerica/congress.png)](http://travis-ci.org/codeforamerica/congress)
+## Usage Examples
+```ruby
+require 'rubygems'
+require 'congress'
 
-## <a name="examples">Usage Examples</a>
-    require 'rubygems'
-    require 'congress'
+# An API key is required
+# You can obtain one from http://services.sunlightlabs.com/accounts/register/
+Congress.key = YOUR_RTC_API_KEY
 
-    # An API key is required
-    # You can obtain one from http://services.sunlightlabs.com/accounts/register/
-    Congress.key = YOUR_RTC_API_KEY
+# Fetch bills introduced bills and resolutions in Congress
+puts Congress.bills
 
-    # Fetch bills introduced bills and resolutions in Congress
-    puts Congress.bills
+# Fetch votes taken in Congress
+puts Congress.votes
 
-    # Fetch votes taken in Congress
-    puts Congress.votes
+# Fetch amendments to bills and resolutions offered in Congress
+puts Congress.amendments
 
-    # Fetch amendments to bills and resolutions offered in Congress
-    puts Congress.amendments
+# Fetch videos from the U.S. House of Representatives and from the White House
+puts Congress.videos
 
-    # Fetch videos from the U.S. House of Representatives and from the White House
-    puts Congress.videos
+# Fetch updates from the floor of each chamber of Congress
+puts Congress.floor_updates
 
-    # Fetch updates from the floor of each chamber of Congress
-    puts Congress.floor_updates
+# Fetch upcoming scheduled committee hearings in the House and Senate
+puts Congress.committee_hearings
 
-    # Fetch upcoming scheduled committee hearings in the House and Senate
-    puts Congress.committee_hearings
+# Fetch links to various kinds of documents produced by agencies within Congress
+puts Congress.documents
+```
 
-    # Fetch links to various kinds of documents produced by agencies within Congress
-    puts Congress.documents
+## Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help improve
+this project.
 
-## <a name="contributing">Contributing</a>
-In the spirit of [free
-software](http://www.fsf.org/licensing/essays/free-sw.html), **everyone** is
-encouraged to help improve this project.
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
 
 Here are some ways *you* can contribute:
 
@@ -55,45 +66,51 @@ Here are some ways *you* can contribute:
 * by writing code (**no patch is too small**: fix typos, add comments, clean up
   inconsistent whitespace)
 * by refactoring code
-* by closing [issues](https://github.com/codeforamerica/congress/issues)
+* by fixing [issues][]
 * by reviewing patches
 
-## <a name="issues">Submitting an Issue</a>
-We use the [GitHub issue tracker](https://github.com/codeforamerica/congress/issues) to
-track bugs and features. Before submitting a bug report or feature request,
-check to make sure it hasn't already been submitted. You can indicate support
-for an existing issuse by voting it up. When submitting a bug report, please
-include a [Gist](https://gist.github.com/) that includes a stack trace and any
-details that may be necessary to reproduce the bug, including your gem version,
-Ruby version, and operating system. Ideally, a bug report should include a pull
-request with failing specs.
-
-## <a name="pulls">Submitting a Pull Request</a>
-1. Fork the project.
-2. Create a topic branch.
-3. Implement your feature or bug fix.
-4. Add documentation for your feature or bug fix.
-5. Run <tt>bundle exec rake doc:yard</tt>. If your changes are not 100%
-   documented, go back to step 4.
-6. Add specs for your feature or bug fix.
-7. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go
-   back to step 6.
-8. Commit and push your changes.
-9. Submit a pull request. Please do not include changes to the gemspec,
-   version, or history file. (If you want to create your own version for some
-   reason, please do so in a separate commit.)
-
-## <a name="rubies">Supported Rubies</a>
-This library aims to support and is [tested
-against](http://travis-ci.org/codeforamerica/congress) the following Ruby
+[issues]: https://github.com/codeforamerica/congress/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add documentation for your feature or bug fix.
+9. Run `bundle exec rake yard`. If your changes are not 100% documented, go
+   back to step 8.
+10. Add, commit, and push your changes.
+11. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+## Supported Rubies
+This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
 * Ruby 1.8.7
-* Ruby 1.9.1
 * Ruby 1.9.2
-* [JRuby](http://www.jruby.org/)
-* [Rubinius](http://rubini.us/)
-* [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
+* Ruby 1.9.3
+* Ruby 2.0.0
+* [JRuby][]
+* [Rubinius][]
+
+[jruby]: http://www.jruby.org/
+[rubinius]: http://rubini.us/
 
 If something doesn't work on one of these interpreters, it should be considered
 a bug.
@@ -109,8 +126,7 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-## <a name="copyright">Copyright</a>
-Copyright (c) 2011, Code for America. All rights reserved.
-See [LICENSE](https://github.com/codeforamerica/congress/blob/master/LICENSE.md) for details.
+## Copyright
+Copyright (c) 2011-2013, Code for America. See [LICENSE][] for details.
 
-[![Code for America Tracker](http://stats.codeforamerica.org/codeforamerica/congress.png)](http://stats.codeforamerica.org/projects/congress)
+[license]: https://github.com/codeforamerica/congress/blob/master/LICENSE.md

data/Rakefile

@@ -1,5 +1,3 @@
-#!/usr/bin/env rake
-
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/congress.gemspec

@@ -2,18 +2,11 @@
 require File.expand_path('../lib/congress/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_dependency 'faraday', '~> 0.7'
-  gem.add_dependency 'faraday_middleware', '~> 0.7'
-  gem.add_dependency 'hashie', '~> 1.1'
-  gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'rash', '~> 0.3'
-  gem.add_development_dependency 'json'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdiscount'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'yard'
+  gem.add_dependency 'faraday', '~> 0.8.7'
+  gem.add_dependency 'faraday_middleware', '~> 0.9.0'
+  gem.add_dependency 'hashie', '~> 2.0'
+  gem.add_dependency 'rash', '~> 0.4'
+  gem.add_development_dependency 'bundler', '~> 1.0'
   gem.author      = "Erik Michaels-Ober"
   gem.description = %q{Ruby wrapper for the Real-Time Congress API. The Real-Time Congress API is a RESTful API over the artifacts of Congress, in as close to real-time as possible.}
   gem.email       = 'sferik@gmail.com'

data/lib/congress/client.rb

@@ -3,77 +3,127 @@ require 'congress/request'
 
 module Congress
   class Client
-    include Congress::Connection
-    include Congress::Request
+    include Connection
+    include Request
 
-    # Fetch bills introduced bills and resolutions in Congress
+    # Current legislators' names, IDs, biography, and social media.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.bills
-    def bills(options={})
-      get('/api/v1/bills.json', options.merge(api_key))
+    #   Congress.legislators
+    def legislators(options={})
+      get('/legislators', options.merge(api_key))
     end
 
-    # Fetch votes taken in Congress
+    # Find representatives and senators for a latitude/longitude or zip.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.votes
-    def votes(options={})
-      get('/api/v1/votes.json', options.merge(api_key))
+    #   Congress.legislators_locate(94107)
+    #   Congress.legislators_locate(37.775, -122.418)
+    def legislators_locate(*args)
+      options = args.last.is_a?(::Hash) ? args.pop : {}
+      if args.size == 1
+        options[:zip] = args.pop
+      elsif args.size == 2
+        options[:longitude] = args.pop
+        options[:latitude] = args.pop
+      else
+        raise ArgumentError, "Must pass a latitude/longitude or zip"
+      end
+      get('/legislators/locate', options.merge(api_key))
+    end
+
+    # Find congressional districts for a latitude/longitude or zip.
+    #
+    # @return [Hashie::Rash]
+    # @example
+    #   Congress.key = YOUR_RTC_API_KEY
+    #   Congress.districts_locate(94107)
+    #   Congress.districts_locate(37.775, -122.418)
+    def districts_locate(*args)
+      options = args.last.is_a?(::Hash) ? args.pop : {}
+      if args.size == 1
+        options[:zip] = args.pop
+      elsif args.size == 2
+        options[:longitude] = args.pop
+        options[:latitude] = args.pop
+      else
+        raise ArgumentError, "Must pass a latitude/longitude or zip"
+      end
+      get('/districts/locate', options.merge(api_key))
+    end
+
+    # Current committees, subcommittees, and their membership.
+    #
+    # @return [Hashie::Rash]
+    # @example
+    #   Congress.key = YOUR_RTC_API_KEY
+    #   Congress.committees
+    def committees(options={})
+      get('/committees', options.merge(api_key))
     end
 
-    # Fetch amendments to bills and resolutions offered in Congress
+    # Legislation in the House and Senate, back to 2009. Updated daily.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.amendments
-    def amendments(options={})
-      get('/api/v1/amendments.json', options.merge(api_key))
+    #   Congress.bills
+    def bills(options={})
+      get('/bills', options.merge(api_key))
     end
 
-    # Fetch videos from the U.S. House of Representatives and from the White House
+    # ull text search over legislation.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.videos
-    def videos(options={})
-      get('/api/v1/videos.json', options.merge(api_key))
+    #   Congress.bills_search
+    def bills_search(options={})
+      get('/bills/search', options.merge(api_key))
+    end
+
+    # Roll call votes in Congress, back to 2009. Updated within minutes of votes.
+    #
+    # @return [Hashie::Rash]
+    # @example
+    #   Congress.key = YOUR_RTC_API_KEY
+    #   Congress.votes
+    def votes(options={})
+      get('/votes', options.merge(api_key))
     end
 
-    # Fetch updates from the floor of each chamber of Congress
+    # To-the-minute updates from the floor of the House and Senate.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
     #   Congress.floor_updates
     def floor_updates(options={})
-      get('/api/v1/floor_updates.json', options.merge(api_key))
+      get('/floor_updates', options.merge(api_key))
     end
 
-    # Fetch upcoming scheduled committee hearings in the House and Senate
+    # Committee hearings in Congress. Updated as hearings are announced.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.committee_hearings
-    def committee_hearings(options={})
-      get('/api/v1/committee_hearings.json', options.merge(api_key))
+    #   Congress.hearings
+    def hearings(options={})
+      get('/hearings', options.merge(api_key))
     end
 
-    # Fetch links to various kinds of documents produced by agencies within Congress
+    # Bills scheduled for debate in the future, as announced by party leadership.
     #
     # @return [Hashie::Rash]
     # @example
     #   Congress.key = YOUR_RTC_API_KEY
-    #   Congress.documents
-    def documents(options={})
-      get('/api/v1/documents.json', options.merge(api_key))
+    #   Congress.upcoming_bills
+    def upcoming_bills(options={})
+      get('/upcoming_bills', options.merge(api_key))
     end
 
     private

data/lib/congress/connection.rb

@@ -5,7 +5,7 @@ module Congress
     private
 
     def connection
-      Faraday.new(:url => 'http://api.realtimecongress.org') do |connection|
+      Faraday.new(:url => 'http://congress.api.sunlightfoundation.com') do |connection|
         connection.use Faraday::Request::UrlEncoded
         connection.use Faraday::Response::RaiseError
         connection.use Faraday::Response::Rashify

data/lib/congress/version.rb

@@ -1,3 +1,3 @@
 module Congress
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/congress/client_spec.rb

@@ -8,108 +8,187 @@ describe Congress::Client do
     end
   end
 
-  describe '#bills' do
+  describe '#legislators' do
     before do
-      stub_get('/api/v1/bills.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('bills.json'))
+      stub_get('/legislators?apikey=abc123').
+        to_return(:status => 200, :body => fixture('legislators.json'))
     end
-
-    it "should fetch bills introduced bills and resolutions in Congress" do
-      bills = @client.bills
-      a_get('/api/v1/bills.json?apikey=abc123').
+    it "fetches current legislators' names, IDs, biography, and social media" do
+      legislators = @client.legislators
+      a_get('/legislators?apikey=abc123').
         should have_been_made
-      bills['count'].should == 17836
-      bills['bills'].first.bill_id.should == "hres314-112"
+      legislators['count'].should == 539
+      legislators['results'].first.bioguide_id.should == "K000385"
     end
   end
 
-  describe '#votes' do
-    before do
-      stub_get('/api/v1/votes.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('votes.json'))
+  describe '#legislators_locate' do
+    context "with a zip code passed" do
+      before do
+        stub_get('/legislators/locate?apikey=abc123&zip=94107').
+          to_return(:status => 200, :body => fixture('legislators_locate.json'))
+      end
+      it "fetches representatives and senators for a latitude/longitude or zip" 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"
+      end
+    end
+    context "with a latitude and longitude passed" do
+      before do
+        stub_get('/legislators/locate?apikey=abc123&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 or zip" 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"
+      end
+    end
+    context "with no arguments passed" do
+      it "raises an argument error" do
+        lambda {
+          @client.legislators_locate
+        }.should raise_error ArgumentError
+      end
     end
+  end
 
-    it "should fetch votes taken in Congress" do
-      votes = @client.votes
-      a_get('/api/v1/votes.json?apikey=abc123').
-        should have_been_made
-      votes['count'].should == 5103
-      votes['votes'].first.roll_id.should == "s91-2011"
+  describe '#districts_locate' do
+    context "with a zip code passed" do
+      before do
+        stub_get('/districts/locate?apikey=abc123&zip=94107').
+          to_return(:status => 200, :body => fixture('districts_locate.json'))
+      end
+      it "fetches congressional districts for a latitude/longitude or zip" 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
+      end
+    end
+    context "with a latitude and longitude passed" do
+      before do
+        stub_get('/districts/locate?apikey=abc123&latitude=37.775&longitude=-122.418').
+          to_return(:status => 200, :body => fixture('districts_locate.json'))
+      end
+      it "fetches congressional districts for a latitude/longitude or zip" 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
+      end
+    end
+    context "with no arguments passed" do
+      it "raises an argument error" do
+        lambda {
+          @client.districts_locate
+        }.should raise_error ArgumentError
+      end
     end
   end
 
-  describe '#amendments' do
+  describe '#committees' do
     before do
-      stub_get('/api/v1/amendments.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('amendments.json'))
+      stub_get('/committees?apikey=abc123').
+        to_return(:status => 200, :body => fixture('committees.json'))
+    end
+    it "fetches legislation in the House and Senate" do
+      committees = @client.committees
+      a_get('/committees?apikey=abc123').
+        should have_been_made
+      committees['count'].should == 120
+      committees['results'].first.chamber.should == "senate"
     end
+  end
 
-    it "should fetch amendments to bills and resolutions offered in Congress" do
-      amendments = @client.amendments
-      a_get('/api/v1/amendments.json?apikey=abc123').
+  describe '#bills' do
+    before do
+      stub_get('/bills?apikey=abc123').
+        to_return(:status => 200, :body => fixture('bills.json'))
+    end
+    it "fetches legislation in the House and Senate" do
+      bills = @client.bills
+      a_get('/bills?apikey=abc123').
         should have_been_made
-      amendments['count'].should == 6606
-      amendments['amendments'].first.bill_id.should == "s679-112"
+      bills['count'].should == 28614
+      bills['results'].first.bill_id.should == "s730-113"
     end
   end
 
-  describe '#videos' do
+  describe '#bills_search' do
     before do
-      stub_get('/api/v1/videos.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('videos.json'))
+      stub_get('/bills/search?apikey=abc123').
+        to_return(:status => 200, :body => fixture('bills_search.json'))
+    end
+    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"
     end
+  end
 
-    it "should fetch videos from the U.S. House of Representatives and from the White House" do
-      videos = @client.videos
-      a_get('/api/v1/videos.json?apikey=abc123').
+  describe '#votes' do
+    before do
+      stub_get('/votes?apikey=abc123').
+        to_return(:status => 200, :body => fixture('votes.json'))
+    end
+    it "fetches roll call votes in Congress" do
+      votes = @client.votes
+      a_get('/votes?apikey=abc123').
         should have_been_made
-      videos['count'].should == 1034
-      videos['videos'].first.video_id.should == "whitehouse-1308389400-weekly-address-celebrating-fathers"
+      votes['count'].should == 4647
+      votes['results'].first.roll_id.should == "h106-2013"
     end
   end
 
   describe '#floor_updates' do
     before do
-      stub_get('/api/v1/floor_updates.json?apikey=abc123').
+      stub_get('/floor_updates?apikey=abc123').
         to_return(:status => 200, :body => fixture('floor_updates.json'))
     end
-
-    it "should fetch updates from the floor of each chamber of Congress" do
+    it "fetches to-the-minute updates from the floor of the House and Senate" do
       floor_updates = @client.floor_updates
-      a_get('/api/v1/floor_updates.json?apikey=abc123').
+      a_get('/floor_updates?apikey=abc123').
         should have_been_made
-      floor_updates['count'].should == 2183
-      floor_updates['floor_updates'].first.chamber.should == "senate"
+      floor_updates['count'].should == 3066
+      floor_updates['results'].first.chamber.should == "senate"
     end
   end
 
-  describe '#committee_hearings' do
+  describe '#hearings' do
     before do
-      stub_get('/api/v1/committee_hearings.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('committee_hearings.json'))
+      stub_get('/hearings?apikey=abc123').
+        to_return(:status => 200, :body => fixture('hearings.json'))
     end
-
-    it "should fetch upcoming scheduled committee hearings in the House and Senate" do
-      committee_hearings = @client.committee_hearings
-      a_get('/api/v1/committee_hearings.json?apikey=abc123').
+    it "fetches committee hearings in Congress" do
+      hearings = @client.hearings
+      a_get('/hearings?apikey=abc123').
         should have_been_made
-      committee_hearings['count'].should == 482
-      committee_hearings['committee_hearings'].first.committee_id.should == "SSVA"
+      hearings['count'].should == 1279
+      hearings['results'].first.committee_id.should == "SSFR"
     end
   end
 
-  describe '#documents' do
+  describe '#upcoming_bills' do
     before do
-      stub_get('/api/v1/documents.json?apikey=abc123').
-        to_return(:status => 200, :body => fixture('documents.json'))
+      stub_get('/upcoming_bills?apikey=abc123').
+        to_return(:status => 200, :body => fixture('upcoming_bills.json'))
     end
-
-    it "should fetch links to various kinds of documents produced by agencies within Congress" do
-      documents = @client.documents
-      a_get('/api/v1/documents.json?apikey=abc123').
+    it "fetches committee hearings in Congress" do
+      upcoming_bills = @client.upcoming_bills
+      a_get('/upcoming_bills?apikey=abc123').
         should have_been_made
-      documents['count'].should == 124
-      documents['documents'].first.document_type.should == "whip_notice"
+      upcoming_bills['count'].should == 9
+      upcoming_bills['results'].first.bill_id.should == "s3457-113"
     end
   end