Update docs for congress API. Update copyright to 2014.

Author: dcloud

docs/source/conf.py

@@ -34,7 +34,7 @@
 
 # General information about the project.
 project = u'python-sunlight'
-copyright = u'2012, Sunlight Labs'
+copyright = u'2014, Sunlight Labs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -84,7 +84,16 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+
+# on_rtd is whether we are on readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# otherwise, readthedocs.org uses their theme by default, so no need to specify it
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/source/services/congress.rst

@@ -4,42 +4,105 @@
 sunlight.congress
 =================
 
-The `Sunlight Labs Congress API
-<http://services.sunlightlabs.com/docs/Sunlight_Congress_API/>`_
-provides methods for obtaining basic information on Members of Congress,
-legislator IDs used by various websites, and geographical lookups between
-places and the politicians that represent them. The primary purpose of
-the API is to facilitate mashups involving politicians and the various
-other APIs that are out there.
+The `Sunlight Congress API
+<http://sunlightlabs.github.io/congress/>`_
+provides methods for obtaining information for the people and work of
+Congress. Information on legislators, districts, committees, bills,
+votes, as well as real-time notice of hearings, floor activity and
+upcoming bills.
 
+Congress
+========
+
+.. autoclass:: sunlight.services.congress.Congress
+
+    Class methods that do not specify positional arguments accept `filtering <http://sunlightlabs.github.io/congress/index.html#filtering>`_, `pagination <http://sunlightlabs.github.io/congress/index.html#pagination>`_, and `sorting <http://sunlightlabs.github.io/congress/index.html#sorting>`_ parameters as keyword arguments. See each method's API page for specfic filtering arguments.
 
 Legislators
-===========
+-----------
 
 This set of Congress API methods deal with federal legislators.
 For detailed documentaion on the return value of these methods see
-`legislator fields <http://services.sunlightlabs.com/docs/congressapi/legislators.get(List)/>`_.
+`legislator fields <http://sunlightlabs.github.io/congress/legislators.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.legislators
+.. automethod:: sunlight.services.congress.Congress.legislator
+.. automethod:: sunlight.services.congress.Congress.all_legislators_in_office
+.. automethod:: sunlight.services.congress.Congress.locate_legislators_by_lat_lon
+.. automethod:: sunlight.services.congress.Congress.locate_legislators_by_zip
+
+Bills
+=====
+
+This set of Congress API methods deal with Congressional bills.
+For detailed documentaion on the return value of these methods see
+`bill fields <http://sunlightlabs.github.io/congress/bills.html#fields>`_.
 
-.. automethod:: sunlight.services.congress.congress.legislators
-.. automethod:: sunlight.services.congress.congress.legislator_search
-.. automethod:: sunlight.services.congress.congress.legislators_for_zip
-.. automethod:: sunlight.services.congress.congress.legislators_for_lat_lon
+.. automethod:: sunlight.services.congress.Congress.bills
+.. automethod:: sunlight.services.congress.Congress.bill
+.. automethod:: sunlight.services.congress.Congress.search_bills
+.. automethod:: sunlight.services.congress.Congress.upcoming_bills
 
 Districts
 =========
 
-Pair of methods for retrieving districts.  District dictionaries have a `'state'` and `'number'` key
-(ex. `{'state': 'NC', 'number': '3'}`)
+Pair of methods for retrieving districts.  District dictionaries have a `'state'` and `'district'` key
+(ex. `{'state': 'NC', 'district': '4'}`).
 
 
-.. automethod:: sunlight.services.congress.congress.districts_for_zip
-.. automethod:: sunlight.services.congress.congress.districts_for_lat_lon
+.. automethod:: sunlight.services.congress.Congress.locate_districts_by_lat_lon
+.. automethod:: sunlight.services.congress.Congress.locate_districts_by_zip
 
 Committees
 ==========
 
-Methods for dealing with committees.
+This set of Congress API methods deal with legislative committees.
+For detailed documentaion on the return value of these methods see
+`committee fields <http://sunlightlabs.github.io/congress/committees.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.committees
+
+Amendments
+==========
+
+This set of Congress API methods deal with amendments.
+For detailed documentaion on the return value of these methods see
+`committee fields <http://sunlightlabs.github.io/congress/amendments.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.amendments
+
+Votes
+=====
+
+This set of Congress API methods deal with votes.
+For detailed documentaion on the return value of these methods see
+`vote fields <http://sunlightlabs.github.io/congress/votes.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.votes
+
+Floor Updates
+=============
+
+This set of Congress API methods deal with floor updates.
+For detailed documentaion on the return value of these methods see
+`floor update fields <http://sunlightlabs.github.io/congress/floor_updates.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.floor_updates
+
+Hearings
+========
+
+This set of Congress API methods deal with committee hearings.
+For detailed documentaion on the return value of these methods see
+`hearing fields <http://sunlightlabs.github.io/congress/hearings.html#fields>`_.
+
+.. automethod:: sunlight.services.congress.Congress.hearings
+
+Nominations
+===========
+
+This set of Congress API methods deal with nominations made by the President of the United States.
+For detailed documentaion on the return value of these methods see
+`nominations fields <http://sunlightlabs.github.io/congress/nominations.html#fields>`_.
 
-.. automethod:: sunlight.services.congress.congress.committees
-.. automethod:: sunlight.services.congress.congress.committee_detail
-.. automethod:: sunlight.services.congress.congress.committees_for_legislator
+.. automethod:: sunlight.services.congress.Congress.nominations

docs/source/services/congress_deprecated.rst

@@ -0,0 +1,10 @@
+.. _sunlight.congress_deprecated:
+
+=================
+sunlight.congress_deprecated
+=================
+
+The `Sunlight Labs Congress API
+<http://services.sunlightlabs.com/docs/Sunlight_Congress_API/>`_
+is deprecated in favor of the new `Sunlight Congress API <http://sunlightlabs.github.io/congress/migration.html>`_
+