Merge pull request #103 from z3c0/test

v1.0.3

Author: z3c0

README.md

@@ -335,6 +335,7 @@ Output:
 
 The `load` method manually loads the dataset specified when instantiating `CongressBills`
 
+[Return to top](#table-of-contents)
 
 ***
 

vistos/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.3

vistos/src/gpo/fields.py

@@ -55,3 +55,4 @@ class Bill:
     PUBLISHER = 'publisher'
     COMMITTEES = 'committees'
     MEMBERS = 'members'
+    TEXT = 'text'

vistos/src/gpo/govinfo.py

@@ -21,8 +21,10 @@ class GovInfoBillRecord(dict):
     """A dict-like object for handling Congressional bill
     data returned from the GovInfo API"""
 
-    def __init__(self, bill_govinfo: dict):
+    def __init__(self, bill_govinfo: dict, api_key: str):
         super().__init__()
+        self._download_text = None
+
         try:
             bill_version = bill_govinfo['billVersion']
         except KeyError:
@@ -78,6 +80,15 @@ def __init__(self, bill_govinfo: dict):
         except KeyError:
             self[_fields.Bill.MEMBERS] = None
 
+        self[_fields.Bill.TEXT] = None
+
+        try:
+            text_url = bill_govinfo['download']['txtLink']
+            self._download_text = \
+                _create_download_bill_text_func(text_url, api_key)
+        except (KeyError, ValueError):
+            self._download_text = None
+
     @property
     def bill_id(self) -> str:
         return self[_fields.Bill.BILL_ID]
@@ -138,6 +149,14 @@ def committees(self) -> List:
     def members(self) -> List:
         return self[_fields.Bill.MEMBERS]
 
+    @property
+    def text(self) -> str:
+        return self[_fields.Bill.TEXT]
+
+    def download_text(self):
+        if self._download_text:
+            self[_fields.Bill.TEXT] = self._download_text()
+
 
 class GovInfoCongressRecord(dict):
     """A dict-like object for handling Congressional
@@ -224,6 +243,13 @@ def check_for_govinfo_bills(congress: int, api_key: str):
     return _bills_data_exists(api_key, congress)
 
 
+def _create_download_bill_text_func(text_url: str, api_key: str):
+    """Create callable for downloading bill text"""
+    def download_bill_text():
+        return _get_text_from(f'{text_url}?api_key={api_key}')
+    return download_bill_text
+
+
 def _cdir_data_exists(api_key: str, congress: int) -> bool:
     """Returns true if a cdir package is available for the given congress"""
     endpoint = \
@@ -441,7 +467,7 @@ def _get_text_concurrently():
     bill_records = []
     for package_text in package_text_data:
         package_json = _json.loads(package_text)
-        bill_records.append(GovInfoBillRecord(package_json))
+        bill_records.append(GovInfoBillRecord(package_json, api_key))
 
     return bill_records