Version Bump 2.0.0: Naming conventions

Author: thinkingserious

.env_sample

@@ -3,11 +3,15 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.2.4] - 2016-3-02
+## [2.0.0] - 2016-06-03
+### Changed
+- Made the Response variables non-redundant. e.g. response.response_body becomes response.body
+
+## [1.2.4] - 2016-03-02
 ### Fixed
 - Getting README to display in PyPi
 
-## [1.2.3] - 2016-3-01
+## [1.2.3] - 2016-03-01
 ### Added
 - Can now reuse part of the chaining construction for multiple urls/requests
 - Thanks to [Kevin Gillette](https://github.com/extemporalgenome)!

CHANGELOG.md

@@ -30,8 +30,8 @@ global_headers = {"Authorization": "Basic XXXXXXX"}
 client = Client(host='base_url', request_headers=global_headers)
 client.your.api._(param).call.get()
 print response.status_code
-print response.response_headers
-print response.response_body
+print response.headers
+print response.body
 ```
 
 `POST /your/api/{param}/call` with headers, query parameters and a request body with versioning.
@@ -47,8 +47,8 @@ response = client.your.api._(param).call.post(request_body=data,
                                               query_params=query_params,
                                               request_headers=request_headers)
 print response.status_code
-print response.response_headers
-print response.response_body
+print response.headers
+print response.body
 ```
 
 # Usage

README.md

@@ -4,17 +4,14 @@
     from os import sys, path
     sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
     from python_http_client.client import Client
-    from python_http_client.config import Config
 
 
-local_path = '{0}/..'.format(os.path.abspath(os.path.dirname(__file__)))
-Config(local_path)
 api_key = os.environ.get('SENDGRID_API_KEY')
 headers = {
     "Authorization": 'Bearer {0}'.format(api_key),
     "Content-Type": "application/json"
 }
-client = Client(host=os.environ.get('LOCAL_HOST'),
+client = Client(host='http://localhost:4010',
                 request_headers=headers,
                 version=3)
 

examples/example.py

@@ -2,9 +2,7 @@
 import json
 import python_http_client
 
-path = '{0}/..'.format(os.path.abspath(os.path.dirname(__file__)))
-python_http_client.Config(path)
-host = os.environ.get('HOST')  # http://api.sendgrid.com
+host = "https://api.sendgrid.com"
 api_key = os.environ.get('SENDGRID_API_KEY')
 request_headers = {
     "Authorization": 'Bearer {0}'.format(api_key),
@@ -17,9 +15,9 @@
 
 # GET collection
 response = client.api_keys.get()
-print(response.response_headers)
 print(response.status_code)
-print(response.response_body)
+print(response.headers)
+print(response.body)
 
 # POST
 data = {
@@ -31,26 +29,26 @@
     ]
 }
 response = client.api_keys.post(request_body=data)
-print(response.response_headers)
 print(response.status_code)
-print(response.response_body)
-json_response = json.loads(response.response_body)
+print(response.headers)
+print(response.body)
+json_response = json.loads(response.body)
 api_key_id = json_response['api_key_id']
 
 # GET single
 response = client.api_keys._(api_key_id).get()
-print(response.response_headers)
 print(response.status_code)
-print(response.response_body)
+print(response.headers)
+print(response.body)
 
 # PATCH
 data = {
     "name": "A New Hope"
 }
 response = client.api_keys._(api_key_id).patch(request_body=data)
-print(response.response_headers)
 print(response.status_code)
-print(response.response_body)
+print(response.headers)
+print(response.body)
 
 # PUT
 data = {
@@ -61,11 +59,12 @@
     ]
 }
 response = client.api_keys._(api_key_id).put(request_body=data)
-print(response.response_headers)
 print(response.status_code)
-print(response.response_body)
+print(response.headers)
+print(response.body)
 
 # DELETE
 response = client.api_keys._(api_key_id).delete()
-print(response.response_headers)
 print(response.status_code)
+print(response.headers)
+

examples/live_sendgrid_example.py

@@ -1,2 +1 @@
 from .client import Client
-from .config import Config

python_http_client/__init__.py

@@ -21,8 +21,8 @@ def __init__(self, response):
         :type response:  urllib response object
         """
         self._status_code = response.getcode()
-        self._response_body = response.read()
-        self._response_headers = response.info()
+        self._body = response.read()
+        self._headers = response.info()
 
     @property
     def status_code(self):
@@ -32,18 +32,18 @@ def status_code(self):
         return self._status_code
 
     @property
-    def response_body(self):
+    def body(self):
         """
         :return: response from the API
         """
-        return self._response_body
+        return self._body
 
     @property
-    def response_headers(self):
+    def headers(self):
         """
         :return: dict of response headers
         """
-        return self._response_headers
+        return self._headers
 
 
 class Client(object):

python_http_client/client.py

@@ -13,7 +13,7 @@ def getRequires():
     return deps
 
 base_url = 'https://github.com/sendgrid/'
-version = '1.2.4'
+version = '2.0.0'
 setup(
     name='python_http_client',
     version=version,

python_http_client/config.py

@@ -4,7 +4,6 @@
     import unittest2 as unittest
 except ImportError:
     import unittest
-from python_http_client.config import Config
 from python_http_client.client import Client, Response
 
 
@@ -47,30 +46,11 @@ def _make_request(self, opener, request):
         return MockResponse(self.response_code)
 
 
-class TestConfig(unittest.TestCase):
-    def test_initialization(self):
-        """Make sure your configuration is setup correctly.
-           At a minimum, we need a HOST to be defined in .env
-           to test the configuration module.
-        """
-        local_path = os.path.dirname(path.dirname(path.abspath(__file__)))
-        config = Config(local_path)
-        self.assertEqual(config.local_path_to_env,
-                         '{0}/.env'.format(local_path))
-
-
 class TestClient(unittest.TestCase):
     def setUp(self):
         self.host = 'http://api.test.com'
         self.client = Client(host=self.host)
-        if os.environ.get('TRAVIS'):
-            Config(os.path.abspath(os.path.dirname(__file__)))
-        else:
-            local_path = '{0}/..'\
-                .format(os.path.abspath(os.path.dirname(__file__)))
-            Config(local_path)
-        self.api_key = os.environ.get('SENDGRID_API_KEY')
-        self.host = os.environ.get('MOCK_HOST')
+        self.api_key = "SENDGRID_API_KEY"
         self.request_headers = {
                                  'Content-Type': 'application/json',
                                  'Authorization': 'Bearer ' + self.api_key