Merge pull request #28 from todorDim/features/add_action_id_to_get

Add action_id to get, increase minor version

Author: mskochev

README.md

@@ -7,7 +7,7 @@
 
 ### API documentation
 
-Every code examples can be find on the [Mailjet Documentation][doc]
+All code examples can be found on the [Mailjet Documentation][doc].
 
 (Please refer to the [Mailjet Documentation Repository][api_doc] to contribute to the documentation examples)
 
@@ -22,7 +22,7 @@ Every code examples can be find on the [Mailjet Documentation][doc]
 First, make sure you have an API key, and an API secret.
 Once you got them, save them in your environment:
 
-```
+```bash
 export MJ_APIKEY_PUBLIC='your api key'
 export MJ_APIKEY_PRIVATE='your api secret'
 ```
@@ -40,17 +40,17 @@ mailjet = Client(auth=(API_KEY, API_SECRET), version='v3')
 
 ```
 
-**NOTE**: `version` reflects the api version in the url (`https://api.mailjet.com/{{ version }}/REST/`). It is `'v3'` by default and can be used to select another api version (for example `v3.1` for the new send API).
+**NOTE**: `version` reflects the API version in the URL (`https://api.mailjet.com/{{ version }}/REST/`). It is `'v3'` by default and can be used to select another API version (for example `v3.1` for the new send API).
 
 ## Make a `GET` request:
 ``` python
-# get every contacts
+# get all contacts
 result = mailjet.contact.get()
 ```
 
 ## `GET` request with filters:
 ``` python
-# get the 2 first contacts
+# get the first 2 contacts
 result = mailjet.contact.get(filters={'limit': 2})
 ```
 ## `POST` request
@@ -61,7 +61,7 @@ result = mailjet.sender.create(data={'email': 'test@mailjet.com'})
 
 ## Combine a resource with an action
 ``` python
-# Get the contact lists of contact #2
+# Get the contacts lists of contact #2
 result = mailjet.contact_getcontactslists.get(id=2)
 ```
 
@@ -72,7 +72,7 @@ email = {
 	'FromName': 'Mr Smith',
 	'FromEmail': 'mr@smith.com',
 	'Subject': 'Test Email',
-	'Text-Part': 'Hey there !',
+	'Text-Part': 'Hey there!',
 	'Recipients': [{'Email': 'your email here'}]
 }
 

mailjet_rest/client.py

@@ -54,7 +54,7 @@ def get_many(self, filters=None, action_id=None, **kwargs):
         return self._get(filters=filters, action_id=action_id **kwargs)
 
     def get(self, id=None, filters=None, action_id=None, **kwargs):
-        return self._get(id=id, filters=filters, **kwargs)
+        return self._get(id=id, filters=filters, action_id=action_id, **kwargs)
 
     def create(self, data=None, filters=None, id=None, action_id=None, **kwargs):
         if self.headers['Content-type'] == 'application/json':

mailjet_rest/utils/version.py

@@ -1,4 +1,4 @@
-VERSION = (1, 3, 1)
+VERSION = (1, 3, 2)
 
 
 def get_version(version=None):

test.py

@@ -90,7 +90,7 @@ def test_user_agent(self):
             auth=self.auth,
             version='v3.1'
         )
-        self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/v1.3.1')
+        self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/v1.3.2')
 
 
 if __name__ == '__main__':