Merge pull request #6 from BlockScore/v3

V3

Author: backus

.gitignore

@@ -18,3 +18,4 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+*.sublime-workspace

README.md

@@ -45,7 +45,7 @@ verification = verification.body
 ### Create a new verification
 
 ```python
-verification = client.verification.create('us_citizen','1980-01-01',{'ssn': '0000'},{'first': 'john', 'last': 'doe'},{'street1': '1 Infinite Loop', 'city': 'Palo Alto', 'state': 'ca', 'postal_code': '94309', 'country': 'us'})
+verification = client.verification.create('1980-01-01',{'ssn': '0000'},{'first': 'john', 'last': 'doe'},{'street1': '1 Infinite Loop', 'city': 'Palo Alto', 'state': 'ca', 'postal_code': '94309', 'country_code': 'us'})
 verification = verification.body
 ```
 

blockscore/api/__init__.py

@@ -1,3 +1,3 @@
 # Import all the classes into api module
-from . import verifications
-from . import questions
+from . import verification
+from . import question_set

blockscore/api/verification.py

@@ -8,14 +8,12 @@ def __init__(self, client):
 	# 
 	# '/verifications' POST
 	#
-	# type - 
 	# date_of_birth - 
 	# identification - 
 	# name - 
 	# address - 
-	def create(self, type, date_of_birth, identification, name, address, options = {}):
+	def create(self, date_of_birth, identification, name, address, options = {}):
 		body = options['body'] if 'body' in options else {}
-		body['type'] = type
 		body['date_of_birth'] = date_of_birth
 		body['identification'] = identification
 		body['name'] = name

blockscore/http_client/__init__.py

@@ -20,15 +20,15 @@ def __init__(self, auth, options):
 
 		self.options = {
 			'base': 'https://api.blockscore.com/',
-			'user_agent': 'blockscore-python/1.0.0 (https://github.com/BlockScore/blockscore-python)'
+			'user_agent': 'blockscore-python/3.0.0 (https://github.com/BlockScore/blockscore-python)'
 		}
 
 		self.options.update(options)
 
 		self.base = self.options['base']
 
 		self.headers = {
-			'Accept': 'application/vnd.blockscore+json;version=2',
+			'Accept': 'application/vnd.blockscore+json;version=3',
 			'user-agent': self.options['user_agent']
 		}
 

setup.py

@@ -8,7 +8,7 @@
 
 setup(
 	name='blockscore',
-	version='1.0.0',
+	version='3.0.0',
 	description='Official BlockScore API library client for python',
 	author='John Backus',
 	author_email='[email protected]',

test/verifications.py

@@ -9,15 +9,15 @@ class TestBlockscore(unittest.TestCase):
 
     def setUp(self):
         try:
-            self.client = blockscore.Client({'api_key': 'your_api_key'})
+            self.client = blockscore.Client({'api_key': os.environ['BLOCKSCORE_API']})
         except KeyError:
             sys.stderr.write("To run tests, you must have a BLOCKSCORE_API environment variable with a test api key\n")
             sys.exit(2)
-        self.test_identity = ['us_citizen','1980-01-01',{'ssn': '0000'},{'first': 'john', 'last': 'doe'},{'street1': '1 Infinite Loop', 'city': 'Palo Alto', 'state': 'ca', 'postal_code': '94309', 'country': 'us'}]
+        self.test_identity = ['1980-01-01',{'ssn': '0000'},{'first': 'john', 'last': 'doe'},{'street1': '1 Infinite Loop', 'city': 'Palo Alto', 'state': 'ca', 'postal_code': '94309', 'country_code': 'us'}]
 
     def test_create_verification(self):
         verif = self.client.verification.create(*self.test_identity)
-        self.assertEqual(verif.body['date_of_birth'], self.test_identity[1])
+        self.assertEqual(verif.body['date_of_birth'], self.test_identity[0])
 
     def test_retrieve_verification(self):
         verif = self.client.verification.create(*self.test_identity)
@@ -52,7 +52,7 @@ def test_score_questions(self):
         verif_id = verif['id']
         qset = self.client.question_set.create(verif_id)
         qset = qset.body
-        qset_id = qset['question_set_id']
+        qset_id = qset['id']
         score = self.client.question_set.score(verif_id, qset_id, [
             {'question_id':1, 'answer_id':1},
             {'question_id':2, 'answer_id':1},
@@ -61,7 +61,7 @@ def test_score_questions(self):
             {'question_id':5, 'answer_id':1}
         ])
         score = score.body
-        self.assertEqual(score['question_set_id'],qset_id)
+        self.assertEqual(score['id'],qset_id)
         self.assertIsInstance(score['score'],float)